Skip to content

Commit

Permalink
build: update to Angular libraries to version 12 RC.0 (#3000)
Browse files Browse the repository at this point in the history
BREAKING CHANGES:

Minimum versions of Angular and TypeScript have been updated

BEFORE:

Minimum of Angular version 11.x
Minimum of TypeScript 4.1.x

AFTER:

Minimum of Angular version 12.x
Minimum of TypeScript 4.2.x
  • Loading branch information
brandonroberts authored Apr 23, 2021
1 parent 34add18 commit 4fb030e
Show file tree
Hide file tree
Showing 56 changed files with 2,314 additions and 2,122 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ version: 2.1
var_1: &cache_key yarn-cache-{{ checksum "yarn.lock" }}-0.12.12
var_2: &run_in_node
docker:
- image: circleci/node:12.9.1
- image: circleci/node:12.14.1
var_3: &set_bazel_options
run:
command: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
var_4: &docs_cache_key yarn-docs-cache-{{ checksum "~/docs/projects/ngrx.io/yarn.lock" }}-0.4
var_5: &run_in_browser
docker:
- image: circleci/node:12.9.1-browsers
- image: circleci/node:12.14.1-browsers
var_6: &docs_in_node
docker:
- image: circleci/node:12.9.1
- image: circleci/node:12.14.1
var_7: &docs_in_browser
docker:
- image: circleci/node:10.13-browsers
var_8: &bazel_cache_key yarn-bazel-cache-{{ checksum "master.txt" }}-0.12.9
- image: circleci/node:12.14-browsers
var_8: &bazel_cache_key yarn-bazel-cache-{{ checksum "master.txt" }}-0.12.14

commands:
write_master_hash:
Expand Down
6 changes: 4 additions & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,8 @@
}
],
"outputPath": ["projects/ngrx.io/dist/ngrx.io"]
}
},
"outputs": ["{options.outputPath}"]
},
"test": {
"builder": "@nrwl/workspace:run-commands",
Expand Down Expand Up @@ -744,7 +745,8 @@
}
]
}
}
},
"outputs": ["{options.outputPath}"]
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
Expand Down
4 changes: 2 additions & 2 deletions modules/component-store/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ngrx/component-store",
"version": "11.1.1",
"version": "12.0.0-beta.0",
"description": "Reactive store for component state",
"repository": {
"type": "git",
Expand All @@ -22,7 +22,7 @@
},
"homepage": "https://github.com/ngrx/platform#readme",
"peerDependencies": {
"@angular/core": "^11.0.0",
"@angular/core": "^12.0.0-rc.0",
"rxjs": "^6.5.3"
},
"schematics": "./schematics/collection.json",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const platformVersion = '^11.1.1';
export const platformVersion = '^12.0.0-beta.0';
2 changes: 2 additions & 0 deletions modules/component-store/spec/integration.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ describe('ComponentStore integration', () => {
state.parent.isChildVisible = false;
state.fixture.detectChanges();

state.destroy();

expect(state.componentStoreDestroySpy).toHaveBeenCalled();
});
}
Expand Down
1 change: 0 additions & 1 deletion modules/component-store/tsconfig-build.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"baseUrl": "../../",
"declaration": true,
"stripInternal": true,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"module": "es2015",
"moduleResolution": "node",
Expand Down
6 changes: 3 additions & 3 deletions modules/component/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ngrx/component",
"version": "11.1.1",
"version": "12.0.0-beta.0",
"description": "Reactive Extensions for Angular Components",
"repository": {
"type": "git",
Expand All @@ -20,8 +20,8 @@
},
"homepage": "https://github.com/ngrx/platform#readme",
"peerDependencies": {
"@angular/common": "^11.0.0",
"@angular/core": "^11.0.0",
"@angular/common": "^12.0.0-rc.0",
"@angular/core": "^12.0.0-rc.0",
"rxjs": "^6.5.3"
},
"schematics": "./schematics/collection.json",
Expand Down
2 changes: 1 addition & 1 deletion modules/component/schematics-core/utility/libs-version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const platformVersion = '^11.1.1';
export const platformVersion = '^12.0.0-beta.0';
1 change: 0 additions & 1 deletion modules/component/tsconfig-build.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"baseUrl": ".",
"declaration": true,
"stripInternal": true,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"strictPropertyInitialization": false,
"module": "es2015",
Expand Down
12 changes: 6 additions & 6 deletions modules/data/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ngrx/data",
"version": "11.1.1",
"version": "12.0.0-beta.0",
"description": "API management for NgRx",
"repository": {
"type": "git",
Expand All @@ -20,11 +20,11 @@
},
"homepage": "https://github.com/ngrx/platform#readme",
"peerDependencies": {
"@angular/common": "^11.0.0",
"@angular/core": "^11.0.0",
"@ngrx/store": "11.1.1",
"@ngrx/effects": "11.1.1",
"@ngrx/entity": "11.1.1",
"@angular/common": "^12.0.0-rc.0",
"@angular/core": "^12.0.0-rc.0",
"@ngrx/store": "12.0.0-beta.0",
"@ngrx/effects": "12.0.0-beta.0",
"@ngrx/entity": "12.0.0-beta.0",
"rxjs": "^6.5.3"
},
"schematics": "./schematics/collection.json",
Expand Down
2 changes: 1 addition & 1 deletion modules/data/schematics-core/utility/libs-version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const platformVersion = '^11.1.1';
export const platformVersion = '^12.0.0-beta.0';
1 change: 0 additions & 1 deletion modules/data/tsconfig-build.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"baseUrl": "../../",
"declaration": true,
"stripInternal": true,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"module": "es2015",
"moduleResolution": "node",
Expand Down
6 changes: 3 additions & 3 deletions modules/effects/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ngrx/effects",
"version": "11.1.1",
"version": "12.0.0-beta.0",
"description": "Side effect model for @ngrx/store",
"repository": {
"type": "git",
Expand All @@ -21,8 +21,8 @@
},
"homepage": "https://github.com/ngrx/platform#readme",
"peerDependencies": {
"@angular/core": "^11.0.0",
"@ngrx/store": "11.1.1",
"@angular/core": "^12.0.0-rc.0",
"@ngrx/store": "12.0.0-beta.0",
"rxjs": "^6.5.3"
},
"schematics": "./schematics/collection.json",
Expand Down
2 changes: 1 addition & 1 deletion modules/effects/schematics-core/utility/libs-version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const platformVersion = '^11.1.1';
export const platformVersion = '^12.0.0-beta.0';
1 change: 0 additions & 1 deletion modules/effects/tsconfig-build.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"baseUrl": "../../",
"declaration": true,
"stripInternal": true,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"module": "es2015",
"moduleResolution": "node",
Expand Down
6 changes: 3 additions & 3 deletions modules/entity/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ngrx/entity",
"version": "11.1.1",
"version": "12.0.0-beta.0",
"description": "Common utilities for entity reducers",
"repository": {
"type": "git",
Expand All @@ -20,8 +20,8 @@
},
"homepage": "https://github.com/ngrx/platform#readme",
"peerDependencies": {
"@angular/core": "^11.0.0",
"@ngrx/store": "11.1.1",
"@angular/core": "^12.0.0-rc.0",
"@ngrx/store": "12.0.0-beta.0",
"rxjs": "^6.5.3"
},
"schematics": "./schematics/collection.json",
Expand Down
2 changes: 1 addition & 1 deletion modules/entity/schematics-core/utility/libs-version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const platformVersion = '^11.1.1';
export const platformVersion = '^12.0.0-beta.0';
1 change: 0 additions & 1 deletion modules/entity/tsconfig-build.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"baseUrl": "../../",
"declaration": true,
"stripInternal": true,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"module": "es2015",
"moduleResolution": "node",
Expand Down
10 changes: 5 additions & 5 deletions modules/router-store/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ngrx/router-store",
"version": "11.1.1",
"version": "12.0.0-beta.0",
"description": "Bindings to connect @angular/router to @ngrx/store",
"repository": {
"type": "git",
Expand All @@ -20,10 +20,10 @@
},
"homepage": "https://github.com/ngrx/platform#readme",
"peerDependencies": {
"@angular/common": "^11.0.0",
"@angular/core": "^11.0.0",
"@angular/router": "^11.0.0",
"@ngrx/store": "11.1.1",
"@angular/common": "^12.0.0-rc.0",
"@angular/core": "^12.0.0-rc.0",
"@angular/router": "^12.0.0-rc.0",
"@ngrx/store": "12.0.0-beta.0",
"rxjs": "^6.5.3"
},
"schematics": "./schematics/collection.json",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const platformVersion = '^11.1.1';
export const platformVersion = '^12.0.0-beta.0';
2 changes: 1 addition & 1 deletion modules/router-store/src/serializers/default_serializer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export class DefaultRouterStateSerializer
: null,
queryParams: route.queryParams,
queryParamMap: route.queryParamMap,
fragment: route.fragment,
fragment: route.fragment!,
component: (route.routeConfig
? route.routeConfig.component
: undefined) as any,
Expand Down
2 changes: 1 addition & 1 deletion modules/router-store/src/serializers/minimal_serializer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export class MinimalRouterStateSerializer
}
: null,
queryParams: route.queryParams,
fragment: route.fragment,
fragment: route.fragment!,
firstChild: children[0],
children,
};
Expand Down
1 change: 0 additions & 1 deletion modules/router-store/tsconfig-build.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"baseUrl": "../../",
"declaration": true,
"stripInternal": true,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"module": "es2015",
"moduleResolution": "node",
Expand Down
1 change: 0 additions & 1 deletion modules/schematics-core/testing/create-workspace.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export const defaultWorkspaceOptions = {
name: 'workspace',
newProjectRoot: 'projects',
version: '6.0.0',
defaultProject: 'bar',
};

export const defaultAppOptions = {
Expand Down
2 changes: 1 addition & 1 deletion modules/schematics-core/utility/libs-version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const platformVersion = '^11.1.1';
export const platformVersion = '^12.0.0-beta.0';
2 changes: 1 addition & 1 deletion modules/schematics/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ngrx/schematics",
"version": "11.1.1",
"version": "12.0.0-beta.0",
"description": "NgRx Schematics for Angular",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion modules/schematics/schematics-core/utility/libs-version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const platformVersion = '^11.1.1';
export const platformVersion = '^12.0.0-beta.0';
2 changes: 1 addition & 1 deletion modules/schematics/src/container/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export default function (options: ContainerOptions): Rule {
options.name = parsedPath.name;
options.path = parsedPath.path;

const opts = ['state', 'stateInterface'].reduce(
const opts = ['state', 'stateInterface', 'testDepth'].reduce(
(current: Partial<ContainerOptions>, key) => {
return omit(current, key as any);
},
Expand Down
2 changes: 1 addition & 1 deletion modules/schematics/src/store/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ describe('Store Schematic', () => {

const specifiedProjectPath = getTestProjectPath(defaultWorkspaceOptions, {
...defaultAppOptions,
name: defaultWorkspaceOptions.defaultProject,
name: 'bar',
});

const tree = await schematicRunner
Expand Down
4 changes: 2 additions & 2 deletions modules/store-devtools/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ngrx/store-devtools",
"version": "11.1.1",
"version": "12.0.0-beta.0",
"description": "Developer tools for @ngrx/store",
"repository": {
"type": "git",
Expand All @@ -20,7 +20,7 @@
},
"homepage": "https://github.com/ngrx/platform#readme",
"peerDependencies": {
"@ngrx/store": "11.1.1",
"@ngrx/store": "12.0.0-beta.0",
"rxjs": "^6.5.3"
},
"schematics": "./schematics/collection.json",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const platformVersion = '^11.1.1';
export const platformVersion = '^12.0.0-beta.0';
1 change: 0 additions & 1 deletion modules/store-devtools/tsconfig-build.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"baseUrl": "../../",
"declaration": true,
"stripInternal": true,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"module": "es2015",
"moduleResolution": "node",
Expand Down
2 changes: 1 addition & 1 deletion modules/store/migrations/8_0_0-beta/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export default function (): Rule {
function findMetaReducersImportStatements(
sourceFile: ts.SourceFile,
createChange: (node: ts.Node) => ReplaceChange,
logger: logging.LoggerApi
logger: any
) {
let canRunSchematics = false;

Expand Down
4 changes: 2 additions & 2 deletions modules/store/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ngrx/store",
"version": "11.1.1",
"version": "12.0.0-beta.0",
"description": "RxJS powered Redux for Angular apps",
"repository": {
"type": "git",
Expand All @@ -21,7 +21,7 @@
},
"homepage": "https://github.com/ngrx/platform#readme",
"peerDependencies": {
"@angular/core": "^11.0.0",
"@angular/core": "^12.0.0-rc.0",
"rxjs": "^6.5.3"
},
"schematics": "./schematics/collection.json",
Expand Down
2 changes: 1 addition & 1 deletion modules/store/schematics-core/utility/libs-version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const platformVersion = '^11.1.1';
export const platformVersion = '^12.0.0-beta.0';
1 change: 0 additions & 1 deletion modules/store/spec/ngc/tsconfig.ngc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"compilerOptions": {
"target": "ES5",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"module": "commonjs",
"moduleResolution": "node",
Expand Down
Loading

0 comments on commit 4fb030e

Please sign in to comment.