Skip to content

Commit 22c7cd3

Browse files
committed
chore: upgrade Nx workspace
1 parent 4070abc commit 22c7cd3

File tree

6 files changed

+2081
-3256
lines changed

6 files changed

+2081
-3256
lines changed

libs/until-destroy/.eslintrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
],
1111
"rules": {
1212
"@angular-eslint/no-output-native": ["off"],
13+
"@typescript-eslint/no-empty-function": ["off"],
1314
"@typescript-eslint/no-non-null-assertion": ["off"],
1415
"@nx/enforce-module-boundaries": [
1516
"error",

libs/until-destroy/project.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
"executor": "@nx/angular:package",
99
"options": {
1010
"tsConfig": "libs/until-destroy/tsconfig.lib.json",
11-
"project": "libs/until-destroy/ng-package.json",
12-
"updateBuildableProjectDepsInPackageJson": true
11+
"project": "libs/until-destroy/ng-package.json"
1312
}
1413
},
1514
"test": {

libs/until-destroy/tests/until-destroyed.spec.ts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {
22
ɵPipeDef as PipeDef,
33
ɵComponentDef as ComponentDef,
44
ɵɵdefinePipe as definePipe,
5-
ɵɵdefineComponent as defineComponent
5+
ɵɵdefineComponent as defineComponent,
66
} from '@angular/core';
77
import { Subject, Subscription } from 'rxjs';
88

@@ -13,7 +13,7 @@ function createObserver() {
1313
return {
1414
next: jest.fn(),
1515
error: jest.fn(),
16-
complete: jest.fn()
16+
complete: jest.fn(),
1717
};
1818
}
1919

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

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

@@ -158,7 +156,7 @@ describe('UntilDestroy decorator and untilDestroyed operator', () => {
158156
decls: 0,
159157
type: TestComponent,
160158
selectors: [[]],
161-
template: () => {}
159+
template: () => {},
162160
}) as ComponentDef<TestComponent>;
163161

164162
constructor() {
@@ -182,7 +180,7 @@ describe('UntilDestroy decorator and untilDestroyed operator', () => {
182180
static ɵpipe = definePipe({
183181
name: 'test',
184182
pure: false,
185-
type: TestPipe
183+
type: TestPipe,
186184
}) as PipeDef<TestPipe>;
187185

188186
constructor() {
@@ -206,7 +204,7 @@ describe('UntilDestroy decorator and untilDestroyed operator', () => {
206204
decls: 0,
207205
type: TestComponent,
208206
selectors: [[]],
209-
template: () => {}
207+
template: () => {},
210208
}) as ComponentDef<TestComponent>;
211209
}
212210

@@ -225,7 +223,7 @@ describe('UntilDestroy decorator and untilDestroyed operator', () => {
225223
decls: 0,
226224
type: TestComponent,
227225
selectors: [[]],
228-
template: () => {}
226+
template: () => {},
229227
}) as ComponentDef<TestComponent>;
230228

231229
subscription = new Subject().pipe(untilDestroyed(this)).subscribe();

nx.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
"options": {}
66
}
77
},
8-
"affected": {
9-
"defaultBase": "master"
10-
},
118
"defaultProject": "until-destroy",
129
"generators": {
1310
"@nx/angular:application": {
@@ -58,10 +55,6 @@
5855
"e2e-development-jit": {
5956
"inputs": ["default", "^production"]
6057
},
61-
"lint": {
62-
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
63-
"cache": true
64-
},
6558
"@nx/jest:jest": {
6659
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
6760
"cache": true,
@@ -74,7 +67,13 @@
7467
"codeCoverage": true
7568
}
7669
}
70+
},
71+
"@nx/eslint:lint": {
72+
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
73+
"cache": true
7774
}
7875
},
79-
"parallel": 1
76+
"parallel": 1,
77+
"useInferencePlugins": false,
78+
"defaultBase": "master"
8079
}

package.json

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -35,38 +35,39 @@
3535
"Angular unsubscribe"
3636
],
3737
"devDependencies": {
38-
"@angular-builders/custom-webpack": "16.0.0",
39-
"@angular-devkit/build-angular": "17.0.9",
40-
"@angular-devkit/core": "17.0.9",
41-
"@angular-devkit/schematics": "17.0.9",
42-
"@angular-eslint/builder": "15.1.0",
38+
"@angular-builders/custom-webpack": "17.0.1",
39+
"@angular-devkit/build-angular": "17.2.3",
40+
"@angular-devkit/core": "17.2.3",
41+
"@angular-devkit/schematics": "17.2.3",
4342
"@angular-eslint/eslint-plugin": "17.0.1",
4443
"@angular-eslint/eslint-plugin-template": "17.0.1",
4544
"@angular-eslint/template-parser": "17.0.1",
46-
"@angular/cli": "~17.0.0",
47-
"@angular/common": "17.0.8",
48-
"@angular/compiler": "17.0.8",
49-
"@angular/compiler-cli": "17.0.8",
50-
"@angular/core": "17.0.8",
51-
"@angular/platform-browser": "17.0.8",
52-
"@angular/platform-browser-dynamic": "17.0.8",
53-
"@angular/router": "17.0.8",
45+
"@angular/cli": "~17.2.0",
46+
"@angular/common": "17.2.4",
47+
"@angular/compiler": "17.2.4",
48+
"@angular/compiler-cli": "17.2.4",
49+
"@angular/core": "17.2.4",
50+
"@angular/platform-browser": "17.2.4",
51+
"@angular/platform-browser-dynamic": "17.2.4",
52+
"@angular/router": "17.2.4",
5453
"@babel/core": "7.20.2",
5554
"@commitlint/cli": "16.2.1",
5655
"@commitlint/config-conventional": "16.2.1",
57-
"@nrwl/tao": "17.2.8",
58-
"@nx/angular": "17.2.8",
59-
"@nx/cypress": "17.2.8",
60-
"@nx/eslint-plugin": "17.2.8",
61-
"@nx/jest": "17.2.8",
62-
"@nx/workspace": "17.2.8",
63-
"@schematics/angular": "17.0.9",
56+
"@nrwl/tao": "18.1.2",
57+
"@nx/angular": "18.1.2",
58+
"@nx/cypress": "18.1.2",
59+
"@nx/eslint": "18.1.2",
60+
"@nx/eslint-plugin": "18.1.2",
61+
"@nx/jest": "18.1.2",
62+
"@nx/workspace": "18.1.2",
63+
"@schematics/angular": "17.2.3",
6464
"@types/jest": "29.4.4",
6565
"@types/minimist": "1.2.2",
6666
"@types/node": "18.16.9",
67-
"@typescript-eslint/eslint-plugin": "6.17.0",
68-
"@typescript-eslint/parser": "6.17.0",
67+
"@typescript-eslint/eslint-plugin": "6.21.0",
68+
"@typescript-eslint/parser": "6.21.0",
6969
"all-contributors-cli": "^6.24.0",
70+
"autoprefixer": "^10.4.0",
7071
"cpx": "1.5.0",
7172
"cypress": "9.6.0",
7273
"eslint": "8.48.0",
@@ -77,11 +78,11 @@
7778
"husky": "7.0.4",
7879
"jest": "29.5.0",
7980
"jest-environment-jsdom": "29.5.0",
80-
"jest-preset-angular": "13.1.5",
81+
"jest-preset-angular": "14.0.3",
8182
"lint-staged": "^11.2.6",
8283
"minimist": "1.2.6",
83-
"ng-packagr": "17.0.3",
84-
"nx": "17.2.8",
84+
"ng-packagr": "17.2.1",
85+
"nx": "18.1.2",
8586
"postcss": "^8.4.19",
8687
"postcss-import": "14.1.0",
8788
"postcss-preset-env": "7.5.0",
@@ -95,9 +96,8 @@
9596
"ts-jest": "29.1.1",
9697
"ts-morph": "^7.3.0",
9798
"tslib": "^2.4.1",
98-
"typescript": "5.2.2",
99-
"zone.js": "0.14.2",
100-
"@nx/eslint": "17.2.8"
99+
"typescript": "5.3.3",
100+
"zone.js": "0.14.4"
101101
},
102102
"lint-staged": {
103103
"*.{js,ts,html,md,json}": [

0 commit comments

Comments
 (0)