Skip to content

Commit a7a233f

Browse files
timdeschryvertimdeschryver
authored
build: update nx packages (#3875)
1 parent 0acbf0f commit a7a233f

File tree

82 files changed

+765
-1247
lines changed

Some content is hidden

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

82 files changed

+765
-1247
lines changed

‎.eslintrc.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"root": true,
33
"ignorePatterns": ["**/*"],
4-
"plugins": ["@nrwl/nx"],
4+
"plugins": ["@nx"],
55
"overrides": [
66
{
77
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
88
"rules": {
9-
"@nrwl/nx/enforce-module-boundaries": [
9+
"@nx/enforce-module-boundaries": [
1010
"error",
1111
{
1212
"allow": [],
@@ -17,17 +17,19 @@
1717
}
1818
]
1919
}
20-
]
20+
],
21+
"@typescript-eslint/member-ordering": "off",
22+
"@typescript-eslint/no-inferrable-types": "warn"
2123
}
2224
},
2325
{
2426
"files": ["*.ts", "*.tsx"],
25-
"extends": ["plugin:@nrwl/nx/typescript"],
27+
"extends": ["plugin:@nx/typescript"],
2628
"rules": {}
2729
},
2830
{
2931
"files": ["*.js", "*.jsx"],
30-
"extends": ["plugin:@nrwl/nx/javascript"],
32+
"extends": ["plugin:@nx/javascript"],
3133
"rules": {}
3234
},
3335
{

‎angular.json

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
}
3232
},
3333
"lint": {
34-
"builder": "@nrwl/linter:eslint",
34+
"builder": "@nx/linter:eslint",
3535
"options": {
3636
"lintFilePatterns": [
3737
"modules/component/*/**/*.ts",
@@ -41,7 +41,7 @@
4141
"outputs": ["{options.outputFile}"]
4242
},
4343
"test": {
44-
"builder": "@nrwl/jest:jest",
44+
"builder": "@nx/jest:jest",
4545
"options": {
4646
"jestConfig": "modules/component/jest.config.ts",
4747
"runInBand": true
@@ -82,7 +82,7 @@
8282
}
8383
},
8484
"lint": {
85-
"builder": "@nrwl/linter:eslint",
85+
"builder": "@nx/linter:eslint",
8686
"options": {
8787
"lintFilePatterns": [
8888
"modules/component-store/*/**/*.ts",
@@ -92,7 +92,7 @@
9292
"outputs": ["{options.outputFile}"]
9393
},
9494
"test": {
95-
"builder": "@nrwl/jest:jest",
95+
"builder": "@nx/jest:jest",
9696
"options": {
9797
"jestConfig": "modules/component-store/jest.config.ts",
9898
"runInBand": true
@@ -133,7 +133,7 @@
133133
}
134134
},
135135
"lint": {
136-
"builder": "@nrwl/linter:eslint",
136+
"builder": "@nx/linter:eslint",
137137
"options": {
138138
"lintFilePatterns": [
139139
"modules/data/*/**/*.ts",
@@ -143,7 +143,7 @@
143143
"outputs": ["{options.outputFile}"]
144144
},
145145
"test": {
146-
"builder": "@nrwl/jest:jest",
146+
"builder": "@nx/jest:jest",
147147
"options": {
148148
"jestConfig": "modules/data/jest.config.ts",
149149
"runInBand": true
@@ -158,7 +158,7 @@
158158
"$schema": "../../node_modules/nx/schemas/project-schema.json",
159159
"projectType": "application",
160160
"schematics": {
161-
"@nrwl/angular:component": {
161+
"@nx/angular:component": {
162162
"style": "scss"
163163
}
164164
},
@@ -228,7 +228,7 @@
228228
}
229229
},
230230
"lint": {
231-
"builder": "@nrwl/linter:eslint",
231+
"builder": "@nx/linter:eslint",
232232
"options": {
233233
"lintFilePatterns": [
234234
"projects/data-example-app/*/**/*.ts",
@@ -238,7 +238,7 @@
238238
"outputs": ["{options.outputFile}"]
239239
},
240240
"test": {
241-
"builder": "@nrwl/jest:jest",
241+
"builder": "@nx/jest:jest",
242242
"options": {
243243
"jestConfig": "projects/data-example-app/jest.config.ts",
244244
"runInBand": true,
@@ -298,7 +298,7 @@
298298
}
299299
},
300300
"lint": {
301-
"builder": "@nrwl/linter:eslint",
301+
"builder": "@nx/linter:eslint",
302302
"options": {
303303
"lintFilePatterns": [
304304
"projects/ngrx.io/src/*/**/*.ts",
@@ -360,7 +360,7 @@
360360
}
361361
},
362362
"lint": {
363-
"builder": "@nrwl/linter:eslint",
363+
"builder": "@nx/linter:eslint",
364364
"options": {
365365
"lintFilePatterns": [
366366
"modules/effects/*/**/*.ts",
@@ -370,7 +370,7 @@
370370
"outputs": ["{options.outputFile}"]
371371
},
372372
"test": {
373-
"builder": "@nrwl/jest:jest",
373+
"builder": "@nx/jest:jest",
374374
"options": {
375375
"jestConfig": "modules/effects/jest.config.ts",
376376
"runInBand": true
@@ -420,7 +420,7 @@
420420
}
421421
},
422422
"lint": {
423-
"builder": "@nrwl/linter:eslint",
423+
"builder": "@nx/linter:eslint",
424424
"options": {
425425
"lintFilePatterns": [
426426
"modules/entity/*/**/*.ts",
@@ -430,7 +430,7 @@
430430
"outputs": ["{options.outputFile}"]
431431
},
432432
"test": {
433-
"builder": "@nrwl/jest:jest",
433+
"builder": "@nx/jest:jest",
434434
"options": {
435435
"jestConfig": "modules/entity/jest.config.ts",
436436
"runInBand": true
@@ -449,7 +449,7 @@
449449
"schematics": {},
450450
"architect": {
451451
"lint": {
452-
"builder": "@nrwl/linter:eslint",
452+
"builder": "@nx/linter:eslint",
453453
"options": {
454454
"lintFilePatterns": [
455455
"modules/eslint-plugin/*/**/*.ts",
@@ -459,15 +459,15 @@
459459
"outputs": ["{options.outputFile}"]
460460
},
461461
"test": {
462-
"builder": "@nrwl/jest:jest",
462+
"builder": "@nx/jest:jest",
463463
"options": {
464464
"jestConfig": "modules/eslint-plugin/jest.config.ts",
465465
"runInBand": true
466466
},
467467
"outputs": ["{workspaceRoot}/coverage/modules/eslint-plugin"]
468468
},
469469
"build-package": {
470-
"builder": "@nrwl/js:tsc",
470+
"builder": "@nx/js:tsc",
471471
"options": {
472472
"outputPath": "dist/modules/eslint-plugin",
473473
"tsConfig": "modules/eslint-plugin/tsconfig.build.json",
@@ -580,7 +580,7 @@
580580
}
581581
},
582582
"lint": {
583-
"builder": "@nrwl/linter:eslint",
583+
"builder": "@nx/linter:eslint",
584584
"options": {
585585
"lintFilePatterns": [
586586
"projects/example-app/*/**/*.ts",
@@ -590,7 +590,7 @@
590590
"outputs": ["{options.outputFile}"]
591591
},
592592
"test": {
593-
"builder": "@nrwl/jest:jest",
593+
"builder": "@nx/jest:jest",
594594
"options": {
595595
"jestConfig": "projects/example-app/jest.config.ts",
596596
"runInBand": true
@@ -607,7 +607,7 @@
607607
"projectType": "application",
608608
"architect": {
609609
"e2e": {
610-
"builder": "@nrwl/cypress:cypress",
610+
"builder": "@nx/cypress:cypress",
611611
"options": {
612612
"cypressConfig": "projects/example-app-e2e/cypress.config.ts",
613613
"tsConfig": "projects/example-app-e2e/tsconfig.e2e.json",
@@ -624,7 +624,7 @@
624624
"defaultConfiguration": "production"
625625
},
626626
"lint": {
627-
"builder": "@nrwl/linter:eslint",
627+
"builder": "@nx/linter:eslint",
628628
"options": {
629629
"lintFilePatterns": ["projects/example-app-e2e/**/*.{js,ts}"]
630630
},
@@ -664,7 +664,7 @@
664664
}
665665
},
666666
"lint": {
667-
"builder": "@nrwl/linter:eslint",
667+
"builder": "@nx/linter:eslint",
668668
"options": {
669669
"lintFilePatterns": [
670670
"modules/router-store/*/**/*.ts",
@@ -674,7 +674,7 @@
674674
"outputs": ["{options.outputFile}"]
675675
},
676676
"test": {
677-
"builder": "@nrwl/jest:jest",
677+
"builder": "@nx/jest:jest",
678678
"options": {
679679
"jestConfig": "modules/router-store/jest.config.ts",
680680
"runInBand": true
@@ -693,7 +693,7 @@
693693
"schematics": {},
694694
"architect": {
695695
"lint": {
696-
"builder": "@nrwl/linter:eslint",
696+
"builder": "@nx/linter:eslint",
697697
"options": {
698698
"lintFilePatterns": [
699699
"modules/schematics/*/**/*.ts",
@@ -703,15 +703,15 @@
703703
"outputs": ["{options.outputFile}"]
704704
},
705705
"test": {
706-
"builder": "@nrwl/jest:jest",
706+
"builder": "@nx/jest:jest",
707707
"options": {
708708
"jestConfig": "modules/schematics/jest.config.ts",
709709
"runInBand": true
710710
},
711711
"outputs": ["{workspaceRoot}/coverage/modules/schematics"]
712712
},
713713
"build-package": {
714-
"builder": "@nrwl/js:tsc",
714+
"builder": "@nx/js:tsc",
715715
"options": {
716716
"outputPath": "dist/modules/schematics",
717717
"tsConfig": "modules/schematics/tsconfig.build.json",
@@ -777,7 +777,7 @@
777777
"prefix": "ngrx",
778778
"architect": {
779779
"lint": {
780-
"builder": "@nrwl/linter:eslint",
780+
"builder": "@nx/linter:eslint",
781781
"options": {
782782
"lintFilePatterns": [
783783
"modules/schematics-core/*/**/*.ts",
@@ -787,7 +787,7 @@
787787
"outputs": ["{options.outputFile}"]
788788
},
789789
"test": {
790-
"builder": "@nrwl/jest:jest",
790+
"builder": "@nx/jest:jest",
791791
"options": {
792792
"jestConfig": "modules/schematics-core/jest.config.ts",
793793
"passWithNoTests": true
@@ -867,7 +867,7 @@
867867
}
868868
},
869869
"lint": {
870-
"builder": "@nrwl/linter:eslint",
870+
"builder": "@nx/linter:eslint",
871871
"options": {
872872
"lintFilePatterns": [
873873
"projects/standalone-app/**/*.ts",
@@ -876,7 +876,7 @@
876876
}
877877
},
878878
"test": {
879-
"builder": "@nrwl/jest:jest",
879+
"builder": "@nx/jest:jest",
880880
"outputs": ["{workspaceRoot}/coverage/projects/standalone-app"],
881881
"options": {
882882
"jestConfig": "projects/standalone-app/jest.config.ts",
@@ -893,7 +893,7 @@
893893
"projectType": "application",
894894
"architect": {
895895
"e2e": {
896-
"builder": "@nrwl/cypress:cypress",
896+
"builder": "@nx/cypress:cypress",
897897
"options": {
898898
"cypressConfig": "projects/standalone-app-e2e/cypress.config.ts",
899899
"devServerTarget": "standalone-app:serve:development",
@@ -906,7 +906,7 @@
906906
}
907907
},
908908
"lint": {
909-
"builder": "@nrwl/linter:eslint",
909+
"builder": "@nx/linter:eslint",
910910
"outputs": ["{options.outputFile}"],
911911
"options": {
912912
"lintFilePatterns": ["projects/standalone-app-e2e/**/*.{js,ts}"]
@@ -955,7 +955,7 @@
955955
}
956956
},
957957
"lint": {
958-
"builder": "@nrwl/linter:eslint",
958+
"builder": "@nx/linter:eslint",
959959
"options": {
960960
"lintFilePatterns": [
961961
"modules/store/*/**/*.ts",
@@ -965,7 +965,7 @@
965965
"outputs": ["{options.outputFile}"]
966966
},
967967
"test": {
968-
"builder": "@nrwl/jest:jest",
968+
"builder": "@nx/jest:jest",
969969
"options": {
970970
"jestConfig": "modules/store/jest.config.ts",
971971
"runInBand": true
@@ -1006,7 +1006,7 @@
10061006
}
10071007
},
10081008
"lint": {
1009-
"builder": "@nrwl/linter:eslint",
1009+
"builder": "@nx/linter:eslint",
10101010
"options": {
10111011
"lintFilePatterns": [
10121012
"modules/store-devtools/*/**/*.ts",
@@ -1016,7 +1016,7 @@
10161016
"outputs": ["{options.outputFile}"]
10171017
},
10181018
"test": {
1019-
"builder": "@nrwl/jest:jest",
1019+
"builder": "@nx/jest:jest",
10201020
"options": {
10211021
"jestConfig": "modules/store-devtools/jest.config.ts",
10221022
"runInBand": true

‎jest.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
const { getJestProjects } = require('@nrwl/jest');
1+
const { getJestProjects } = require('@nx/jest');
22

33
export default { projects: getJestProjects() };

‎jest.preset.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
const nxPreset = require('@nrwl/jest/preset').default;
1+
const nxPreset = require('@nx/jest/preset').default;
22

33
module.exports = { ...nxPreset };

‎modules/component-store/.eslintrc.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{
66
"files": ["*.ts"],
77
"extends": [
8-
"plugin:@nrwl/nx/angular",
8+
"plugin:@nx/angular",
99
"plugin:@angular-eslint/template/process-inline-templates"
1010
],
1111
"parserOptions": {
@@ -19,7 +19,7 @@
1919
},
2020
{
2121
"files": ["*.html"],
22-
"extends": ["plugin:@nrwl/nx/angular-template"],
22+
"extends": ["plugin:@nx/angular-template"],
2323
"rules": {}
2424
}
2525
]

‎modules/component-store/spec/component-store.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
OnStateInit,
1414
OnStoreInit,
1515
provideComponentStore,
16-
} from '@ngrx/component-store';
16+
} from '..';
1717
import { createSelector } from '@ngrx/store';
1818
import {
1919
asyncScheduler,

0 commit comments

Comments
 (0)