Skip to content

Commit

Permalink
build!: direct dependency on @angular-devkit 9
Browse files Browse the repository at this point in the history
  • Loading branch information
JeB authored and just-jeb committed Jan 2, 2020
1 parent 3ad35a6 commit 6f0ac12
Show file tree
Hide file tree
Showing 1,197 changed files with 3,755,159 additions and 119 deletions.
2 changes: 1 addition & 1 deletion .commitlintrc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": ["@commitlint/config-angular"]
"extends": ["@commitlint/config-conventional"]
}
5 changes: 5 additions & 0 deletions MIGRATION.MD
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# Migration from version 8 to version 9

## All builders
1. `@angular/architect` and `angular/core` are now direct builder dependencies, therefore no need to specify them explicitly in `package.json`

# Migration from version 7 to version 8

## Custom webpack builder
Expand Down
8 changes: 4 additions & 4 deletions merge-schemes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ interface CustomSchema {
const wd = process.cwd();
const schemesToMerge: CustomSchema[] = require(`${wd}/src/schemes`);

for (const customSchema of schemesToMerge) {
const originalSchema = require(customSchema.originalSchemaPath);
const schemaExtensions = customSchema.schemaExtensionPaths.map((path: string) => require(path));
for (const { originalSchemaPath, schemaExtensionPaths, newSchemaPath } of schemesToMerge) {
const originalSchema = require(`${wd}/node_modules/${originalSchemaPath}`);
const schemaExtensions = schemaExtensionPaths.map((path: string) => require(path));
const newSchema = schemaExtensions.reduce(
(extendedSchema: any, currentExtension: any) => merge(extendedSchema, currentExtension),
originalSchema
);
writeFileSync(customSchema.newSchemaPath, JSON.stringify(newSchema, null, 2), 'utf-8');
writeFileSync(newSchemaPath, JSON.stringify(newSchema, null, 2), 'utf-8');
}
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
"format": "prettier --write \"**/*.{js,ts,html,md}\""
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.803.0",
"@angular/compiler": "^8.2.2",
"@angular/compiler-cli": "^8.2.2",
"@commitlint/cli": "^8.2.0",
"@angular/compiler": "^9.0.0-rc.5",
"@angular/compiler-cli": "^9.0.0-rc.5",
"@commitlint/cli": "^8.3.3",
"@commitlint/config-angular": "^8.2.0",
"@commitlint/config-conventional": "^8.3.3",
"@types/jest": "^24.0.0",
"@types/lodash": "^4.14.118",
"@types/node": "~13.1.0",
Expand Down Expand Up @@ -65,5 +65,6 @@
"bracketSpacing": true,
"arrowParens": "avoid",
"singleQuote": true
}
},
"dependencies": {}
}
36 changes: 22 additions & 14 deletions packages/custom-webpack/examples/full-cycle-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,36 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~8.2.2",
"@angular/common": "~8.2.2",
"@angular/compiler": "~8.2.2",
"@angular/core": "~8.2.2",
"@angular/forms": "~8.2.2",
"@angular/platform-browser": "~8.2.2",
"@angular/platform-browser-dynamic": "~8.2.2",
"@angular/router": "~8.2.2",
"@angular/animations": "~9.0.0-rc.5",
"@angular/common": "~9.0.0-rc.5",
"@angular/compiler": "~9.0.0-rc.5",
"@angular/core": "~9.0.0-rc.5",
"@angular/forms": "~9.0.0-rc.5",
"@angular/platform-browser": "~9.0.0-rc.5",
"@angular/platform-browser-dynamic": "~9.0.0-rc.5",
"@angular/router": "~9.0.0-rc.5",
"rxjs": "~6.5.2",
"tslib": "^1.9.0",
"zone.js": "~0.9.1"
"tslib": "^1.10.0",
"zone.js": "~0.10.2"
},
"devDependencies": {
<<<<<<< HEAD
"@angular-builders/custom-webpack": "^8.4.1",
"@angular-devkit/build-angular": "^0.802.2",
"@angular/cli": "^8.2.2",
"@angular/compiler-cli": "~8.2.2",
"@angular/language-service": "~8.2.2",
=======
"@angular-builders/custom-webpack": "^8.4.0",
"@angular-devkit/build-angular": "~0.900.0-rc.5",
"@angular/cli": "^9.0.0-rc.5",
"@angular/compiler-cli": "~9.0.0-rc.5",
"@angular/language-service": "~9.0.0-rc.5",
>>>>>>> 2e695ec... build(custom-webpack)!: update full cycle app dependencies
"@types/jasmine": "~3.3.13",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~11.13.7",
"codelyzer": "^5.0.1",
"@types/node": "^12.11.1",
"codelyzer": "^5.1.2",
"html-webpack-plugin": "^3.2.0",
"jasmine-core": "~3.4.0",
"jasmine-spec-reporter": "~4.2.1",
Expand All @@ -44,6 +52,6 @@
"protractor": "^5.4.2",
"ts-node": "~8.1.1",
"tslint": "~5.16.0",
"typescript": "~3.5.3"
"typescript": "~3.6.4"
}
}
}
36 changes: 22 additions & 14 deletions packages/custom-webpack/examples/sanity-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,36 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~8.2.2",
"@angular/common": "~8.2.2",
"@angular/compiler": "~8.2.2",
"@angular/core": "~8.2.2",
"@angular/forms": "~8.2.2",
"@angular/platform-browser": "~8.2.2",
"@angular/platform-browser-dynamic": "~8.2.2",
"@angular/router": "~8.2.2",
"@angular/animations": "~9.0.0-rc.5",
"@angular/common": "~9.0.0-rc.5",
"@angular/compiler": "~9.0.0-rc.5",
"@angular/core": "~9.0.0-rc.5",
"@angular/forms": "~9.0.0-rc.5",
"@angular/platform-browser": "~9.0.0-rc.5",
"@angular/platform-browser-dynamic": "~9.0.0-rc.5",
"@angular/router": "~9.0.0-rc.5",
"rxjs": "~6.5.2",
"tslib": "^1.9.0",
"zone.js": "~0.9.1"
"tslib": "^1.10.0",
"zone.js": "~0.10.2"
},
"devDependencies": {
<<<<<<< HEAD
"@angular-builders/custom-webpack": "^8.4.1",
"@angular-devkit/build-angular": "~0.802.2",
"@angular/cli": "^8.2.2",
"@angular/compiler-cli": "~8.2.2",
"@angular/language-service": "~8.2.2",
=======
"@angular-builders/custom-webpack": "^8.4.0",
"@angular-devkit/build-angular": "~0.900.0-rc.5",
"@angular/cli": "^9.0.0-rc.5",
"@angular/compiler-cli": "~9.0.0-rc.5",
"@angular/language-service": "~9.0.0-rc.5",
>>>>>>> 0004628... build(custom-webpack)!: update sanity app dependencies
"@types/jasmine": "~3.3.13",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~12.0.3",
"codelyzer": "^5.0.1",
"@types/node": "^12.11.1",
"codelyzer": "^5.1.2",
"jasmine-core": "~3.4.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~4.1.0",
Expand All @@ -43,6 +51,6 @@
"protractor": "^5.4.2",
"ts-node": "~8.2.0",
"tslint": "~5.16.0",
"typescript": "~3.5.3"
"typescript": "~3.6.4"
}
}
}
6 changes: 3 additions & 3 deletions packages/custom-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
},
"builders": "builders.json",
"dependencies": {
"@angular-devkit/architect": "^0.900.0-rc.2",
"@angular-devkit/build-angular": "^0.900.0-rc.2",
"@angular-devkit/core": "^9.0.0-rc.2",
"lodash": "^4.17.10",
"ts-node": "^8.5.2",
"webpack-merge": "^4.2.1"
},
"peerDependencies": {
"@angular-devkit/build-angular": ">=0.801.0"
}
}
17 changes: 16 additions & 1 deletion packages/jest/examples/multiple-apps/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"outputPath": "dist/my-first-app",
"index": "projects/my-first-app/src/index.html",
"main": "projects/my-first-app/src/main.ts",
Expand Down Expand Up @@ -49,6 +50,10 @@
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
]
}
Expand Down Expand Up @@ -118,6 +123,7 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"outputPath": "dist/my-second-app",
"index": "projects/my-second-app/src/index.html",
"main": "projects/my-second-app/src/main.ts",
Expand Down Expand Up @@ -154,6 +160,10 @@
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
]
}
Expand Down Expand Up @@ -222,7 +232,12 @@
"tsConfig": "projects/my-shared-library/tsconfig.lib.json",
"project": "projects/my-shared-library/ng-package.json"
}
},
, "configurations": {
"production": {
"tsConfig": "projects/my-shared-library/tsconfig.lib.prod.json"
}
}
},
"test": {
"builder": "@angular-builders/jest:run"
},
Expand Down
37 changes: 23 additions & 14 deletions packages/jest/examples/multiple-apps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,36 +11,45 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~8.2.2",
"@angular/common": "~8.2.2",
"@angular/compiler": "~8.2.2",
"@angular/core": "~8.2.2",
"@angular/forms": "~8.2.2",
"@angular/platform-browser": "~8.2.2",
"@angular/platform-browser-dynamic": "~8.2.2",
"@angular/router": "~8.2.2",
"@angular/animations": "~9.0.0-rc.5",
"@angular/common": "~9.0.0-rc.5",
"@angular/compiler": "~9.0.0-rc.5",
"@angular/core": "~9.0.0-rc.5",
"@angular/forms": "~9.0.0-rc.5",
"@angular/platform-browser": "~9.0.0-rc.5",
"@angular/platform-browser-dynamic": "~9.0.0-rc.5",
"@angular/router": "~9.0.0-rc.5",
"rxjs": "~6.5.2",
"tslib": "^1.10.0",
"zone.js": "~0.9.1"
"zone.js": "~0.10.2"
},
"devDependencies": {
<<<<<<< HEAD
"@angular-builders/jest": "^8.3.2",
"@angular-devkit/build-angular": "~0.802.2",
"@angular-devkit/build-ng-packagr": "~0.802.2",
"@angular/cli": "^8.2.2",
"@angular/compiler-cli": "~8.2.2",
"@angular/language-service": "~8.2.2",
=======
"@angular-builders/jest": "^8.3.1",
"@angular-devkit/build-angular": "~0.900.0-rc.5",
"@angular-devkit/build-ng-packagr": "~0.900.0-rc.5",
"@angular/cli": "^9.0.0-rc.5",
"@angular/compiler-cli": "~9.0.0-rc.5",
"@angular/language-service": "~9.0.0-rc.5",
>>>>>>> 0b10ead... build(jest)!: update multiple apps dependencies
"@types/jasmine": "~3.3.13",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~12.0.3",
"codelyzer": "^5.0.1",
"@types/node": "^12.11.1",
"codelyzer": "^5.1.2",
"jasmine-core": "~3.4.0",
"jasmine-spec-reporter": "~4.2.1",
"jest": "^24.8.0",
"ng-packagr": "^5.5.0",
"ng-packagr": "^9.0.0-rc.2",
"protractor": "^5.4.2",
"ts-node": "~8.2.0",
"tslint": "~5.16.0",
"typescript": "~3.5.3"
"typescript": "~3.6.4"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"outDir": "../../out-tsc/app",
"types": []
},
"include": [
"src/**/*.ts"
"files": [
"src/main.ts",
"src/polyfills.ts"
],
"exclude": [
"src/test.ts",
"src/**/*.spec.ts"
"include": [
"src/**/*.d.ts"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"outDir": "../../out-tsc/app",
"types": []
},
"include": [
"src/**/*.ts"
"files": [
"src/main.ts",
"src/polyfills.ts"
],
"exclude": [
"src/test.ts",
"src/**/*.spec.ts"
"include": [
"src/**/*.d.ts"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extends": "./tsconfig.lib.json",
"angularCompilerOptions": {
"enableIvy": false
}
}
5 changes: 5 additions & 0 deletions packages/jest/examples/simple-app/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"outputPath": "dist/simple-app",
"index": "src/index.html",
"main": "src/main.ts",
Expand Down Expand Up @@ -53,6 +54,10 @@
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
]
}
Expand Down
Loading

0 comments on commit 6f0ac12

Please sign in to comment.