Skip to content

Commit 996f1e8

Browse files
feat: update Angular packages to version 13.0.0 (#3184)
Closes #3189
1 parent 01dbce0 commit 996f1e8

File tree

102 files changed

+2640
-4283
lines changed

Some content is hidden

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

102 files changed

+2640
-4283
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
- write_master_hash
129129
- run:
130130
name: Run Affected Unit Tests
131-
command: yarn nx affected:test --base=$(cat ~/project/master.txt) --head=$CIRCLE_SHA1 --parallel
131+
command: yarn nx affected:test --base=$(cat ~/project/master.txt) --head=$CIRCLE_SHA1
132132

133133
build:
134134
<<: *run_in_node
@@ -228,7 +228,7 @@ jobs:
228228
- run: yarn copy:schematics
229229
- run:
230230
name: Check schematics-core for consistency
231-
command: git diff --name-only --exit-code ./modules
231+
command: yarn schematics:check
232232

233233
e2e-affected:
234234
<<: *run_in_browser

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/.angular/cache
12
# Logs
23
logs
34
*.log

angular.json

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
{
22
"version": 1,
3-
"cli": {
4-
"analytics": false,
5-
"defaultCollection": "@nrwl/angular"
6-
},
7-
"defaultProject": "example-app",
83
"schematics": {
94
"@schematics/angular:component": {
105
"inlineStyle": true,
@@ -66,7 +61,8 @@
6661
"outputs": ["coverage/modules/component"]
6762
}
6863
},
69-
"schematics": {}
64+
"schematics": {},
65+
"tags": []
7066
},
7167
"component-store": {
7268
"projectType": "library",
@@ -115,7 +111,8 @@
115111
"outputs": ["coverage/modules/component-store"]
116112
}
117113
},
118-
"schematics": {}
114+
"schematics": {},
115+
"tags": []
119116
},
120117
"data": {
121118
"projectType": "library",
@@ -164,7 +161,8 @@
164161
"outputs": ["coverage/modules/data"]
165162
}
166163
},
167-
"schematics": {}
164+
"schematics": {},
165+
"tags": []
168166
},
169167
"data-example-app": {
170168
"projectType": "application",
@@ -260,7 +258,8 @@
260258
"setupFile": "projects/data-example-app/src/test-setup.ts"
261259
}
262260
}
263-
}
261+
},
262+
"tags": []
264263
},
265264
"docs-app": {
266265
"root": "projects/ngrx.io",
@@ -320,7 +319,19 @@
320319
},
321320
"outputs": ["{options.outputFile}"]
322321
}
323-
}
322+
},
323+
"tags": [],
324+
"implicitDependencies": [
325+
"store",
326+
"effects",
327+
"router-store",
328+
"store-devtools",
329+
"entity",
330+
"data",
331+
"schematics",
332+
"component",
333+
"component-store"
334+
]
324335
},
325336
"effects": {
326337
"projectType": "library",
@@ -378,7 +389,8 @@
378389
"outputs": ["coverage/modules/effects"]
379390
}
380391
},
381-
"schematics": {}
392+
"schematics": {},
393+
"tags": []
382394
},
383395
"entity": {
384396
"projectType": "library",
@@ -436,7 +448,8 @@
436448
"outputs": ["coverage/modules/entity"]
437449
}
438450
},
439-
"schematics": {}
451+
"schematics": {},
452+
"tags": []
440453
},
441454
"example-app": {
442455
"root": "projects/example-app",
@@ -521,7 +534,8 @@
521534
},
522535
"outputs": ["coverage/projects/example-app"]
523536
}
524-
}
537+
},
538+
"tags": []
525539
},
526540
"example-app-e2e": {
527541
"root": "projects/example-app-e2e",
@@ -548,7 +562,9 @@
548562
},
549563
"outputs": ["{options.outputFile}"]
550564
}
551-
}
565+
},
566+
"tags": [],
567+
"implicitDependencies": ["example-app"]
552568
},
553569
"router-store": {
554570
"projectType": "library",
@@ -597,7 +613,8 @@
597613
"outputs": ["coverage/modules/router-store"]
598614
}
599615
},
600-
"schematics": {}
616+
"schematics": {},
617+
"tags": []
601618
},
602619
"schematics": {
603620
"root": "modules/schematics",
@@ -684,7 +701,8 @@
684701
"outputPath": ["dist/modules/schematics"]
685702
}
686703
}
687-
}
704+
},
705+
"tags": []
688706
},
689707
"schematics-core": {
690708
"projectType": "library",
@@ -711,7 +729,8 @@
711729
"outputs": ["coverage/modules/schematics-core"]
712730
}
713731
},
714-
"schematics": {}
732+
"schematics": {},
733+
"tags": []
715734
},
716735
"store": {
717736
"projectType": "library",
@@ -769,7 +788,8 @@
769788
"outputs": ["coverage/modules/store"]
770789
}
771790
},
772-
"schematics": {}
791+
"schematics": {},
792+
"tags": []
773793
},
774794
"store-devtools": {
775795
"projectType": "library",
@@ -818,7 +838,8 @@
818838
"outputs": ["coverage/modules/store-devtools"]
819839
}
820840
},
821-
"schematics": {}
841+
"schematics": {},
842+
"tags": []
822843
}
823844
}
824845
}

migrations.json

Lines changed: 0 additions & 83 deletions
This file was deleted.

modules/component-store/jest.config.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,9 @@ module.exports = {
99
stringifyContentPathRegex: '\\.(html|svg)$',
1010
},
1111
},
12-
transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' },
12+
transform: { '^.+\\.(ts|js|mjs|html)$': 'jest-preset-angular' },
13+
transformIgnorePatterns: ['node_modules/(?!@angular|tslib)'],
14+
moduleNameMapper: {
15+
tslib: '<rootDir>../../node_modules/tslib/tslib.es6.js',
16+
},
1317
};

modules/component-store/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
"homepage": "https://github.com/ngrx/platform#readme",
2424
"peerDependencies": {
25-
"@angular/core": "^13.0.0-rc.0",
25+
"@angular/core": "^13.0.0",
2626
"rxjs": "^6.5.3 || ^7.4.0"
2727
},
2828
"schematics": "./schematics/collection.json",

modules/component-store/schematics-core/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ import {
1010
pluralize,
1111
} from './utility/strings';
1212

13-
export { isIvyEnabled } from './utility/angular-utils';
14-
1513
export {
1614
findNodes,
1715
getSourceNodes,

modules/component-store/schematics-core/utility/angular-utils.ts

Lines changed: 0 additions & 50 deletions
This file was deleted.

modules/component-store/schematics-core/utility/json-utilts.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
import { JsonAstNode, JsonAstObject } from '@angular-devkit/core';
2-
31
// https://github.com/angular/angular-cli/blob/master/packages/schematics/angular/utility/json-utils.ts
42
export function findPropertyInAstObject(
5-
node: JsonAstObject,
3+
node: any,
64
propertyName: string
7-
): JsonAstNode | null {
8-
let maybeNode: JsonAstNode | null = null;
5+
): any | null {
6+
let maybeNode: any | null = null;
97
for (const property of node.properties) {
108
if (property.key.value == propertyName) {
119
maybeNode = property.value;

modules/component-store/tsconfig.spec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"types": ["jest", "node"]
77
},
88
"files": ["test-setup.ts"],
9-
"include": ["**/*.spec.ts", "**/*.d.ts"]
9+
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
1010
}

0 commit comments

Comments
 (0)