Skip to content

Commit

Permalink
chore: upgrade Nx workspace
Browse files Browse the repository at this point in the history
  • Loading branch information
arturovt committed Mar 21, 2024
1 parent 4070abc commit 22c7cd3
Show file tree
Hide file tree
Showing 6 changed files with 2,081 additions and 3,256 deletions.
1 change: 1 addition & 0 deletions libs/until-destroy/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
],
"rules": {
"@angular-eslint/no-output-native": ["off"],
"@typescript-eslint/no-empty-function": ["off"],
"@typescript-eslint/no-non-null-assertion": ["off"],
"@nx/enforce-module-boundaries": [
"error",
Expand Down
3 changes: 1 addition & 2 deletions libs/until-destroy/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
"executor": "@nx/angular:package",
"options": {
"tsConfig": "libs/until-destroy/tsconfig.lib.json",
"project": "libs/until-destroy/ng-package.json",
"updateBuildableProjectDepsInPackageJson": true
"project": "libs/until-destroy/ng-package.json"
}
},
"test": {
Expand Down
16 changes: 7 additions & 9 deletions libs/until-destroy/tests/until-destroyed.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
ɵPipeDef as PipeDef,
ɵComponentDef as ComponentDef,
ɵɵdefinePipe as definePipe,
ɵɵdefineComponent as defineComponent
ɵɵdefineComponent as defineComponent,
} from '@angular/core';
import { Subject, Subscription } from 'rxjs';

Expand All @@ -13,7 +13,7 @@ function createObserver() {
return {
next: jest.fn(),
error: jest.fn(),
complete: jest.fn()
complete: jest.fn(),
};
}

Expand Down Expand Up @@ -97,9 +97,7 @@ describe('untilDestroyed operator with non-directive/component classes', () => {
const spy = createObserver();

class Test {
// Here we explicitly set `@ts-ignore` since the compiler will throw
// because of non-existing method.
// @ts-ignore
// @ts-expect-error the compiler will throw because the method doesn't exist.
dummy = new Subject().pipe(untilDestroyed(this, 'destroy')).subscribe(spy);
}

Expand Down Expand Up @@ -158,7 +156,7 @@ describe('UntilDestroy decorator and untilDestroyed operator', () => {
decls: 0,
type: TestComponent,
selectors: [[]],
template: () => {}
template: () => {},
}) as ComponentDef<TestComponent>;

constructor() {
Expand All @@ -182,7 +180,7 @@ describe('UntilDestroy decorator and untilDestroyed operator', () => {
static ɵpipe = definePipe({
name: 'test',
pure: false,
type: TestPipe
type: TestPipe,
}) as PipeDef<TestPipe>;

constructor() {
Expand All @@ -206,7 +204,7 @@ describe('UntilDestroy decorator and untilDestroyed operator', () => {
decls: 0,
type: TestComponent,
selectors: [[]],
template: () => {}
template: () => {},
}) as ComponentDef<TestComponent>;
}

Expand All @@ -225,7 +223,7 @@ describe('UntilDestroy decorator and untilDestroyed operator', () => {
decls: 0,
type: TestComponent,
selectors: [[]],
template: () => {}
template: () => {},
}) as ComponentDef<TestComponent>;

subscription = new Subject().pipe(untilDestroyed(this)).subscribe();
Expand Down
15 changes: 7 additions & 8 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
"options": {}
}
},
"affected": {
"defaultBase": "master"
},
"defaultProject": "until-destroy",
"generators": {
"@nx/angular:application": {
Expand Down Expand Up @@ -58,10 +55,6 @@
"e2e-development-jit": {
"inputs": ["default", "^production"]
},
"lint": {
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
"cache": true
},
"@nx/jest:jest": {
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
"cache": true,
Expand All @@ -74,7 +67,13 @@
"codeCoverage": true
}
}
},
"@nx/eslint:lint": {
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
"cache": true
}
},
"parallel": 1
"parallel": 1,
"useInferencePlugins": false,
"defaultBase": "master"
}
56 changes: 28 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,38 +35,39 @@
"Angular unsubscribe"
],
"devDependencies": {
"@angular-builders/custom-webpack": "16.0.0",
"@angular-devkit/build-angular": "17.0.9",
"@angular-devkit/core": "17.0.9",
"@angular-devkit/schematics": "17.0.9",
"@angular-eslint/builder": "15.1.0",
"@angular-builders/custom-webpack": "17.0.1",
"@angular-devkit/build-angular": "17.2.3",
"@angular-devkit/core": "17.2.3",
"@angular-devkit/schematics": "17.2.3",
"@angular-eslint/eslint-plugin": "17.0.1",
"@angular-eslint/eslint-plugin-template": "17.0.1",
"@angular-eslint/template-parser": "17.0.1",
"@angular/cli": "~17.0.0",
"@angular/common": "17.0.8",
"@angular/compiler": "17.0.8",
"@angular/compiler-cli": "17.0.8",
"@angular/core": "17.0.8",
"@angular/platform-browser": "17.0.8",
"@angular/platform-browser-dynamic": "17.0.8",
"@angular/router": "17.0.8",
"@angular/cli": "~17.2.0",
"@angular/common": "17.2.4",
"@angular/compiler": "17.2.4",
"@angular/compiler-cli": "17.2.4",
"@angular/core": "17.2.4",
"@angular/platform-browser": "17.2.4",
"@angular/platform-browser-dynamic": "17.2.4",
"@angular/router": "17.2.4",
"@babel/core": "7.20.2",
"@commitlint/cli": "16.2.1",
"@commitlint/config-conventional": "16.2.1",
"@nrwl/tao": "17.2.8",
"@nx/angular": "17.2.8",
"@nx/cypress": "17.2.8",
"@nx/eslint-plugin": "17.2.8",
"@nx/jest": "17.2.8",
"@nx/workspace": "17.2.8",
"@schematics/angular": "17.0.9",
"@nrwl/tao": "18.1.2",
"@nx/angular": "18.1.2",
"@nx/cypress": "18.1.2",
"@nx/eslint": "18.1.2",
"@nx/eslint-plugin": "18.1.2",
"@nx/jest": "18.1.2",
"@nx/workspace": "18.1.2",
"@schematics/angular": "17.2.3",
"@types/jest": "29.4.4",
"@types/minimist": "1.2.2",
"@types/node": "18.16.9",
"@typescript-eslint/eslint-plugin": "6.17.0",
"@typescript-eslint/parser": "6.17.0",
"@typescript-eslint/eslint-plugin": "6.21.0",
"@typescript-eslint/parser": "6.21.0",
"all-contributors-cli": "^6.24.0",
"autoprefixer": "^10.4.0",
"cpx": "1.5.0",
"cypress": "9.6.0",
"eslint": "8.48.0",
Expand All @@ -77,11 +78,11 @@
"husky": "7.0.4",
"jest": "29.5.0",
"jest-environment-jsdom": "29.5.0",
"jest-preset-angular": "13.1.5",
"jest-preset-angular": "14.0.3",
"lint-staged": "^11.2.6",
"minimist": "1.2.6",
"ng-packagr": "17.0.3",
"nx": "17.2.8",
"ng-packagr": "17.2.1",
"nx": "18.1.2",
"postcss": "^8.4.19",
"postcss-import": "14.1.0",
"postcss-preset-env": "7.5.0",
Expand All @@ -95,9 +96,8 @@
"ts-jest": "29.1.1",
"ts-morph": "^7.3.0",
"tslib": "^2.4.1",
"typescript": "5.2.2",
"zone.js": "0.14.2",
"@nx/eslint": "17.2.8"
"typescript": "5.3.3",
"zone.js": "0.14.4"
},
"lint-staged": {
"*.{js,ts,html,md,json}": [
Expand Down
Loading

0 comments on commit 22c7cd3

Please sign in to comment.