Merge pull request #6175 from abpframework/feat/ng-update-11

Update angular to 11
6 years ago · 84667bfe58
17 changed files with 1470 additions and 1646 deletions
--- a/npm/ng-packs/apps/dev-app/src/app/app-routing.module.ts
+++ b/npm/ng-packs/apps/dev-app/src/app/app-routing.module.ts
@ -24,7 +24,7 @@ const routes: Routes = [
 ];

@NgModule({
-  imports: [RouterModule.forRoot(routes)],
+  imports: [RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' })],
  exports: [RouterModule],
 })
 export class AppRoutingModule {}
--- a/npm/ng-packs/package.json
+++ b/npm/ng-packs/package.json
@ -37,21 +37,21 @@
    "@abp/ng.theme.shared": "~3.3.1",
    "@abp/utils": "^3.3.1",
    "@angular-builders/jest": "^10.0.0",
-    "@angular-devkit/build-angular": "~0.1001.2",
+    "@angular-devkit/build-angular": "~0.1100.0",
    "@angular-devkit/build-ng-packagr": "~0.1001.2",
    "@angular-devkit/schematics-cli": "^0.1001.1",
-    "@angular/animations": "~10.1.2",
-    "@angular/cli": "~10.1.2",
-    "@angular/common": "~10.1.2",
-    "@angular/compiler": "10.1.2",
-    "@angular/compiler-cli": "10.1.2",
-    "@angular/core": "~10.1.2",
-    "@angular/forms": "~10.1.2",
-    "@angular/language-service": "~10.1.2",
-    "@angular/localize": "~10.1.2",
-    "@angular/platform-browser": "~10.1.2",
-    "@angular/platform-browser-dynamic": "~10.1.2",
-    "@angular/router": "~10.1.2",
+    "@angular/animations": "~11.0.0",
+    "@angular/cli": "~11.0.0",
+    "@angular/common": "~11.0.0",
+    "@angular/compiler": "11.0.0",
+    "@angular/compiler-cli": "11.0.0",
+    "@angular/core": "~11.0.0",
+    "@angular/forms": "~11.0.0",
+    "@angular/language-service": "~11.0.0",
+    "@angular/localize": "~11.0.0",
+    "@angular/platform-browser": "~11.0.0",
+    "@angular/platform-browser-dynamic": "~11.0.0",
+    "@angular/router": "~11.0.0",
    "@fortawesome/fontawesome-free": "^5.14.0",
    "@ng-bootstrap/ng-bootstrap": "^7.0.0",
    "@ngneat/inspector": "^1.0.0",
@ -62,7 +62,7 @@
    "@ngxs/router-plugin": "^3.7.0",
    "@ngxs/store": "^3.7.0",
    "@schematics/angular": "~10.0.5",
-    "@swimlane/ngx-datatable": "^17.1.0",
+    "@swimlane/ngx-datatable": "^18.0.0",
    "@types/jest": "^25.2.3",
    "@types/node": "^12.11.1",
    "angular-oauth2-oidc": "^10.0.3",
@ -80,13 +80,12 @@
    "just-clone": "^3.1.0",
    "just-compare": "^1.3.0",
    "lerna": "^3.19.0",
-    "ng-packagr": "^10.0.0",
-    "ng-zorro-antd": "^9.3.0",
-    "ngxs-reset-plugin": "^1.3.0",
+    "ng-packagr": "^11.0.1",
+    "ng-zorro-antd": "^10.1.1",
    "ngxs-schematic": "^1.1.9",
    "prettier": "^2.1.2",
    "protractor": "~7.0.0",
-    "rxjs": "~6.5.4",
+    "rxjs": "~6.6.3",
    "snq": "^1.0.3",
    "symlink-manager": "^1.5.0",
    "ts-node": "~7.0.0",
--- a/npm/ng-packs/packages/core/src/lib/core.module.ts
+++ b/npm/ng-packs/packages/core/src/lib/core.module.ts
@ -129,7 +129,7 @@ export class RootCoreModule {}
 */
@NgModule({
  exports: [RouterModule, BaseCoreModule, MockLocalizationPipe],
-  imports: [RouterModule.forRoot([]), BaseCoreModule],
+  imports: [RouterModule.forRoot([], { relativeLinkResolution: 'legacy' }), BaseCoreModule],
  declarations: [MockLocalizationPipe],
 })
 export class TestCoreModule {}
--- a/npm/ng-packs/packages/core/src/lib/tests/auth.guard.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/auth.guard.spec.ts
@ -11,7 +11,7 @@ describe('AuthGuard', () => {
  const createService = createServiceFactory({
    service: AuthGuard,
    mocks: [OAuthService, Router],
-    imports: [RouterModule.forRoot([{ path: '', component: RouterOutletComponent }])],
+    imports: [RouterModule.forRoot([{ path: '', component: RouterOutletComponent }], { relativeLinkResolution: 'legacy' })],
    declarations: [RouterOutletComponent],
    providers: [{ provide: APP_BASE_HREF, useValue: '/' }],
  });
--- a/npm/ng-packs/packages/core/src/lib/tests/permission.guard.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/permission.guard.spec.ts
@ -25,14 +25,14 @@ describe('PermissionGuard', () => {
    declarations: [DummyComponent],
    imports: [
      RouterModule.forRoot([
-        {
-          path: 'test',
-          component: DummyComponent,
-          data: {
+    {
+        path: 'test',
+        component: DummyComponent,
+        data: {
            requiredPolicy: 'TestPolicy',
-          },
        },
-      ]),
+    },
+], { relativeLinkResolution: 'legacy' }),
    ],
    providers: [
      {
--- a/npm/ng-packs/packages/theme-shared/src/lib/tests/error.handler.spec.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/error.handler.spec.ts
@ -32,7 +32,7 @@ const CONFIRMATION_BUTTONS = {
 describe('ErrorHandler', () => {
  const createService = createServiceFactory({
    service: ErrorHandler,
-    imports: [RouterModule.forRoot([]), NgxsModule.forRoot([]), CoreModule, MockModule],
+    imports: [RouterModule.forRoot([], { relativeLinkResolution: 'legacy' }), NgxsModule.forRoot([]), CoreModule, MockModule],
    mocks: [OAuthService],
    providers: [
      { provide: APP_BASE_HREF, useValue: '/' },
@ -271,7 +271,7 @@ describe('ErrorHandler with custom error component', () => {
  const createService = createServiceFactory({
    service: ErrorHandler,
    imports: [
-      RouterModule.forRoot([]),
+      RouterModule.forRoot([], { relativeLinkResolution: 'legacy' }),
      NgxsModule.forRoot([]),
      CoreModule,
      MockModule,
--- a/npm/ng-packs/yarn.lock
+++ b/npm/ng-packs/yarn.lock
--- a/templates/app/angular/angular.json
+++ b/templates/app/angular/angular.json
@ -23,7 +23,6 @@
            "polyfills": "src/polyfills.ts",
            "tsConfig": "tsconfig.app.json",
            "aot": true,
-            "extractCss": true,
            "allowedCommonJsDependencies": ["chart.js", "js-sha256"],
            "assets": ["src/favicon.ico", "src/assets"],
            "styles": [
@ -77,7 +76,6 @@
              "optimization": true,
              "outputHashing": "all",
              "sourceMap": false,
-              "extractCss": true,
              "namedChunks": false,
              "extractLicenses": true,
              "vendorChunk": false,
--- a/templates/app/angular/package.json
+++ b/templates/app/angular/package.json
@ -16,40 +16,39 @@
    "@abp/ng.setting-management": "~3.3.1",
    "@abp/ng.tenant-management": "~3.3.1",
    "@abp/ng.theme.basic": "~3.3.1",
-    "@angular/animations": "~10.1.2",
-    "@angular/common": "~10.1.2",
-    "@angular/compiler": "~10.1.2",
-    "@angular/core": "~10.1.2",
-    "@angular/forms": "~10.1.2",
-    "@angular/platform-browser": "~10.1.2",
-    "@angular/platform-browser-dynamic": "~10.1.2",
-    "@angular/router": "~10.1.2",
+    "@angular/animations": "~11.0.0",
+    "@angular/common": "~11.0.0",
+    "@angular/compiler": "~11.0.0",
+    "@angular/core": "~11.0.0",
+    "@angular/forms": "~11.0.0",
+    "@angular/platform-browser": "~11.0.0",
+    "@angular/platform-browser-dynamic": "~11.0.0",
+    "@angular/router": "~11.0.0",
    "rxjs": "~6.6.0",
    "tslib": "^2.0.0",
    "zone.js": "~0.10.2"
  },
  "devDependencies": {
    "@abp/ng.schematics": "~3.3.1",
-    "@angular-devkit/build-angular": "~0.1001.2",
-    "@angular-devkit/build-ng-packagr": "~0.1001.2",
-    "@angular/cli": "~10.1.2",
-    "@angular/compiler-cli": "~10.1.2",
-    "@angular/language-service": "~10.1.2",
+    "@angular-devkit/build-angular": "~0.1100.0",
+    "@angular/cli": "~11.0.0",
+    "@angular/compiler-cli": "~11.0.0",
+    "@angular/language-service": "~11.0.0",
    "@types/jasmine": "~3.5.0",
    "@types/jasminewd2": "~2.0.3",
    "@types/node": "^12.11.1",
    "codelyzer": "^6.0.0",
    "jasmine-core": "~3.6.0",
    "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~5.0.0",
+    "karma": "~5.1.1",
    "karma-chrome-launcher": "~3.1.0",
    "karma-coverage-istanbul-reporter": "~3.0.2",
    "karma-jasmine": "~4.0.0",
    "karma-jasmine-html-reporter": "^1.5.0",
-    "ng-packagr": "^10.0.0",
+    "ng-packagr": "^11.0.1",
    "protractor": "~7.0.0",
    "ts-node": "~8.3.0",
    "tslint": "~6.1.0",
    "typescript": "~4.0.2"
  }
-}
+}
--- a/templates/app/angular/src/app/app-routing.module.ts
+++ b/templates/app/angular/src/app/app-routing.module.ts
@ -24,7 +24,7 @@ const routes: Routes = [
 ];

@NgModule({
-  imports: [RouterModule.forRoot(routes)],
+  imports: [RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' })],
  exports: [RouterModule],
 })
 export class AppRoutingModule {}
--- a/templates/app/angular/yarn.lock
+++ b/templates/app/angular/yarn.lock
--- a/templates/module/angular/angular.json
+++ b/templates/module/angular/angular.json
@ -10,7 +10,7 @@
      "prefix": "lib",
      "architect": {
        "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
          "options": {
            "tsConfig": "projects/my-project-name/tsconfig.lib.json",
            "project": "projects/my-project-name/ng-package.json"
@ -61,12 +61,8 @@
            "polyfills": "projects/dev-app/src/polyfills.ts",
            "tsConfig": "projects/dev-app/tsconfig.app.json",
            "aot": true,
-            "extractCss": true,
            "allowedCommonJsDependencies": ["chart.js", "js-sha256"],
-            "assets": [
-              "projects/dev-app/src/favicon.ico",
-              "projects/dev-app/src/assets"
-            ],
+            "assets": ["projects/dev-app/src/favicon.ico", "projects/dev-app/src/assets"],
            "styles": [
              {
                "input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
@ -119,7 +115,6 @@
              "optimization": true,
              "outputHashing": "all",
              "sourceMap": false,
-              "extractCss": true,
              "namedChunks": false,
              "extractLicenses": true,
              "vendorChunk": false,
@ -163,10 +158,7 @@
            "polyfills": "projects/dev-app/src/polyfills.ts",
            "tsConfig": "projects/dev-app/tsconfig.spec.json",
            "karmaConfig": "projects/dev-app/karma.conf.js",
-            "assets": [
-              "projects/dev-app/src/favicon.ico",
-              "projects/dev-app/src/assets"
-            ],
+            "assets": ["projects/dev-app/src/favicon.ico", "projects/dev-app/src/assets"],
            "styles": ["projects/dev-app/src/styles.scss"],
            "scripts": []
          }
--- a/templates/module/angular/package.json
+++ b/templates/module/angular/package.json
@ -19,36 +19,35 @@
    "@abp/ng.setting-management": "~3.3.1",
    "@abp/ng.tenant-management": "~3.3.1",
    "@abp/ng.theme.basic": "~3.3.1",
-    "@angular/animations": "~10.1.2",
-    "@angular/common": "~10.1.2",
-    "@angular/compiler": "~10.1.2",
-    "@angular/core": "~10.1.2",
-    "@angular/forms": "~10.1.2",
-    "@angular/platform-browser": "~10.1.2",
-    "@angular/platform-browser-dynamic": "~10.1.2",
-    "@angular/router": "~10.1.2",
+    "@angular/animations": "~11.0.0",
+    "@angular/common": "~11.0.0",
+    "@angular/compiler": "~11.0.0",
+    "@angular/core": "~11.0.0",
+    "@angular/forms": "~11.0.0",
+    "@angular/platform-browser": "~11.0.0",
+    "@angular/platform-browser-dynamic": "~11.0.0",
+    "@angular/router": "~11.0.0",
    "rxjs": "~6.6.3",
    "tslib": "^2.0.0",
    "zone.js": "~0.10.2"
  },
  "devDependencies": {
    "@abp/ng.schematics": "~3.3.1",
-    "@angular-devkit/build-angular": "~0.1001.2",
-    "@angular-devkit/build-ng-packagr": "~0.1001.2",
-    "@angular/cli": "~10.1.2",
-    "@angular/compiler-cli": "~10.1.2",
+    "@angular-devkit/build-angular": "~0.1100.0",
+    "@angular/cli": "~11.0.0",
+    "@angular/compiler-cli": "~11.0.0",
    "@types/jasmine": "~3.5.0",
    "@types/jasminewd2": "~2.0.3",
    "@types/node": "^12.11.1",
    "codelyzer": "^6.0.0",
    "jasmine-core": "~3.6.0",
    "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~5.0.0",
+    "karma": "~5.1.1",
    "karma-chrome-launcher": "~3.1.0",
    "karma-coverage-istanbul-reporter": "~3.0.2",
    "karma-jasmine": "~4.0.0",
    "karma-jasmine-html-reporter": "^1.5.0",
-    "ng-packagr": "^10.0.0",
+    "ng-packagr": "^11.0.1",
    "protractor": "~7.0.0",
    "symlink-manager": "^1.5.0",
    "ts-node": "~8.3.0",
--- a/templates/module/angular/projects/dev-app/src/app/app-routing.module.ts
+++ b/templates/module/angular/projects/dev-app/src/app/app-routing.module.ts
@ -29,7 +29,7 @@ const routes: Routes = [
 ];

@NgModule({
-  imports: [RouterModule.forRoot(routes)],
+  imports: [RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' })],
  exports: [RouterModule],
 })
 export class AppRoutingModule {}
--- a/templates/module/angular/projects/my-project-name/src/lib/my-project-name.component.spec.ts
+++ b/templates/module/angular/projects/my-project-name/src/lib/my-project-name.component.spec.ts
@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';

 import { MyProjectNameComponent } from './my-project-name.component';

@ -6,7 +6,7 @@ describe('MyProjectNameComponent', () => {
  let component: MyProjectNameComponent;
  let fixture: ComponentFixture<MyProjectNameComponent>;

-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
    TestBed.configureTestingModule({
      declarations: [ MyProjectNameComponent ]
    })
--- a/templates/module/angular/projects/my-project-name/tsconfig.lib.json
+++ b/templates/module/angular/projects/my-project-name/tsconfig.lib.json
@ -2,6 +2,7 @@
  "extends": "../../tsconfig.prod.json",
  "compilerOptions": {
    "outDir": "../../out-tsc/lib",
+    "declarationMap": true,
    "target": "es2015",
    "declaration": true,
    "inlineSources": true,
--- a/templates/module/angular/projects/my-project-name/tsconfig.lib.prod.json
+++ b/templates/module/angular/projects/my-project-name/tsconfig.lib.prod.json
@ -1,5 +1,8 @@
 {
  "extends": "./tsconfig.lib.json",
+  "compilerOptions": {
+    "declarationMap": false
+  },
  "angularCompilerOptions": {
    "enableIvy": false
  }