Skip to content

Commit

Permalink
feat: update Angular packages to version 13.0.0 (#3184)
Browse files Browse the repository at this point in the history
Closes #3189
  • Loading branch information
brandonroberts authored Nov 10, 2021
1 parent 01dbce0 commit 996f1e8
Show file tree
Hide file tree
Showing 102 changed files with 2,640 additions and 4,283 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:
- write_master_hash
- run:
name: Run Affected Unit Tests
command: yarn nx affected:test --base=$(cat ~/project/master.txt) --head=$CIRCLE_SHA1 --parallel
command: yarn nx affected:test --base=$(cat ~/project/master.txt) --head=$CIRCLE_SHA1

build:
<<: *run_in_node
Expand Down Expand Up @@ -228,7 +228,7 @@ jobs:
- run: yarn copy:schematics
- run:
name: Check schematics-core for consistency
command: git diff --name-only --exit-code ./modules
command: yarn schematics:check

e2e-affected:
<<: *run_in_browser
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/.angular/cache
# Logs
logs
*.log
Expand Down
59 changes: 40 additions & 19 deletions angular.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
{
"version": 1,
"cli": {
"analytics": false,
"defaultCollection": "@nrwl/angular"
},
"defaultProject": "example-app",
"schematics": {
"@schematics/angular:component": {
"inlineStyle": true,
Expand Down Expand Up @@ -66,7 +61,8 @@
"outputs": ["coverage/modules/component"]
}
},
"schematics": {}
"schematics": {},
"tags": []
},
"component-store": {
"projectType": "library",
Expand Down Expand Up @@ -115,7 +111,8 @@
"outputs": ["coverage/modules/component-store"]
}
},
"schematics": {}
"schematics": {},
"tags": []
},
"data": {
"projectType": "library",
Expand Down Expand Up @@ -164,7 +161,8 @@
"outputs": ["coverage/modules/data"]
}
},
"schematics": {}
"schematics": {},
"tags": []
},
"data-example-app": {
"projectType": "application",
Expand Down Expand Up @@ -260,7 +258,8 @@
"setupFile": "projects/data-example-app/src/test-setup.ts"
}
}
}
},
"tags": []
},
"docs-app": {
"root": "projects/ngrx.io",
Expand Down Expand Up @@ -320,7 +319,19 @@
},
"outputs": ["{options.outputFile}"]
}
}
},
"tags": [],
"implicitDependencies": [
"store",
"effects",
"router-store",
"store-devtools",
"entity",
"data",
"schematics",
"component",
"component-store"
]
},
"effects": {
"projectType": "library",
Expand Down Expand Up @@ -378,7 +389,8 @@
"outputs": ["coverage/modules/effects"]
}
},
"schematics": {}
"schematics": {},
"tags": []
},
"entity": {
"projectType": "library",
Expand Down Expand Up @@ -436,7 +448,8 @@
"outputs": ["coverage/modules/entity"]
}
},
"schematics": {}
"schematics": {},
"tags": []
},
"example-app": {
"root": "projects/example-app",
Expand Down Expand Up @@ -521,7 +534,8 @@
},
"outputs": ["coverage/projects/example-app"]
}
}
},
"tags": []
},
"example-app-e2e": {
"root": "projects/example-app-e2e",
Expand All @@ -548,7 +562,9 @@
},
"outputs": ["{options.outputFile}"]
}
}
},
"tags": [],
"implicitDependencies": ["example-app"]
},
"router-store": {
"projectType": "library",
Expand Down Expand Up @@ -597,7 +613,8 @@
"outputs": ["coverage/modules/router-store"]
}
},
"schematics": {}
"schematics": {},
"tags": []
},
"schematics": {
"root": "modules/schematics",
Expand Down Expand Up @@ -684,7 +701,8 @@
"outputPath": ["dist/modules/schematics"]
}
}
}
},
"tags": []
},
"schematics-core": {
"projectType": "library",
Expand All @@ -711,7 +729,8 @@
"outputs": ["coverage/modules/schematics-core"]
}
},
"schematics": {}
"schematics": {},
"tags": []
},
"store": {
"projectType": "library",
Expand Down Expand Up @@ -769,7 +788,8 @@
"outputs": ["coverage/modules/store"]
}
},
"schematics": {}
"schematics": {},
"tags": []
},
"store-devtools": {
"projectType": "library",
Expand Down Expand Up @@ -818,7 +838,8 @@
"outputs": ["coverage/modules/store-devtools"]
}
},
"schematics": {}
"schematics": {},
"tags": []
}
}
}
83 changes: 0 additions & 83 deletions migrations.json

This file was deleted.

6 changes: 5 additions & 1 deletion modules/component-store/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,9 @@ module.exports = {
stringifyContentPathRegex: '\\.(html|svg)$',
},
},
transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' },
transform: { '^.+\\.(ts|js|mjs|html)$': 'jest-preset-angular' },
transformIgnorePatterns: ['node_modules/(?!@angular|tslib)'],
moduleNameMapper: {
tslib: '<rootDir>../../node_modules/tslib/tslib.es6.js',
},
};
2 changes: 1 addition & 1 deletion modules/component-store/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"homepage": "https://github.com/ngrx/platform#readme",
"peerDependencies": {
"@angular/core": "^13.0.0-rc.0",
"@angular/core": "^13.0.0",
"rxjs": "^6.5.3 || ^7.4.0"
},
"schematics": "./schematics/collection.json",
Expand Down
2 changes: 0 additions & 2 deletions modules/component-store/schematics-core/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import {
pluralize,
} from './utility/strings';

export { isIvyEnabled } from './utility/angular-utils';

export {
findNodes,
getSourceNodes,
Expand Down
50 changes: 0 additions & 50 deletions modules/component-store/schematics-core/utility/angular-utils.ts

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import { JsonAstNode, JsonAstObject } from '@angular-devkit/core';

// https://github.com/angular/angular-cli/blob/master/packages/schematics/angular/utility/json-utils.ts
export function findPropertyInAstObject(
node: JsonAstObject,
node: any,
propertyName: string
): JsonAstNode | null {
let maybeNode: JsonAstNode | null = null;
): any | null {
let maybeNode: any | null = null;
for (const property of node.properties) {
if (property.key.value == propertyName) {
maybeNode = property.value;
Expand Down
2 changes: 1 addition & 1 deletion modules/component-store/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"types": ["jest", "node"]
},
"files": ["test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
}
6 changes: 5 additions & 1 deletion modules/component/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,9 @@ module.exports = {
},
},
setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' },
transform: { '^.+\\.(ts|js|mjs|html)$': 'jest-preset-angular' },
transformIgnorePatterns: ['node_modules/(?!@angular|tslib)'],
moduleNameMapper: {
tslib: '<rootDir>../../node_modules/tslib/tslib.es6.js',
},
};
4 changes: 2 additions & 2 deletions modules/component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
},
"homepage": "https://github.com/ngrx/platform#readme",
"peerDependencies": {
"@angular/common": "^13.0.0-rc.0",
"@angular/core": "^13.0.0-rc.0",
"@angular/common": "^13.0.0",
"@angular/core": "^13.0.0",
"rxjs": "^6.5.3 || ^7.4.0"
},
"schematics": "./schematics/collection.json",
Expand Down
Loading

0 comments on commit 996f1e8

Please sign in to comment.