Skip to content

Commit 409f356

Browse files
just-jebjust-jeb
authored
build!: update to Angular 10 (#782)
1 parent 525b096 commit 409f356

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+705
-278
lines changed

‎MIGRATION.MD‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Migration from version 9 to version 10
2+
3+
## Jest builder
4+
1. Update to Jest 26 if you still haven't.
5+
16
# Migration from version 8 to version 9
27

38
## All builders

‎README.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22

33
The purpose of this repository is to consolidate all the community builders for Angular build facade.
44

5-
## The latest version of all the builders require Angular CLI 9
5+
## The latest version of all the builders require Angular CLI 10
66

77
## [Documentation for version 7](https://github.com/just-jeb/angular-builders/tree/7.x.x)
88

99
## [Documentation for version 8](https://github.com/just-jeb/angular-builders/tree/8.x.x)
1010

11+
## [Documentation for version 9](https://github.com/just-jeb/angular-builders/tree/9.x.x)
12+
1113
## [Migration guide](./MIGRATION.MD)
1214

1315
# Builders
@@ -52,6 +54,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
5254

5355
<!-- markdownlint-enable -->
5456
<!-- prettier-ignore-end -->
57+
5558
<!-- ALL-CONTRIBUTORS-LIST:END -->
5659

5760
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

‎packages/custom-webpack/README.md‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,17 @@
44

55
Allow customizing build configuration without ejecting webpack configuration (`ng eject`)
66

7-
# This documentation is for version 9 only. Find documentation for version 7 [here](https://github.com/just-jeb/angular-builders/blob/7.x.x/packages/custom-webpack/README.md) and for version 8 [here](https://github.com/just-jeb/angular-builders/blob/8.x.x/packages/custom-webpack/README.md).
7+
# This documentation is for the latest major version only
88

9-
# Prerequisites:
9+
## Previous versions
1010

11-
- [Angular CLI 9](https://www.npmjs.com/package/@angular/cli)
11+
- [Version 7](https://github.com/just-jeb/angular-builders/blob/7.x.x/packages/custom-webpack/README.md)
12+
- [Version 8](https://github.com/just-jeb/angular-builders/blob/8.x.x/packages/custom-webpack/README.md)
13+
- [Version 9](https://github.com/just-jeb/angular-builders/blob/9.x.x/packages/custom-webpack/README.md)
14+
15+
## Prerequisites:
16+
17+
- [Angular CLI 10](https://www.npmjs.com/package/@angular/cli)
1218

1319
# Usage
1420

@@ -321,7 +327,11 @@ import { CustomWebpackBrowserSchema, TargetOptions } from '@angular-builders/cus
321327
import * as webpack from 'webpack';
322328
import * as pkg from './package.json';
323329

324-
export default (config: webpack.Configuration, options: CustomWebpackBrowserSchema, targetOptions: TargetOptions) => {
330+
export default (
331+
config: webpack.Configuration,
332+
options: CustomWebpackBrowserSchema,
333+
targetOptions: TargetOptions
334+
) => {
325335
config.plugins.push(
326336
new webpack.DefinePlugin({
327337
APP_VERSION: JSON.stringify(pkg.version),

‎packages/custom-webpack/builders.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "../../node_modules/@angular-devkit/architect/src/builders-schema.json",
2+
"$schema": "./node_modules/@angular-devkit/architect/src/builders-schema.json",
33
"builders": {
44
"browser": {
55
"implementation": "./dist/browser",

‎packages/custom-webpack/examples/full-cycle-app/browserslist‎ renamed to ‎packages/custom-webpack/examples/full-cycle-app/.browserslistrc‎

File renamed without changes.

‎packages/custom-webpack/examples/full-cycle-app/e2e/tsconfig.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"extends": "../tsconfig.json",
2+
"extends": "../tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/e2e",
55
"module": "commonjs",
6-
"target": "es5",
6+
"target": "es2018",
77
"types": [
88
"jasmine",
99
"jasminewd2",

‎packages/custom-webpack/examples/full-cycle-app/package.json‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,39 @@
1111
},
1212
"private": true,
1313
"dependencies": {
14-
"@angular/animations": "^9.0.0",
15-
"@angular/common": "^9.0.0",
16-
"@angular/compiler": "^9.0.0",
17-
"@angular/core": "^9.0.0",
18-
"@angular/forms": "^9.0.0",
19-
"@angular/platform-browser": "^9.0.0",
20-
"@angular/platform-browser-dynamic": "^9.0.0",
21-
"@angular/router": "^9.0.0",
14+
"@angular/animations": "^10.0.0",
15+
"@angular/common": "^10.0.0",
16+
"@angular/compiler": "^10.0.0",
17+
"@angular/core": "^10.0.0",
18+
"@angular/forms": "^10.0.0",
19+
"@angular/platform-browser": "^10.0.0",
20+
"@angular/platform-browser-dynamic": "^10.0.0",
21+
"@angular/router": "^10.0.0",
2222
"rxjs": "~6.5.2",
23-
"tslib": "^1.10.0",
23+
"tslib": "^2.0.0",
2424
"zone.js": "~0.10.2"
2525
},
2626
"devDependencies": {
2727
"@angular-builders/custom-webpack": "latest",
28-
"@angular-devkit/build-angular": ">=0.900.0 < 0.1000.0",
29-
"@angular/cli": "^9.0.0",
30-
"@angular/compiler-cli": "^9.0.0",
31-
"@angular/language-service": "^9.0.0",
28+
"@angular-devkit/build-angular": "0.1000.0",
29+
"@angular/cli": "^10.0.0",
30+
"@angular/compiler-cli": "^10.0.0",
31+
"@angular/language-service": "^10.0.0",
3232
"@types/jasmine": "~3.3.13",
3333
"@types/jasminewd2": "~2.0.3",
3434
"@types/node": "^12.11.1",
3535
"codelyzer": "^5.1.2",
3636
"html-webpack-plugin": "^3.2.0",
37-
"jasmine-core": "~3.4.0",
38-
"jasmine-spec-reporter": "~4.2.1",
39-
"karma": "~4.1.0",
40-
"karma-chrome-launcher": "~2.2.0",
41-
"karma-coverage-istanbul-reporter": "~2.0.1",
42-
"karma-jasmine": "~2.0.1",
43-
"karma-jasmine-html-reporter": "^1.4.2",
44-
"protractor": "^5.4.2",
37+
"jasmine-core": "~3.5.0",
38+
"jasmine-spec-reporter": "~5.0.0",
39+
"karma": "~5.0.0",
40+
"karma-chrome-launcher": "~3.1.0",
41+
"karma-coverage-istanbul-reporter": "~3.0.2",
42+
"karma-jasmine": "~3.3.0",
43+
"karma-jasmine-html-reporter": "^1.5.0",
44+
"protractor": "~7.0.0",
4545
"ts-node": "~8.1.1",
46-
"tslint": "~5.16.0",
47-
"typescript": "~3.7.5"
46+
"tslint": "~6.1.0",
47+
"typescript": "~3.9.5"
4848
}
49-
}
49+
}

‎packages/custom-webpack/examples/full-cycle-app/tsconfig.app.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "./tsconfig.json",
2+
"extends": "./tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "./out-tsc/app",
55
"types": []

‎packages/custom-webpack/examples/full-cycle-app/tsconfig.base.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"compileOnSave": false,
3+
"compilerOptions": {
4+
"baseUrl": "./",
5+
"outDir": "./dist/out-tsc",
6+
"sourceMap": true,
7+
"declaration": false,
8+
"module": "esnext",
9+
"moduleResolution": "node",
10+
"emitDecoratorMetadata": true,
11+
"experimentalDecorators": true,
12+
"importHelpers": true,
13+
"target": "es2015",
14+
"typeRoots": [
15+
"node_modules/@types"
16+
],
17+
"lib": [
18+
"es2018",
19+
"dom"
20+
]
21+
}
22+
}

‎packages/custom-webpack/examples/full-cycle-app/tsconfig.json‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
1+
/*
2+
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
3+
It is not intended to be used to perform a compilation.
4+
5+
To learn more about this file see: https://angular.io/config/solution-tsconfig.
6+
*/
17
{
2-
"compileOnSave": false,
3-
"compilerOptions": {
4-
"baseUrl": "./",
5-
"outDir": "./dist/out-tsc",
6-
"sourceMap": true,
7-
"declaration": false,
8-
"module": "esnext",
9-
"moduleResolution": "node",
10-
"emitDecoratorMetadata": true,
11-
"experimentalDecorators": true,
12-
"importHelpers": true,
13-
"target": "es2015",
14-
"typeRoots": [
15-
"node_modules/@types"
16-
],
17-
"lib": [
18-
"es2018",
19-
"dom"
20-
]
21-
}
22-
}
8+
"files": [],
9+
"references": [
10+
{
11+
"path": "./tsconfig.app.json"
12+
},
13+
{
14+
"path": "./tsconfig.spec.json"
15+
}
16+
]
17+
}

0 commit comments

Comments
 (0)