Skip to content

Commit 18db58e

Browse files
authored
Merge pull request #5 from chandru415/nx_17
Nx 17
2 parents 4491f89 + d844d1d commit 18db58e

File tree

17 files changed

+9493
-5687
lines changed

17 files changed

+9493
-5687
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node_modules

.eslintrc.json

Lines changed: 4 additions & 4 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
"enforceBuildableLibDependency": true,
@@ -23,12 +23,12 @@
2323
},
2424
{
2525
"files": ["*.ts", "*.tsx"],
26-
"extends": ["plugin:@nrwl/nx/typescript"],
26+
"extends": ["plugin:@nx/typescript"],
2727
"rules": {}
2828
},
2929
{
3030
"files": ["*.js", "*.jsx"],
31-
"extends": ["plugin:@nrwl/nx/javascript"],
31+
"extends": ["plugin:@nx/javascript"],
3232
"rules": {}
3333
}
3434
]

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,5 @@ testem.log
3737
# System Files
3838
.DS_Store
3939
Thumbs.db
40+
41+
.nx/cache

.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22

33
/dist
44
/coverage
5+
6+
/.nx/cache

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,9 @@ npm i @slck/utils --save
2525
- remainingDaysHoursFormTwoDates
2626
- toCamelCaseKeys
2727
- objectDifferenceByProps
28+
- genericObjectTypeFn
29+
30+
# Types
31+
32+
- GenericObjectType
33+
- ErrorType

migrations.json

Lines changed: 262 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,262 @@
1+
{
2+
"migrations": [
3+
{
4+
"version": "15.7.0-beta.0",
5+
"description": "Split global configuration files into individual project.json files. This migration has been added automatically to the beginning of your migration set to retroactively make them work with the new version of Nx.",
6+
"cli": "nx",
7+
"implementation": "./src/migrations/update-15-7-0/split-configuration-into-project-json-files",
8+
"package": "@nx/workspace",
9+
"name": "15-7-0-split-configuration-into-project-json-files"
10+
},
11+
{
12+
"cli": "nx",
13+
"version": "15.8.2-beta.0",
14+
"description": "Updates the nx wrapper.",
15+
"implementation": "./src/migrations/update-15-8-2/update-nxw",
16+
"package": "nx",
17+
"name": "15.8.2-update-nx-wrapper"
18+
},
19+
{
20+
"cli": "nx",
21+
"version": "16.0.0-beta.0",
22+
"description": "Remove @nrwl/cli.",
23+
"implementation": "./src/migrations/update-16-0-0/remove-nrwl-cli",
24+
"package": "nx",
25+
"name": "16.0.0-remove-nrwl-cli"
26+
},
27+
{
28+
"cli": "nx",
29+
"version": "16.0.0-beta.9",
30+
"description": "Replace `dependsOn.projects` and `inputs` definitions with new configuration format.",
31+
"implementation": "./src/migrations/update-16-0-0/update-depends-on-to-tokens",
32+
"package": "nx",
33+
"name": "16.0.0-tokens-for-depends-on"
34+
},
35+
{
36+
"cli": "nx",
37+
"version": "16.0.0-beta.0",
38+
"description": "Replace @nrwl/nx-cloud with nx-cloud",
39+
"implementation": "./src/migrations/update-16-0-0/update-nx-cloud-runner",
40+
"package": "nx",
41+
"name": "16.0.0-update-nx-cloud-runner"
42+
},
43+
{
44+
"cli": "nx",
45+
"version": "16.2.0-beta.0",
46+
"description": "Remove outputPath from run commands",
47+
"implementation": "./src/migrations/update-16-2-0/remove-run-commands-output-path",
48+
"package": "nx",
49+
"name": "16.2.0-remove-output-path-from-run-commands"
50+
},
51+
{
52+
"cli": "nx",
53+
"version": "16.6.0-beta.6",
54+
"description": "Prefix outputs with {workspaceRoot}/{projectRoot} if needed",
55+
"implementation": "./src/migrations/update-15-0-0/prefix-outputs",
56+
"package": "nx",
57+
"name": "16.6.0-prefix-outputs"
58+
},
59+
{
60+
"cli": "nx",
61+
"version": "16.8.0-beta.3",
62+
"description": "Escape $ in env variables",
63+
"implementation": "./src/migrations/update-16-8-0/escape-dollar-sign-env-variables",
64+
"package": "nx",
65+
"name": "16.8.0-escape-dollar-sign-env"
66+
},
67+
{
68+
"cli": "nx",
69+
"version": "17.0.0-beta.1",
70+
"description": "Updates the default cache directory to .nx/cache",
71+
"implementation": "./src/migrations/update-17-0-0/move-cache-directory",
72+
"package": "nx",
73+
"name": "17.0.0-move-cache-directory"
74+
},
75+
{
76+
"cli": "nx",
77+
"version": "17.0.0-beta.3",
78+
"description": "Use minimal config for tasksRunnerOptions",
79+
"implementation": "./src/migrations/update-17-0-0/use-minimal-config-for-tasks-runner-options",
80+
"package": "nx",
81+
"name": "17.0.0-use-minimal-config-for-tasks-runner-options"
82+
},
83+
{
84+
"version": "17.0.0-rc.1",
85+
"description": "Migration for v17.0.0-rc.1",
86+
"implementation": "./src/migrations/update-17-0-0/rm-default-collection-npm-scope",
87+
"package": "nx",
88+
"name": "rm-default-collection-npm-scope"
89+
},
90+
{
91+
"version": "15.7.0-beta.0",
92+
"description": "Split global configuration files (e.g., workspace.json) into individual project.json files.",
93+
"cli": "nx",
94+
"implementation": "./src/migrations/update-15-7-0/split-configuration-into-project-json-files",
95+
"package": "@nx/workspace",
96+
"name": "15-7-0-split-configuration-into-project-json-files"
97+
},
98+
{
99+
"cli": "nx",
100+
"version": "16.0.0-beta.1",
101+
"description": "Replace @nx/workspace with @nx/workspace",
102+
"implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages",
103+
"package": "@nx/workspace",
104+
"name": "update-16-0-0-add-nx-packages"
105+
},
106+
{
107+
"version": "16.0.0-beta.4",
108+
"description": "Generates a plugin called 'workspace-plugin' containing your workspace generators.",
109+
"cli": "nx",
110+
"implementation": "./src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin",
111+
"package": "@nx/workspace",
112+
"name": "16-0-0-move-workspace-generators-into-local-plugin"
113+
},
114+
{
115+
"version": "16.0.0-beta.9",
116+
"description": "Fix .babelrc presets if it contains an invalid entry for @nx/web/babel.",
117+
"cli": "nx",
118+
"implementation": "./src/migrations/update-16-0-0/fix-invalid-babelrc",
119+
"package": "@nx/workspace",
120+
"name": "16-0-0-fix-invalid-babelrc"
121+
},
122+
{
123+
"cli": "nx",
124+
"version": "15.7.1-beta.0",
125+
"description": "Add node_modules to root eslint ignore",
126+
"factory": "./src/migrations/update-15-7-1/add-eslint-ignore",
127+
"package": "@nx/eslint",
128+
"name": "add-eslint-ignore"
129+
},
130+
{
131+
"cli": "nx",
132+
"version": "16.0.0-beta.1",
133+
"description": "Replace @nx/eslint with @nx/eslint",
134+
"implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages",
135+
"package": "@nx/eslint",
136+
"name": "update-16-0-0-add-nx-packages"
137+
},
138+
{
139+
"version": "16.8.0",
140+
"description": "update-16-8-0-add-ignored-files",
141+
"implementation": "./src/migrations/update-16-8-0-add-ignored-files/update-16-8-0-add-ignored-files",
142+
"package": "@nx/eslint",
143+
"name": "update-16-8-0-add-ignored-files"
144+
},
145+
{
146+
"version": "17.0.0-beta.7",
147+
"description": "update-17-0-0-rename-to-eslint",
148+
"implementation": "./src/migrations/update-17-0-0-rename-to-eslint/update-17-0-0-rename-to-eslint",
149+
"package": "@nx/eslint",
150+
"name": "update-17-0-0-rename-to-eslint"
151+
},
152+
{
153+
"version": "17.1.0-beta.1",
154+
"description": "Updates for @typescript-utils/utils v6.9.1+",
155+
"implementation": "./src/migrations/update-17-1-0/update-typescript-eslint",
156+
"package": "@nx/eslint",
157+
"name": "update-typescript-eslint"
158+
},
159+
{
160+
"version": "17.2.0-beta.0",
161+
"description": "Simplify eslintFilePatterns",
162+
"implementation": "./src/migrations/update-17-2-0/simplify-eslint-patterns",
163+
"package": "@nx/eslint",
164+
"name": "simplify-eslint-patterns"
165+
},
166+
{
167+
"cli": "nx",
168+
"version": "16.0.0-beta.1",
169+
"description": "Replace @nx/eslint-plugin with @nx/eslint-plugin",
170+
"implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages",
171+
"package": "@nx/eslint-plugin",
172+
"name": "update-16-0-0-add-nx-packages"
173+
},
174+
{
175+
"cli": "nx",
176+
"version": "17-2-6-beta.1",
177+
"description": "Rename workspace rules from @nx/workspace/name to @nx/workspace-name",
178+
"implementation": "./src/migrations/update-17-2-6-rename-workspace-rules/rename-workspace-rules",
179+
"package": "@nx/eslint-plugin",
180+
"name": "update-17-2-6-rename-workspace-rules"
181+
},
182+
{
183+
"cli": "nx",
184+
"version": "15.8.0-beta.0",
185+
"description": "Rename .lib.swcrc to .swcrc for better SWC support throughout the workspace",
186+
"factory": "./src/migrations/update-15-8-0/rename-swcrc-config",
187+
"package": "@nx/js",
188+
"name": "rename-swcrc-config"
189+
},
190+
{
191+
"cli": "nx",
192+
"version": "16.0.0-beta.1",
193+
"description": "Replace @nx/js with @nx/js",
194+
"implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages",
195+
"package": "@nx/js",
196+
"name": "update-16-0-0-add-nx-packages"
197+
},
198+
{
199+
"cli": "nx",
200+
"version": "16.6.0-beta.0",
201+
"description": "Explicitly set 'updateBuildableProjectDepsInPackageJson' to 'true' in targets that rely on that value as the default.",
202+
"factory": "./src/migrations/update-16-6-0/explicitly-set-projects-to-update-buildable-deps",
203+
"package": "@nx/js",
204+
"name": "explicitly-set-projects-to-update-buildable-deps"
205+
},
206+
{
207+
"cli": "nx",
208+
"version": "16.8.2-beta.0",
209+
"description": "Remove invalid options (strict, noInterop) for ES6 type modules.",
210+
"factory": "./src/migrations/update-16-8-2/update-swcrc",
211+
"package": "@nx/js",
212+
"name": "16-8-2-update-swcrc"
213+
},
214+
{
215+
"cli": "nx",
216+
"version": "17.0.2",
217+
"description": "Remove deprecated build options",
218+
"implementation": "./src/migrations/update-17-0-0/remove-deprecated-build-options",
219+
"package": "@nx/js",
220+
"name": "update-17-0-0-remove-deprecated-build-options"
221+
},
222+
{
223+
"version": "15.8.0-beta.0",
224+
"cli": "nx",
225+
"description": "Update jest configs to support jest 29 changes (https://jestjs.io/docs/upgrading-to-jest29)",
226+
"factory": "./src/migrations/update-15-8-0/update-configs-jest-29",
227+
"package": "@nx/jest",
228+
"name": "update-configs-jest-29"
229+
},
230+
{
231+
"version": "15.8.0-beta.0",
232+
"cli": "nx",
233+
"description": "Update jest test files to support jest 29 changes (https://jestjs.io/docs/upgrading-to-jest29)",
234+
"factory": "./src/migrations/update-15-8-0/update-tests-jest-29",
235+
"package": "@nx/jest",
236+
"name": "update-tests-jest-29"
237+
},
238+
{
239+
"cli": "nx",
240+
"version": "16.0.0-beta.1",
241+
"description": "Replace @nx/jest with @nx/jest",
242+
"implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages",
243+
"package": "@nx/jest",
244+
"name": "update-16-0-0-add-nx-packages"
245+
},
246+
{
247+
"cli": "nx",
248+
"version": "16.5.0-beta.2",
249+
"description": "Add test-setup.ts to ignored files in production input",
250+
"implementation": "./src/migrations/update-16-5-0/add-test-setup-to-inputs-ignore",
251+
"package": "@nx/jest",
252+
"name": "add-test-setup-to-inputs-ignore"
253+
},
254+
{
255+
"version": "17.1.0-beta.2",
256+
"description": "Move jest executor options to nx.json targetDefaults",
257+
"implementation": "./src/migrations/update-17-1-0/move-options-to-target-defaults",
258+
"package": "@nx/jest",
259+
"name": "move-options-to-target-defaults"
260+
}
261+
]
262+
}

nx.json

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,37 @@
11
{
22
"$schema": "./node_modules/nx/schemas/nx-schema.json",
3-
"npmScope": "slck",
43
"affected": {
54
"defaultBase": "master"
65
},
7-
"tasksRunnerOptions": {
8-
"default": {
9-
"runner": "@nrwl/nx-cloud",
10-
"options": {
11-
"cacheableOperations": ["build", "lint", "test", "e2e"],
12-
"accessToken": "MjhmNGI3YjYtNjQ5MC00ZGZjLWE1YjEtYWVlZjQ0M2I3MDhlfHJlYWQtd3JpdGU="
13-
}
14-
}
15-
},
166
"targetDefaults": {
177
"build": {
188
"dependsOn": ["^build"],
19-
"inputs": ["production", "^production"]
9+
"inputs": ["production", "^production"],
10+
"cache": true
2011
},
2112
"lint": {
22-
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
13+
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
14+
"cache": true
15+
},
16+
"test": {
17+
"cache": true
18+
},
19+
"e2e": {
20+
"cache": true
2321
}
2422
},
2523
"namedInputs": {
2624
"default": ["{projectRoot}/**/*", "sharedGlobals"],
27-
"production": ["default", "!{projectRoot}/.eslintrc.json"],
25+
"production": [
26+
"default",
27+
"!{projectRoot}/.eslintrc.json",
28+
"!{projectRoot}/src/test-setup.[jt]s"
29+
],
2830
"sharedGlobals": []
2931
},
3032
"workspaceLayout": {
3133
"appsDir": "packages",
3234
"libsDir": "packages"
33-
}
35+
},
36+
"nxCloudAccessToken": "MjhmNGI3YjYtNjQ5MC00ZGZjLWE1YjEtYWVlZjQ0M2I3MDhlfHJlYWQtd3JpdGU="
3437
}

0 commit comments

Comments
 (0)