Revert "chore(version)!: update to angular 11 (#874)"

This reverts commit 0db025d.
just-jeb · Nov 17, 2020 · 63cd4cd · 63cd4cd
1 parent 47153f4
commit 63cd4cd
Show file tree

Hide file tree

Showing 25 changed files with 141 additions and 162 deletions.
diff --git a/MIGRATION.MD b/MIGRATION.MD
@@ -1,7 +1,3 @@
-# Migration from version 10 to version 11
-
-## No action needed
-
 # Migration from version 9 to version 10
 
 ## Jest builder

diff --git a/README.md b/README.md
@@ -2,16 +2,14 @@
 
 The purpose of this repository is to consolidate all the community builders for Angular build facade.
 
-## The latest version of all the builders require Angular CLI 11
+## The latest version of all the builders require Angular CLI 10
 
 ## [Documentation for version 7](https://github.com/just-jeb/angular-builders/tree/7.x.x)
 
 ## [Documentation for version 8](https://github.com/just-jeb/angular-builders/tree/8.x.x)
 
 ## [Documentation for version 9](https://github.com/just-jeb/angular-builders/tree/9.x.x)
 
-## [Documentation for version 10](https://github.com/just-jeb/angular-builders/tree/10.x.x)
-
 ## [Migration guide](./MIGRATION.MD)
 
 # Builders
@@ -59,7 +57,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 
 <!-- markdownlint-enable -->
 <!-- prettier-ignore-end -->
-
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
diff --git a/packages/custom-webpack/README.md b/packages/custom-webpack/README.md
@@ -11,7 +11,6 @@ Allow customizing build configuration without ejecting webpack configuration (`n
 - [Version 7](https://github.com/just-jeb/angular-builders/blob/7.x.x/packages/custom-webpack/README.md)
 - [Version 8](https://github.com/just-jeb/angular-builders/blob/8.x.x/packages/custom-webpack/README.md)
 - [Version 9](https://github.com/just-jeb/angular-builders/blob/9.x.x/packages/custom-webpack/README.md)
-- [Version 10](https://github.com/just-jeb/angular-builders/blob/10.x.x/packages/custom-webpack/README.md)
 
 ## Prerequisites:
 

diff --git a/packages/custom-webpack/examples/full-cycle-app/package.json b/packages/custom-webpack/examples/full-cycle-app/package.json
@@ -11,39 +11,39 @@
   },
   "private": true,
   "dependencies": {
-    "@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",
+    "@angular/animations": "^10.0.0",
+    "@angular/common": "^10.0.0",
+    "@angular/compiler": "^10.0.0",
+    "@angular/core": "^10.0.0",
+    "@angular/forms": "^10.0.0",
+    "@angular/platform-browser": "^10.0.0",
+    "@angular/platform-browser-dynamic": "^10.0.0",
+    "@angular/router": "^10.0.0",
     "rxjs": "~6.5.2",
     "tslib": "^2.0.0",
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "latest",
-    "@angular-devkit/build-angular": ">=0.1100.0 < 0.1200.0",
-    "@angular/cli": "^11.0.1",
-    "@angular/compiler-cli": "^11.0.0",
-    "@angular/language-service": "^11.0.0",
-    "@types/jasmine": "~3.6.0",
+    "@angular-devkit/build-angular": ">=0.1000.0 < 0.1100.0",
+    "@angular/cli": "^10.0.0",
+    "@angular/compiler-cli": "^10.0.0",
+    "@angular/language-service": "^10.0.0",
+    "@types/jasmine": "~3.3.13",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",
-    "codelyzer": "^6.0.0",
+    "codelyzer": "^5.1.2",
     "html-webpack-plugin": "^3.2.0",
-    "jasmine-core": "~3.6.0",
+    "jasmine-core": "~3.5.0",
     "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~5.1.1",
+    "karma": "~5.0.0",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~3.0.2",
-    "karma-jasmine": "~4.0.0",
+    "karma-jasmine": "~3.3.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "protractor": "~7.0.0",
     "ts-node": "~8.1.1",
     "tslint": "~6.1.0",
-    "typescript": "~4.0.5"
+    "typescript": "~3.9.5"
   }
 }
diff --git a/packages/custom-webpack/examples/full-cycle-app/src/app/app.component.spec.ts b/packages/custom-webpack/examples/full-cycle-app/src/app/app.component.spec.ts
@@ -1,36 +1,25 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
+import { TestBed, async } from '@angular/core/testing';
 import { AppComponent } from './app.component';
 describe('AppComponent', () => {
-  beforeEach(
-    waitForAsync(() => {
-      TestBed.configureTestingModule({
-        declarations: [AppComponent],
-      }).compileComponents();
-    })
-  );
-  it(
-    'should create the app',
-    waitForAsync(() => {
-      const fixture = TestBed.createComponent(AppComponent);
-      const app = fixture.debugElement.componentInstance;
-      expect(app).toBeTruthy();
-    })
-  );
-  it(
-    `should have as title 'app'`,
-    waitForAsync(() => {
-      const fixture = TestBed.createComponent(AppComponent);
-      const app = fixture.debugElement.componentInstance;
-      expect(app.title).toEqual('full-cycle-app');
-    })
-  );
-  it(
-    'should render title in a h1 tag',
-    waitForAsync(() => {
-      const fixture = TestBed.createComponent(AppComponent);
-      fixture.detectChanges();
-      const compiled = fixture.debugElement.nativeElement;
-      expect(compiled.querySelector('h1').textContent).toContain('Welcome to full-cycle-app!');
-    })
-  );
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [AppComponent],
+    }).compileComponents();
+  }));
+  it('should create the app', async(() => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.debugElement.componentInstance;
+    expect(app).toBeTruthy();
+  }));
+  it(`should have as title 'app'`, async(() => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.debugElement.componentInstance;
+    expect(app.title).toEqual('full-cycle-app');
+  }));
+  it('should render title in a h1 tag', async(() => {
+    const fixture = TestBed.createComponent(AppComponent);
+    fixture.detectChanges();
+    const compiled = fixture.debugElement.nativeElement;
+    expect(compiled.querySelector('h1').textContent).toContain('Welcome to full-cycle-app!');
+  }));
 });
diff --git a/packages/custom-webpack/examples/sanity-app/package.json b/packages/custom-webpack/examples/sanity-app/package.json
@@ -11,38 +11,38 @@
   },
   "private": true,
   "dependencies": {
-    "@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",
+    "@angular/animations": "^10.0.0",
+    "@angular/common": "^10.0.0",
+    "@angular/compiler": "^10.0.0",
+    "@angular/core": "^10.0.0",
+    "@angular/forms": "^10.0.0",
+    "@angular/platform-browser": "^10.0.0",
+    "@angular/platform-browser-dynamic": "^10.0.0",
+    "@angular/router": "^10.0.0",
     "rxjs": "~6.5.2",
     "tslib": "^2.0.0",
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "latest",
-    "@angular-devkit/build-angular": ">=0.1100.0 < 0.1200.0",
-    "@angular/cli": "^11.0.1",
-    "@angular/compiler-cli": "^11.0.0",
-    "@angular/language-service": "^11.0.0",
-    "@types/jasmine": "~3.6.0",
+    "@angular-devkit/build-angular": ">=0.1000.0 < 0.1100.0",
+    "@angular/cli": "^10.0.0",
+    "@angular/compiler-cli": "^10.0.0",
+    "@angular/language-service": "^10.0.0",
+    "@types/jasmine": "~3.3.13",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",
-    "codelyzer": "^6.0.0",
-    "jasmine-core": "~3.6.0",
+    "codelyzer": "^5.1.2",
+    "jasmine-core": "~3.5.0",
     "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~5.1.1",
+    "karma": "~5.0.0",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~3.0.2",
-    "karma-jasmine": "~4.0.0",
+    "karma-jasmine": "~3.3.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "protractor": "~7.0.0",
     "ts-node": "~8.2.0",
     "tslint": "~6.1.0",
-    "typescript": "~4.0.5"
+    "typescript": "~3.9.5"
   }
 }
diff --git a/packages/custom-webpack/examples/sanity-app/src/app/app.component.spec.ts b/packages/custom-webpack/examples/sanity-app/src/app/app.component.spec.ts
@@ -1,14 +1,12 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
+import { TestBed, async } from '@angular/core/testing';
 import { AppComponent } from './app.component';
 
 describe('AppComponent', () => {
-  beforeEach(
-    waitForAsync(() => {
-      TestBed.configureTestingModule({
-        declarations: [AppComponent],
-      }).compileComponents();
-    })
-  );
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [AppComponent],
+    }).compileComponents();
+  }));
 
   it('should create the app', () => {
     const fixture = TestBed.createComponent(AppComponent);

diff --git a/packages/custom-webpack/package.json b/packages/custom-webpack/package.json
@@ -37,9 +37,9 @@
   },
   "builders": "builders.json",
   "dependencies": {
-    "@angular-devkit/architect": ">=0.1100.0 < 0.1200.0",
-    "@angular-devkit/build-angular": ">=0.1100.0 < 0.1200.0",
-    "@angular-devkit/core": "^11.0.0",
+    "@angular-devkit/architect": ">=0.1000.0 < 0.1100.0",
+    "@angular-devkit/build-angular": ">=0.1000.0 < 0.1100.0",
+    "@angular-devkit/core": "^10.0.0",
     "lodash": "^4.17.15",
     "ts-node": "^9.0.0",
     "webpack-merge": "^4.2.2"

diff --git a/packages/custom-webpack/src/generic-browser-builder.ts b/packages/custom-webpack/src/generic-browser-builder.ts
@@ -4,7 +4,7 @@ import {
   BuilderHandlerFn,
 } from '@angular-devkit/architect';
 import { ExecutionTransformer } from '@angular-devkit/build-angular';
-import { IndexHtmlTransform } from '@angular-devkit/build-angular/src/utils/index-file/write-index-html';
+import { IndexHtmlTransform } from '@angular-devkit/build-angular/src/angular-cli-files/utilities/index-file/write-index-html';
 import { from } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { Configuration } from 'webpack';

diff --git a/packages/custom-webpack/src/transform-factories.ts b/packages/custom-webpack/src/transform-factories.ts
@@ -1,6 +1,6 @@
 import { BuilderContext } from '@angular-devkit/architect';
 import { ExecutionTransformer } from '@angular-devkit/build-angular';
-import { IndexHtmlTransform } from '@angular-devkit/build-angular/src/utils/index-file/write-index-html';
+import { IndexHtmlTransform } from '@angular-devkit/build-angular/src/angular-cli-files/utilities/index-file/write-index-html';
 import { getSystemPath, normalize } from '@angular-devkit/core';
 import { Configuration } from 'webpack';
 import { CustomWebpackBuilder } from './custom-webpack-builder';

diff --git a/packages/jest/README.md b/packages/jest/README.md
@@ -12,11 +12,10 @@ The builder comes to provide zero configuration setup for Jest while keeping the
 - [Version 7](https://github.com/just-jeb/angular-builders/blob/7.x.x/packages/custom-webpack/README.md)
 - [Version 8](https://github.com/just-jeb/angular-builders/blob/8.x.x/packages/custom-webpack/README.md)
 - [Version 9](https://github.com/just-jeb/angular-builders/blob/9.x.x/packages/custom-webpack/README.md)
-- [Version 10](https://github.com/just-jeb/angular-builders/blob/10.x.x/packages/custom-webpack/README.md)
 
 ## Prerequisites
 
-- [Angular CLI 11](https://www.npmjs.com/package/@angular/cli)
+- [Angular CLI 10](https://www.npmjs.com/package/@angular/cli)
 - [Jest 26](https://www.npmjs.com/package/jest)
 
 ## Installation

diff --git a/packages/jest/examples/multiple-apps/angular.json b/packages/jest/examples/multiple-apps/angular.json
@@ -39,6 +39,7 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
+              "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,
@@ -148,6 +149,7 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
+              "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,
@@ -225,7 +227,7 @@
       "prefix": "lib",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:ng-packagr",
+          "builder": "@angular-devkit/build-ng-packagr:build",
           "options": {
             "tsConfig": "projects/my-shared-library/tsconfig.lib.json",
             "project": "projects/my-shared-library/ng-package.json"

diff --git a/packages/jest/examples/multiple-apps/package.json b/packages/jest/examples/multiple-apps/package.json
@@ -7,39 +7,41 @@
     "build": "yarn ng build",
     "test": "yarn ng test",
     "lint": "yarn ng lint",
-    "e2e": "yarn ng e2e"
+    "e2e": "yarn ng e2e",
+    "postinstall": "ngcc"
   },
   "private": true,
   "dependencies": {
-    "@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",
+    "@angular/animations": "^10.0.0",
+    "@angular/common": "^10.0.0",
+    "@angular/compiler": "^10.0.0",
+    "@angular/core": "^10.0.0",
+    "@angular/forms": "^10.0.0",
+    "@angular/platform-browser": "^10.0.0",
+    "@angular/platform-browser-dynamic": "^10.0.0",
+    "@angular/router": "^10.0.0",
     "rxjs": "~6.5.2",
     "tslib": "^2.0.0",
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
     "@angular-builders/jest": "latest",
-    "@angular-devkit/build-angular": ">=0.1100.0 < 0.1200.0",
-    "@angular/cli": "^11.0.1",
-    "@angular/compiler-cli": "^11.0.0",
-    "@angular/language-service": "^11.0.0",
-    "@types/jasmine": "~3.6.0",
+    "@angular-devkit/build-angular": ">=0.1000.0 < 0.1100.0",
+    "@angular-devkit/build-ng-packagr": ">=0.1000.0 < 0.1100.0",
+    "@angular/cli": "^10.0.0",
+    "@angular/compiler-cli": "^10.0.0",
+    "@angular/language-service": "^10.0.0",
+    "@types/jasmine": "~3.3.13",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",
-    "codelyzer": "^6.0.0",
-    "jasmine-core": "~3.6.0",
+    "codelyzer": "^5.1.2",
+    "jasmine-core": "~3.5.0",
     "jasmine-spec-reporter": "~5.0.0",
     "jest": "^26.1.0",
-    "ng-packagr": "^11.0.2",
+    "ng-packagr": "^10.0.0",
     "protractor": "~7.0.0",
     "ts-node": "~8.2.0",
     "tslint": "~6.1.0",
-    "typescript": "~4.0.5"
+    "typescript": "~3.9.5"
   }
 }
diff --git a/packages/jest/examples/multiple-apps/projects/my-shared-library/tsconfig.lib.json b/packages/jest/examples/multiple-apps/projects/my-shared-library/tsconfig.lib.json
@@ -2,7 +2,6 @@
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
-    "declarationMap": true,
     "target": "es2015",
     "declaration": true,
     "inlineSources": true,

diff --git a/packages/jest/examples/multiple-apps/projects/my-shared-library/tsconfig.lib.prod.json b/packages/jest/examples/multiple-apps/projects/my-shared-library/tsconfig.lib.prod.json
@@ -1,8 +1,5 @@
 {
   "extends": "./tsconfig.lib.json",
-  "compilerOptions": {
-    "declarationMap": false
-  },
   "angularCompilerOptions": {
     "enableIvy": false
   }

diff --git a/packages/jest/examples/simple-app/angular.json b/packages/jest/examples/simple-app/angular.json
@@ -43,6 +43,7 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
+              "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,