build(deps): PreUpdate to Angular 11 (#255)

* build(deps): PreUpdate to Angular 11 * doc: Fix typo * build(core): Bump version to 0.4.0-beta.2
hamzahamidi · Feb 27, 2021 · f8a2fd3 · f8a2fd3
1 parent 08dbf3b
commit f8a2fd3
Show file tree

Hide file tree

Showing 24 changed files with 1,955 additions and 2,232 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
   <a href="https://app.netlify.com/sites/ajsf/deploys"><img src="https://api.netlify.com/api/v1/badges/6c5b5a1d-db7c-4d0e-8ac1-a4840d8812f0/deploy-status" alt="Netlify Status"></a>
 </p>
 
-Note: This project is a continuation to [dschnelldavis/Angular2-json-schema-form](https://github.com/dschnelldavis/angular2-json-schema-form) & is and is not affiliated with any organization.
+Note: This project is a continuation to [dschnelldavis/Angular2-json-schema-form](https://github.com/dschnelldavis/angular2-json-schema-form) and is not affiliated with any organization.
 
 A [JSON Schema](http://json-schema.org) Form builder for Angular, similar to, and mostly API compatible with:
 

diff --git a/angular.json b/angular.json
@@ -45,7 +45,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,
@@ -136,7 +135,7 @@
       "prefix": "",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "projects/ajsf-core/tsconfig.lib.json",
             "project": "projects/ajsf-core/ng-package.json"
@@ -176,7 +175,7 @@
       "prefix": "",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "projects/ajsf-bootstrap4/tsconfig.lib.json",
             "project": "projects/ajsf-bootstrap4/ng-package.json"
@@ -216,7 +215,7 @@
       "prefix": "",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "projects/ajsf-bootstrap3/tsconfig.lib.json",
             "project": "projects/ajsf-bootstrap3/ng-package.json"
@@ -256,7 +255,7 @@
       "prefix": "",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "projects/ajsf-material/tsconfig.lib.json",
             "project": "projects/ajsf-material/ng-package.json"

diff --git a/demo/app/demo.module.ts b/demo/app/demo.module.ts
@@ -27,7 +27,7 @@ import { MaterialDesignFrameworkModule } from '@ajsf/material';
     BrowserModule, BrowserAnimationsModule, FlexLayoutModule, FormsModule,
     HttpClientModule, MatButtonModule, MatCardModule, MatCheckboxModule,
     MatIconModule, MatMenuModule, MatSelectModule, MatToolbarModule,
-    RouterModule.forRoot(routes),
+    RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' }),
     Bootstrap4FrameworkModule,
     Bootstrap3FrameworkModule,
     MaterialDesignFrameworkModule,

diff --git a/package.json b/package.json
@@ -75,42 +75,41 @@
     "e2e": "ng e2e"
   },
   "dependencies": {
-    "@angular/animations": "11.0.9",
-    "@angular/cdk": "11.0.4",
-    "@angular/common": "11.0.9",
-    "@angular/compiler": "11.0.9",
-    "@angular/core": "11.0.9",
+    "@angular/animations": "^11.2.3",
+    "@angular/cdk": "^11.2.2",
+    "@angular/common": "^11.2.3",
+    "@angular/compiler": "^11.2.3",
+    "@angular/core": "^11.2.3",
     "@angular/flex-layout": "^11.0.0-beta.33",
-    "@angular/forms": "11.0.9",
-    "@angular/material": "11.0.4",
-    "@angular/platform-browser": "11.0.9",
-    "@angular/platform-browser-dynamic": "11.0.9",
-    "@angular/router": "11.0.9",
+    "@angular/forms": "^11.2.3",
+    "@angular/material": "^11.2.2",
+    "@angular/platform-browser": "^11.2.3",
+    "@angular/platform-browser-dynamic": "^11.2.3",
+    "@angular/router": "^11.2.3",
     "brace": "^0.11.1",
     "core-js": "^3.6.5",
     "lodash-es": "^4.17.15",
     "rxjs": "^6.6.0",
     "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "0.1100.7",
-    "@angular-devkit/build-ng-packagr": "~0.1002.0",
-    "@angular/cli": "11.0.7",
-    "@angular/compiler-cli": "11.0.9",
-    "@angular/language-service": "11.0.9",
-    "@types/jasmine": "~3.5.7",
+    "@angular-devkit/build-angular": "~0.1102.2",
+    "@angular/cli": "~11.2.2",
+    "@angular/compiler-cli": "^11.2.3",
+    "@angular/language-service": "^11.2.3",
+    "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.6",
     "@types/lodash": "^4.14.136",
     "@types/node": "^12.11.1",
-    "codelyzer": "^6.0.1",
-    "jasmine-core": "~3.5.0",
+    "codelyzer": "^6.0.0",
+    "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~5.0.0",
+    "karma": "~6.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": "^11.1.2",
+    "ng-packagr": "^11.2.4",
     "protractor": "~7.0.0",
     "ts-node": "~8.6.2",
     "tsickle": "^0.39.1",

diff --git a/projects/ajsf-bootstrap3/ng-package.json b/projects/ajsf-bootstrap3/ng-package.json
@@ -9,8 +9,8 @@
       "@ajsf/core": "@ajsf/core"
     }
   },
-  "whitelistedNonPeerDependencies": [
+  "allowedNonPeerDependencies": [
     "lodash-es",
     "@ajsf/core"
   ]
-}
+}
diff --git a/projects/ajsf-bootstrap3/package.json b/projects/ajsf-bootstrap3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ajsf/bootstrap3",
-  "version": "0.3.0-beta.4",
+  "version": "0.4.0-beta.1",
   "description": "Angular JSON Schema Form builder using Bootstrap 3 UI",
   "author": "https://github.com/hamzahamidi/ajsf/graphs/contributors",
   "keywords": [
@@ -21,6 +21,9 @@
     "Angular10",
     "Angular 10",
     "ng10",
+    "Angular11",
+    "Angular 11",
+    "ng11",
     "JSON Schema",
     "form",
     "forms",
@@ -41,12 +44,12 @@
   "private": false,
   "dependencies": {
     "lodash-es": "^4.17.15",
-    "@ajsf/core": "~0.3.0-beta.4",
+    "@ajsf/core": "~0.4.0-beta.1",
     "tslib": "^2.0.0"
   },
   "peerDependencies": {
-    "@angular/common": ">=9.0.0",
-    "@angular/core": ">=9.0.0"
+    "@angular/common": ">=11.0.0",
+    "@angular/core": ">=11.0.0"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.3"

diff --git a/projects/ajsf-bootstrap3/src/lib/bootstrap3-framework.component.spec.ts b/projects/ajsf-bootstrap3/src/lib/bootstrap3-framework.component.spec.ts
@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
 import {
   JsonSchemaFormModule,
@@ -10,7 +10,7 @@ describe('Bootstrap3FrameworkComponent', () => {
   let component: Bootstrap3FrameworkComponent;
   let fixture: ComponentFixture<Bootstrap3FrameworkComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
         JsonSchemaFormModule,

diff --git a/projects/ajsf-bootstrap3/tsconfig.lib.json b/projects/ajsf-bootstrap3/tsconfig.lib.json
@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
+    "declarationMap": true,
     "target": "es2015",
     "declaration": true,
     "inlineSources": true,

diff --git a/projects/ajsf-bootstrap3/tsconfig.lib.prod.json b/projects/ajsf-bootstrap3/tsconfig.lib.prod.json
@@ -1,5 +1,8 @@
 {
   "extends": "./tsconfig.lib.json",
+  "compilerOptions": {
+    "declarationMap": false
+  },
   "angularCompilerOptions": {
     "enableIvy": false
   }

diff --git a/projects/ajsf-bootstrap4/ng-package.json b/projects/ajsf-bootstrap4/ng-package.json
@@ -9,7 +9,7 @@
       "@ajsf/core": "@ajsf/core"
     }
   },
-  "whitelistedNonPeerDependencies": [
+  "allowedNonPeerDependencies": [
     "lodash-es",
     "@ajsf/core"
   ]

diff --git a/projects/ajsf-bootstrap4/package.json b/projects/ajsf-bootstrap4/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ajsf/bootstrap4",
-  "version": "0.3.0-beta.4",
+  "version": "0.4.0-beta.1",
   "description": "Angular JSON Schema Form builder using Bootstrap 4 UI",
   "author": "https://github.com/hamzahamidi/ajsf/graphs/contributors",
   "keywords": [
@@ -21,6 +21,9 @@
     "Angular10",
     "Angular 10",
     "ng10",
+    "Angular11",
+    "Angular 11",
+    "ng11",
     "JSON Schema",
     "form",
     "forms",
@@ -41,12 +44,12 @@
   "private": false,
   "dependencies": {
     "lodash-es": "^4.17.15",
-    "@ajsf/core": "~0.3.0-beta.4",
+    "@ajsf/core": "~0.4.0-beta.1",
     "tslib": "^2.0.0"
   },
   "peerDependencies": {
-    "@angular/common": ">=9.0.0",
-    "@angular/core": ">=9.0.0"
+    "@angular/common": ">=11.0.0",
+    "@angular/core": ">=11.0.0"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.3"

diff --git a/projects/ajsf-bootstrap4/src/lib/bootstrap4-framework.component.spec.ts b/projects/ajsf-bootstrap4/src/lib/bootstrap4-framework.component.spec.ts
@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
 import {
   JsonSchemaFormModule,
@@ -10,7 +10,7 @@ describe('FwBootstrap4Component', () => {
   let component: Bootstrap4FrameworkComponent;
   let fixture: ComponentFixture<Bootstrap4FrameworkComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
         JsonSchemaFormModule,

diff --git a/projects/ajsf-bootstrap4/tsconfig.lib.json b/projects/ajsf-bootstrap4/tsconfig.lib.json
@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
+    "declarationMap": true,
     "target": "es2015",
     "declaration": true,
     "inlineSources": true,

diff --git a/projects/ajsf-bootstrap4/tsconfig.lib.prod.json b/projects/ajsf-bootstrap4/tsconfig.lib.prod.json
@@ -1,5 +1,8 @@
 {
   "extends": "./tsconfig.lib.json",
+  "compilerOptions": {
+    "declarationMap": false
+  },
   "angularCompilerOptions": {
     "enableIvy": false
   }

diff --git a/projects/ajsf-core/ng-package.json b/projects/ajsf-core/ng-package.json
@@ -13,8 +13,8 @@
       "ajv/lib/refs/json-schema-draft-06.json": "jsonDraft6"
     }
   },
-  "whitelistedNonPeerDependencies": [
+  "allowedNonPeerDependencies": [
     "lodash-es",
     "ajv"
   ]
-}
+}
diff --git a/projects/ajsf-core/package.json b/projects/ajsf-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ajsf/core",
-  "version": "0.3.0-beta.4",
+  "version": "0.4.0-beta.2",
   "description": "Angular JSON Schema Form builder core",
   "author": "https://github.com/hamzahamidi/ajsf/graphs/contributors",
   "keywords": [
@@ -46,10 +46,10 @@
     "tslib": "^2.0.0"
   },
   "peerDependencies": {
-    "@angular/common": ">=9.0.0",
-    "@angular/core": ">=9.0.0",
-    "@angular/forms": ">=9.0.0",
-    "@angular/platform-browser": ">=9.0.0",
+    "@angular/common": ">=11.0.0",
+    "@angular/core": ">=11.0.0",
+    "@angular/forms": ">=11.0.0",
+    "@angular/platform-browser": ">=11.0.0",
     "rxjs": "^6.0.0"
   },
   "devDependencies": {

diff --git a/projects/ajsf-core/tsconfig.lib.json b/projects/ajsf-core/tsconfig.lib.json
@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
+    "declarationMap": true,
     "target": "es2015",
     "declaration": true,
     "inlineSources": true,

diff --git a/projects/ajsf-core/tsconfig.lib.prod.json b/projects/ajsf-core/tsconfig.lib.prod.json
@@ -1,5 +1,8 @@
 {
   "extends": "./tsconfig.lib.json",
+  "compilerOptions": {
+    "declarationMap": false
+  },
   "angularCompilerOptions": {
     "enableIvy": false
   }

diff --git a/projects/ajsf-material/ng-package.json b/projects/ajsf-material/ng-package.json
@@ -9,8 +9,8 @@
       "@ajsf/core": "@ajsf/core"
     }
   },
-  "whitelistedNonPeerDependencies": [
+  "allowedNonPeerDependencies": [
     "lodash-es",
     "@ajsf/core"
   ]
-}
+}
diff --git a/projects/ajsf-material/package.json b/projects/ajsf-material/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ajsf/material",
-  "version": "0.3.0-beta.4",
+  "version": "0.4.0-beta.1",
   "description": "Angular JSON Schema Form builder using Angular Material UI",
   "author": "https://github.com/hamzahamidi/ajsf/graphs/contributors",
   "keywords": [
@@ -44,12 +44,12 @@
   "private": false,
   "dependencies": {
     "lodash-es": "^4.17.15",
-    "@ajsf/core": "~0.3.0-beta.4",
+    "@ajsf/core": "~0.4.0-beta.1",
     "tslib": "^2.0.0"
   },
   "peerDependencies": {
-    "@angular/flex-layout": ">=9.0.0-beta.28",
-    "@angular/material": ">=9.0.0",
-    "@angular/cdk": ">=9.0.0"
+    "@angular/flex-layout": ">=11.0.0-beta.33",
+    "@angular/material": ">=11.0.0",
+    "@angular/cdk": ">=11.0.0"
   }
 }
diff --git a/projects/ajsf-material/src/lib/material-design-framework.component.spec.ts b/projects/ajsf-material/src/lib/material-design-framework.component.spec.ts
@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
 import {
   JsonSchemaFormModule,
@@ -10,7 +10,7 @@ describe('FwBootstrap4Component', () => {
   let component: MaterialDesignFrameworkComponent;
   let fixture: ComponentFixture<MaterialDesignFrameworkComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
         JsonSchemaFormModule,

diff --git a/projects/ajsf-material/tsconfig.lib.json b/projects/ajsf-material/tsconfig.lib.json
@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
+    "declarationMap": true,
     "target": "es2015",
     "declaration": true,
     "inlineSources": true,

diff --git a/projects/ajsf-material/tsconfig.lib.prod.json b/projects/ajsf-material/tsconfig.lib.prod.json
@@ -1,5 +1,8 @@
 {
   "extends": "./tsconfig.lib.json",
+  "compilerOptions": {
+    "declarationMap": false
+  },
   "angularCompilerOptions": {
     "enableIvy": false
   }