Upgrade Angular 12 -> 13

This commit is contained in:
mike cullerton 2023-01-19 13:06:26 -05:00
parent d4fd4092ae
commit 6579bfe869
6 changed files with 13266 additions and 5587 deletions

1
.gitignore vendored
View File

@ -32,6 +32,7 @@ speed-measure-plugin*.json
.history/*
# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage

18650
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -27,17 +27,17 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^12.2.1",
"@angular/cdk": "^12.2.1",
"@angular/common": "^12.2.1",
"@angular/compiler": "^12.2.1",
"@angular/core": "^12.2.1",
"@angular/flex-layout": "^12.0.0-beta.34",
"@angular/forms": "^12.2.1",
"@angular/material": "^12.2.1",
"@angular/platform-browser": "^12.2.1",
"@angular/platform-browser-dynamic": "^12.2.1",
"@angular/router": "^12.2.1",
"@angular/animations": "^13.3.12",
"@angular/cdk": "^13.3.9",
"@angular/common": "^13.3.12",
"@angular/compiler": "^13.3.12",
"@angular/core": "^13.3.12",
"@angular/flex-layout": "^13.0.0-beta.38",
"@angular/forms": "^13.3.12",
"@angular/material": "^13.3.9",
"@angular/platform-browser": "^13.3.12",
"@angular/platform-browser-dynamic": "^13.3.12",
"@angular/router": "^13.3.12",
"@bpmn-io/dmn-migrate": "^0.4.3",
"@ngx-formly/core": "^5.10.22",
"@ngx-formly/material": "^5.10.22",
@ -69,17 +69,17 @@
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-builders/custom-webpack": "^12.1.0",
"@angular-devkit/build-angular": "^12.2.1",
"@angular-devkit/build-webpack": "^0.1202.1",
"@angular-eslint/builder": "12.3.1",
"@angular-eslint/eslint-plugin": "12.3.1",
"@angular-eslint/eslint-plugin-template": "12.3.1",
"@angular-eslint/schematics": "12.3.1",
"@angular-eslint/template-parser": "12.3.1",
"@angular/cli": "^12.2.1",
"@angular/compiler-cli": "^12.2.1",
"@angular/language-service": "^12.2.1",
"@angular-builders/custom-webpack": "^13.1.0",
"@angular-devkit/build-angular": "^13.3.10",
"@angular-devkit/build-webpack": "^0.1303.10",
"@angular-eslint/builder": "^13.5.0",
"@angular-eslint/eslint-plugin": "^13.5.0",
"@angular-eslint/eslint-plugin-template": "^13.5.0",
"@angular-eslint/schematics": "^13.5.0",
"@angular-eslint/template-parser": "^13.5.0",
"@angular/cli": "^13.3.10",
"@angular/compiler-cli": "^13.3.12",
"@angular/language-service": "^13.3.12",
"@babel/compat-data": "^7.15.0",
"@babel/core": "^7.15.0",
"@babel/preset-env": "^7.15.0",
@ -110,9 +110,9 @@
"puppeteer": "^10.2.0",
"sonar-scanner": "^3.1.0",
"ts-node": "^10.2.0",
"typescript": "^4.3.5",
"typescript": "^4.6.4",
"webpack": "^5.50.0",
"webpack-dev-server": "^3.11.2",
"webpack-dev-server": "^4.11.1",
"webpack-notifier": "^1.13.0"
}
}

View File

@ -86,81 +86,71 @@ export class ThisEnvironment implements AppEnvironment {
export const getBaseHref = (platformLocation: PlatformLocation): string => platformLocation.getBaseHrefFromDOM();
@NgModule({
declarations: [
AppComponent,
DeleteFileDialogComponent,
DeleteWorkflowSpecDialogComponent,
DeleteWorkflowSpecCategoryDialogComponent,
DiagramComponent,
FileListComponent,
FileMetaDialogComponent,
FooterComponent,
GetIconCodePipe,
LibraryListComponent,
ModelerComponent,
NavbarComponent,
NewFileDialogComponent,
OpenFileDialogComponent,
WorkflowSpecCategoryDialogComponent,
WorkflowSpecDialogComponent,
WorkflowSpecListComponent,
HomeComponent,
WorkflowSpecCardComponent,
ReferenceFilesComponent,
ConfirmDialogComponent,
SettingsComponent,
GitRepoDialogComponent,
GitMergeDialogComponent,
],
imports: [
BrowserAnimationsModule,
BrowserModule,
FlexLayoutModule,
FormlyModule,
FormsModule,
HttpClientModule,
MatBottomSheetModule,
MatButtonModule,
MatCardModule,
MatDialogModule,
MatDividerModule,
MatIconModule,
MatInputModule,
MatListModule,
MatMenuModule,
MatSnackBarModule,
MatTabsModule,
MatToolbarModule,
MatTooltipModule,
MatSelectModule,
ReactiveFormsModule,
SartographyFormsModule,
SartographyPipesModule,
SartographyWorkflowLibModule,
AppRoutingModule,
MatSidenavModule,
MatExpansionModule,
MatCheckboxModule,
// <-- This line MUST be last (https://angular.io/guide/router#module-import-order-matters)
],
bootstrap: [AppComponent],
entryComponents: [
DeleteFileDialogComponent,
DeleteWorkflowSpecDialogComponent,
DeleteWorkflowSpecCategoryDialogComponent,
FileMetaDialogComponent,
NewFileDialogComponent,
OpenFileDialogComponent,
WorkflowSpecCategoryDialogComponent,
WorkflowSpecDialogComponent,
],
providers: [
{provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: {appearance: 'outline'}},
{provide: 'APP_ENVIRONMENT', useClass: ThisEnvironment},
{provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, multi: true},
{provide: HTTP_INTERCEPTORS, useClass: ErrorInterceptor, multi: true},
{provide: APP_BASE_HREF, useFactory: getBaseHref, deps: [PlatformLocation]},
],
declarations: [
AppComponent,
DeleteFileDialogComponent,
DeleteWorkflowSpecDialogComponent,
DeleteWorkflowSpecCategoryDialogComponent,
DiagramComponent,
FileListComponent,
FileMetaDialogComponent,
FooterComponent,
GetIconCodePipe,
LibraryListComponent,
ModelerComponent,
NavbarComponent,
NewFileDialogComponent,
OpenFileDialogComponent,
WorkflowSpecCategoryDialogComponent,
WorkflowSpecDialogComponent,
WorkflowSpecListComponent,
HomeComponent,
WorkflowSpecCardComponent,
ReferenceFilesComponent,
ConfirmDialogComponent,
SettingsComponent,
GitRepoDialogComponent,
GitMergeDialogComponent,
],
imports: [
BrowserAnimationsModule,
BrowserModule,
FlexLayoutModule,
FormlyModule,
FormsModule,
HttpClientModule,
MatBottomSheetModule,
MatButtonModule,
MatCardModule,
MatDialogModule,
MatDividerModule,
MatIconModule,
MatInputModule,
MatListModule,
MatMenuModule,
MatSnackBarModule,
MatTabsModule,
MatToolbarModule,
MatTooltipModule,
MatSelectModule,
ReactiveFormsModule,
SartographyFormsModule,
SartographyPipesModule,
SartographyWorkflowLibModule,
AppRoutingModule,
MatSidenavModule,
MatExpansionModule,
MatCheckboxModule,
// <-- This line MUST be last (https://angular.io/guide/router#module-import-order-matters)
],
bootstrap: [AppComponent],
providers: [
{ provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: { appearance: 'outline' } },
{ provide: 'APP_ENVIRONMENT', useClass: ThisEnvironment },
{ provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, multi: true },
{ provide: HTTP_INTERCEPTORS, useClass: ErrorInterceptor, multi: true },
{ provide: APP_BASE_HREF, useFactory: getBaseHref, deps: [PlatformLocation] },
]
})
export class AppModule {
}

View File

@ -18,16 +18,6 @@
* BROWSER POLYFILLS
*/
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`.
/**
* Web Animations `@angular/platform-browser/animations`
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
*/
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
/**
* By default, zone.js will patch all possible macroTask and DomEvents
* user can disable parts of macroTask/DomEvents patch by setting following flags

View File

@ -12,7 +12,9 @@ declare const require: any;
// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting()
platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false }
}
);
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);