Skip to content

Commit

Permalink
build: update to Nx 14.7 (#3574)
Browse files Browse the repository at this point in the history
  • Loading branch information
markostanimirovic authored Sep 19, 2022
1 parent 02431b4 commit 9804eca
Show file tree
Hide file tree
Showing 7 changed files with 1,489 additions and 1,940 deletions.
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ commands:
jobs:
install:
<<: *run_in_node
resource_class: large
steps:
- checkout
- restore_cache:
Expand Down
7 changes: 4 additions & 3 deletions modules/component-store/src/component-store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -238,11 +238,12 @@ export class ComponentStore<T extends object> implements OnDestroy {
select<
Selectors extends Array<Observable<unknown> | SelectConfig | ProjectorFn>,
Result,
ProjectorFn = (...a: unknown[]) => Result
ProjectorFn extends (...a: unknown[]) => Result
>(...args: Selectors): Observable<Result> {
const { observables, projector, config } = processSelectorArgs<
Selectors,
Result
Result,
ProjectorFn
>(args);

let observable$: Observable<Result>;
Expand Down Expand Up @@ -358,7 +359,7 @@ export class ComponentStore<T extends object> implements OnDestroy {
function processSelectorArgs<
Selectors extends Array<Observable<unknown> | SelectConfig | ProjectorFn>,
Result,
ProjectorFn = (...a: unknown[]) => Result
ProjectorFn extends (...a: unknown[]) => Result
>(
args: Selectors
): {
Expand Down
2 changes: 1 addition & 1 deletion modules/effects/src/effect_creator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export function getCreateEffectMetadata<
instance[propertyName].hasOwnProperty(CREATE_EFFECT_METADATA_KEY)
) {
// If the property type has overridden `hasOwnProperty` we need to ensure
// that the metadata is valid (containing a `dispatch`property)
// that the metadata is valid (containing a `dispatch` property)
// https://github.com/ngrx/platform/issues/2975
const property = instance[propertyName] as any;
return property[CREATE_EFFECT_METADATA_KEY].hasOwnProperty('dispatch');
Expand Down
2 changes: 1 addition & 1 deletion modules/effects/src/effects_metadata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function getEffectsMetadata<T extends Object>(
export function getSourceMetadata<T extends Object>(
instance: T
): EffectMetadata<T>[] {
const effects: Array<(instance: T) => EffectMetadata<T>[]> = [
const effects: Array<(instance: Object) => EffectMetadata<T>[]> = [
getEffectDecoratorMetadata,
getCreateEffectMetadata,
];
Expand Down
80 changes: 41 additions & 39 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,18 +86,18 @@
]
},
"dependencies": {
"@angular/animations": "14.1.3",
"@angular/cdk": "14.1.3",
"@angular/common": "14.1.3",
"@angular/compiler": "14.1.3",
"@angular/core": "14.1.3",
"@angular/forms": "14.1.3",
"@angular/material": "14.1.3",
"@angular/platform-browser": "14.1.3",
"@angular/platform-browser-dynamic": "14.1.3",
"@angular/platform-server": "14.1.3",
"@angular/router": "14.1.3",
"@nrwl/angular": "14.5.10",
"@angular/animations": "14.2.2",
"@angular/cdk": "14.2.2",
"@angular/common": "14.2.2",
"@angular/compiler": "14.2.2",
"@angular/core": "14.2.2",
"@angular/forms": "14.2.2",
"@angular/material": "14.2.2",
"@angular/platform-browser": "14.2.2",
"@angular/platform-browser-dynamic": "14.2.2",
"@angular/platform-server": "14.2.2",
"@angular/router": "14.2.2",
"@nrwl/angular": "14.7.5",
"core-js": "^2.5.4",
"eslint-etc": "^5.1.0",
"opencollective": "^1.0.3",
Expand All @@ -108,34 +108,34 @@
"zone.js": "0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "14.1.3",
"@angular-eslint/builder": "14.0.3",
"@angular-eslint/eslint-plugin": "14.0.3",
"@angular-eslint/eslint-plugin-template": "14.0.3",
"@angular-eslint/schematics": "14.0.3",
"@angular-eslint/template-parser": "14.0.3",
"@angular/cli": "~14.1.0",
"@angular/compiler-cli": "14.1.3",
"@angular/language-service": "14.1.3",
"@angular-devkit/build-angular": "14.2.3",
"@angular-eslint/builder": "14.0.4",
"@angular-eslint/eslint-plugin": "14.0.4",
"@angular-eslint/eslint-plugin-template": "14.0.4",
"@angular-eslint/schematics": "14.0.4",
"@angular-eslint/template-parser": "14.0.4",
"@angular/cli": "~14.2.0",
"@angular/compiler-cli": "14.2.2",
"@angular/language-service": "14.2.2",
"@babel/core": "7.9.0",
"@nrwl/cli": "14.5.10",
"@nrwl/cypress": "14.5.10",
"@nrwl/eslint-plugin-nx": "14.5.10",
"@nrwl/jest": "14.5.10",
"@nrwl/linter": "14.5.10",
"@nrwl/node": "14.5.10",
"@nrwl/nx-cloud": "14.5.4",
"@nrwl/tao": "14.5.10",
"@nrwl/workspace": "14.5.10",
"@nrwl/cli": "14.7.5",
"@nrwl/cypress": "14.7.5",
"@nrwl/eslint-plugin-nx": "14.7.5",
"@nrwl/jest": "14.7.5",
"@nrwl/linter": "14.7.5",
"@nrwl/node": "14.7.5",
"@nrwl/nx-cloud": "14.6.2",
"@nrwl/tao": "14.7.5",
"@nrwl/workspace": "14.7.5",
"@octokit/rest": "^15.17.0",
"@schematics/angular": "14.1.3",
"@schematics/angular": "14.2.3",
"@testing-library/cypress": "^7.0.1",
"@types/fs-extra": "^2.1.0",
"@types/glob": "^5.0.33",
"@types/globby": "^8.0.0",
"@types/jasmine": "4.0.3",
"@types/jasminewd2": "^2.0.2",
"@types/jest": "27.4.1",
"@types/jest": "28.1.8",
"@types/lodash": "^4.14.80",
"@types/ncp": "^2.0.1",
"@types/node": "18.7.1",
Expand All @@ -144,9 +144,9 @@
"@types/rimraf": "^0.0.28",
"@types/semver": "^7.3.9",
"@types/shelljs": "^0.8.5",
"@typescript-eslint/eslint-plugin": "5.35.1",
"@typescript-eslint/parser": "5.35.1",
"@typescript-eslint/utils": "5.35.1",
"@typescript-eslint/eslint-plugin": "5.37.0",
"@typescript-eslint/parser": "5.37.0",
"@typescript-eslint/utils": "5.37.0",
"chokidar": "^1.7.0",
"chokidar-cli": "^1.2.0",
"conventional-changelog": "^1.1.4",
Expand All @@ -166,7 +166,9 @@
"jasmine": "^3.4.0",
"jasmine-core": "4.2.0",
"jasmine-spec-reporter": "7.0.0",
"jest": "27.5.1",
"jest": "28.1.3",
"jest-environment-jsdom": "28.1.1",
"jest-jasmine2": "28.1.1",
"jest-preset-angular": "12.2.2",
"karma": "6.4.0",
"karma-chrome-launcher": "3.1.0",
Expand All @@ -176,7 +178,7 @@
"karma-jasmine-html-reporter": "2.0.0",
"lint-staged": "^8.0.0",
"ncp": "^2.0.0",
"ng-packagr": "14.1.0",
"ng-packagr": "14.2.1",
"npm-run-all": "^4.1.5",
"nyc": "^10.1.2",
"ora": "^1.3.0",
Expand All @@ -193,14 +195,14 @@
"rxjs-marbles": "^7.0.1",
"shelljs": "^0.8.3",
"sorcery": "^0.10.0",
"ts-jest": "27.1.4",
"ts-jest": "28.0.8",
"ts-loader": "^5.3.3",
"ts-node": "10.9.1",
"ts-snippet": "5.0.2",
"tsconfig-paths": "^3.1.3",
"tsickle": "^0.37.0",
"tsutils": "2.27.2",
"typescript": "4.7.4",
"typescript": "4.8.3",
"uglify-js": "^3.1.9"
},
"collective": {
Expand Down
27 changes: 14 additions & 13 deletions projects/standalone-app/src/main.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import { enableProdMode, importProvidersFrom } from '@angular/core';
import { enableProdMode } from '@angular/core';
import { bootstrapApplication } from '@angular/platform-browser';
import { RouterModule } from '@angular/router';
import {
provideRouter,
withEnabledBlockingInitialNavigation,
} from '@angular/router';
import { provideStore } from '@ngrx/store';
import { provideEffects } from '@ngrx/effects';
import { provideRouterStore, routerReducer } from '@ngrx/router-store';
Expand All @@ -18,17 +21,15 @@ if (environment.production) {
bootstrapApplication(AppComponent, {
providers: [
provideStore({ router: routerReducer }),
importProvidersFrom(
RouterModule.forRoot(
[
{
path: 'feature',
loadChildren: () =>
import('./app/lazy/feature.routes').then((m) => m.routes),
},
],
{ initialNavigation: 'enabledBlocking' }
)
provideRouter(
[
{
path: 'feature',
loadChildren: () =>
import('./app/lazy/feature.routes').then((m) => m.routes),
},
],
withEnabledBlockingInitialNavigation()
),
provideStoreDevtools({
maxAge: 25,
Expand Down
Loading

0 comments on commit 9804eca

Please sign in to comment.