diff --git a/templates/module/angular/angular.json b/templates/module/angular/angular.json index 4c0a8ef615..c72aea8fdc 100644 --- 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,8 +61,10 @@ "polyfills": "projects/dev-app/src/polyfills.ts", "tsConfig": "projects/dev-app/tsconfig.app.json", "aot": true, - "extractCss": true, - "allowedCommonJsDependencies": ["chart.js", "js-sha256"], + "allowedCommonJsDependencies": [ + "chart.js", + "js-sha256" + ], "assets": [ "projects/dev-app/src/favicon.ico", "projects/dev-app/src/assets" @@ -95,7 +97,7 @@ }, { "input": "node_modules/@abp/ng.theme.shared/styles/bootstrap-rtl.min.css", - "inject": false, + "inject": true, "bundleName": "bootstrap-rtl.min" }, { @@ -119,7 +121,6 @@ "optimization": true, "outputHashing": "all", "sourceMap": false, - "extractCss": true, "namedChunks": false, "extractLicenses": true, "vendorChunk": false, diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index 4f4cd9722a..5677e50ccc 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -20,36 +20,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", diff --git 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 index 759fad9ebc..077c35b072 100644 --- 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 @@ -43,7 +43,7 @@ const routes: Routes = [ ]; @NgModule({ - imports: [RouterModule.forRoot(routes)], + imports: [RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' })], exports: [RouterModule], }) export class AppRoutingModule {} diff --git 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 index a50ece2f61..88f67b1e65 100644 --- 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; - beforeEach(async(() => { + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ MyProjectNameComponent ] }) diff --git a/templates/module/angular/projects/my-project-name/tsconfig.lib.json b/templates/module/angular/projects/my-project-name/tsconfig.lib.json index c433a69f62..36d66a0283 100644 --- 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, diff --git a/templates/module/angular/projects/my-project-name/tsconfig.lib.prod.json b/templates/module/angular/projects/my-project-name/tsconfig.lib.prod.json index cbae794224..04c0e66277 100644 --- 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 }