Skip to content

Commit 8d1fcf3

Browse files
author
Giuseppe Pennisi
committed
Merge branch 'develop'
2 parents b960966 + 0791657 commit 8d1fcf3

15 files changed

Lines changed: 34060 additions & 20409 deletions

‎decorate-angular-cli.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ function symlinkNgCLItoNxCLI() {
6868

6969
try {
7070
symlinkNgCLItoNxCLI();
71-
require('nx/src/cli/decorate-cli').decorateCli();
71+
require('nx/src/adapter/decorate-cli').decorateCli();
7272
output.log({
7373
title: 'Angular CLI has been decorated to enable computation caching.',
7474
});

jest.config.js renamed to jest.config.ts

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

3-
module.exports = {
3+
export default {
44
projects: getJestProjects(),
55
};

‎jest.preset.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const nxPreset = require('@nrwl/jest/preset');
1+
const nxPreset = require('@nrwl/jest/preset').default;
2+
23
module.exports = {
34
...nxPreset,
45
moduleFileExtensions: ['ts', 'html', 'js', 'json', 'mjs'],

‎migrations.json‎

Lines changed: 296 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,296 @@
1+
{
2+
"migrations": [
3+
{
4+
"version": "13.10.0-beta.0",
5+
"description": "Update the decorate-angular-cli script to require nx instead of @nrwl/cli",
6+
"cli": "nx",
7+
"implementation": "./src/migrations/update-13-10-0/update-decorate-cli",
8+
"package": "@nrwl/workspace",
9+
"name": "13-10-0-update-decorate-cli"
10+
},
11+
{
12+
"version": "13.10.0-beta.0",
13+
"description": "Update the tasks runner property to import it from the nx package instead of @nrwl/worksapce",
14+
"cli": "nx",
15+
"implementation": "./src/migrations/update-13-10-0/update-tasks-runner",
16+
"package": "@nrwl/workspace",
17+
"name": "13-10-0-update-tasks-runner"
18+
},
19+
{
20+
"version": "14.0.0-beta.0",
21+
"description": "Changes the presets in nx.json to come from the nx package",
22+
"cli": "nx",
23+
"implementation": "./src/migrations/update-14-0-0/change-nx-json-presets",
24+
"package": "@nrwl/workspace",
25+
"name": "14-0-0-change-nx-json-presets"
26+
},
27+
{
28+
"version": "14.0.0-beta.0",
29+
"description": "Migrates from @nrwl/workspace:run-script to nx:run-script",
30+
"cli": "nx",
31+
"implementation": "./src/migrations/update-14-0-0/change-npm-script-executor",
32+
"package": "@nrwl/workspace",
33+
"name": "14-0-0-change-npm-script-executor"
34+
},
35+
{
36+
"version": "14.2.0",
37+
"description": "Explicitly enable sourceAnalysis for all workspaces extending from npm.json or core.json (this was default behavior prior to 14.2)",
38+
"cli": "nx",
39+
"implementation": "./src/migrations/update-14-2-0/enable-source-analysis",
40+
"package": "@nrwl/workspace",
41+
"name": "14-2-0-enable-source-analysis"
42+
},
43+
{
44+
"cli": "nx",
45+
"version": "14.0.6",
46+
"description": "Remove root property from project.json files",
47+
"implementation": "./src/migrations/update-14-0-6/remove-roots",
48+
"package": "nx",
49+
"name": "14-0-6-remove-root"
50+
},
51+
{
52+
"cli": "nx",
53+
"version": "14.2.0-beta.0",
54+
"description": "Add JSON Schema to Nx configuration files",
55+
"implementation": "./src/migrations/update-14-2-0/add-json-schema",
56+
"package": "nx",
57+
"name": "14-2-0-add-json-schema"
58+
},
59+
{
60+
"cli": "nx",
61+
"version": "14.2.0-beta.0",
62+
"description": "Remove default collection from configuration to switch to prompts for collection",
63+
"implementation": "./src/migrations/update-14-2-0/remove-default-collection",
64+
"package": "nx",
65+
"name": "14-2-0-remove-default-collection"
66+
},
67+
{
68+
"cli": "nx",
69+
"version": "14.2.0-beta.5",
70+
"description": "Replace all ./ and ../ in outputs with absolute paths",
71+
"implementation": "./src/migrations/update-14-2-0/replace-all-relative-outputs-with-absolute",
72+
"package": "nx",
73+
"name": "14-2-0-replace-relative-outputs-with-absolute"
74+
},
75+
{
76+
"cli": "nx",
77+
"version": "14.3.4-beta.1",
78+
"description": "Replace targetDependencies with targetDefaults",
79+
"implementation": "./src/migrations/update-14-3-4/create-target-defaults",
80+
"package": "nx",
81+
"name": "14.3.4-create-target-defaults"
82+
},
83+
{
84+
"cli": "nx",
85+
"version": "14.0.0-beta.1",
86+
"description": "Rename mfe.config.js to module-federation.config.js for consistent terminology.",
87+
"factory": "./src/migrations/update-14-0-0/rename-mf-config",
88+
"package": "@nrwl/angular",
89+
"name": "rename-module-federation-config"
90+
},
91+
{
92+
"cli": "nx",
93+
"version": "14.2.0-beta.0",
94+
"description": "Remove 'showCircularDependencies' option from browser and server executors.",
95+
"factory": "./src/migrations/update-14-2-0/remove-show-circular-dependencies-option",
96+
"package": "@nrwl/angular",
97+
"name": "remove-show-circular-dependencies-option"
98+
},
99+
{
100+
"cli": "nx",
101+
"version": "14.2.0-beta.0",
102+
"description": "Update the @angular/cli package version.",
103+
"factory": "./src/migrations/update-14-2-0/update-angular-cli",
104+
"package": "@nrwl/angular",
105+
"name": "update-angular-cli-version"
106+
},
107+
{
108+
"cli": "nx",
109+
"version": "14.2.0-beta.0",
110+
"description": "Remove 'package.json' files from library projects secondary entrypoints.",
111+
"factory": "./src/migrations/update-14-2-0/update-libraries-secondary-entrypoints",
112+
"package": "@nrwl/angular",
113+
"name": "update-libraries-secondary-entrypoints"
114+
},
115+
{
116+
"cli": "nx",
117+
"version": "14.2.0-beta.0",
118+
"description": "Update postinstall script running ngcc to use ES2020 target.",
119+
"factory": "./src/migrations/update-14-2-0/update-ngcc-target",
120+
"package": "@nrwl/angular",
121+
"name": "update-postinstall-script-ngcc-target"
122+
},
123+
{
124+
"cli": "nx",
125+
"version": "14.2.0-beta.0",
126+
"description": "Update TypeScript compilation target to 'ES2020'.",
127+
"factory": "./src/migrations/update-14-2-0/update-tsconfig-target",
128+
"package": "@nrwl/angular",
129+
"name": "update-tsconfig-target"
130+
},
131+
{
132+
"cli": "nx",
133+
"version": "14.2.0-beta.6",
134+
"description": "Update `initialNavigation: 'enabled'` to `initialNavigation: 'enabledBlocking'`.",
135+
"factory": "./src/migrations/update-14-2-0/update-router-initial-navigation",
136+
"package": "@nrwl/angular",
137+
"name": "update-router-initial-navigation"
138+
},
139+
{
140+
"cli": "nx",
141+
"version": "14.5.0-beta.0",
142+
"description": "Update any references of MFE to MF.",
143+
"factory": "./src/migrations/update-14-5-0/migrate-mfe-to-mf",
144+
"package": "@nrwl/angular",
145+
"name": "migrate-mfe-to-mf"
146+
},
147+
{
148+
"cli": "nx",
149+
"version": "14.5.2-beta.0",
150+
"description": "Update the @angular/cli package version to ~14.1.0.",
151+
"factory": "./src/migrations/update-14-5-2/update-angular-cli",
152+
"package": "@nrwl/angular",
153+
"name": "update-angular-cli-version-14-1-0"
154+
},
155+
{
156+
"cli": "nx",
157+
"version": "14.5.7-beta.0",
158+
"description": "Update the rxjs package version to ~7.5.0 if RxJS 7 is used in workspace.",
159+
"factory": "./src/migrations/update-14-5-7/update-rxjs",
160+
"package": "@nrwl/angular",
161+
"name": "update-rxjs-7-5-0"
162+
},
163+
{
164+
"cli": "nx",
165+
"version": "14.6.0-beta.0",
166+
"description": "Update the @angular/cli package version to ~14.2.0.",
167+
"factory": "./src/migrations/update-14-6-0/update-angular-cli",
168+
"package": "@nrwl/angular",
169+
"name": "update-angular-cli-version-14-2-0"
170+
},
171+
{
172+
"version": "14.0.0-beta",
173+
"description": "As of Angular version 13, `entryComponents` are no longer necessary.",
174+
"factory": "./migrations/entry-components/index",
175+
"package": "@angular/core",
176+
"name": "migration-entry-components"
177+
},
178+
{
179+
"version": "14.0.0-beta",
180+
"description": "As of Angular version 14, Forms model classes accept a type parameter, and existing usages must be opted out to preserve backwards-compatibility.",
181+
"factory": "./migrations/typed-forms/index",
182+
"package": "@angular/core",
183+
"name": "migration-v14-typed-forms"
184+
},
185+
{
186+
"version": "14.0.0-beta",
187+
"description": "In Angular version 14, the `pathMatch` property of `Routes` was updated to be a strict union of the two valid options: `'full'|'prefix'`. `Routes` and `Route` variables need an explicit type so TypeScript does not infer the property as the looser `string`.",
188+
"factory": "./migrations/path-match-type/index",
189+
"package": "@angular/core",
190+
"name": "migration-v14-path-match-type"
191+
},
192+
{
193+
"version": "14.0.0-0",
194+
"description": "Updates the Angular CDK to v14",
195+
"factory": "./ng-update/index#updateToV14",
196+
"package": "@angular/cdk",
197+
"name": "migration-v14"
198+
},
199+
{
200+
"cli": "nx",
201+
"version": "14.6.1-beta.0",
202+
"description": "Change Cypress e2e and component testing presets to use __filename instead of __dirname and include a devServerTarget for component testing.",
203+
"factory": "./src/migrations/update-14-6-1/update-cypress-configs-presets",
204+
"package": "@nrwl/cypress",
205+
"name": "update-cypress-configs-preset"
206+
},
207+
{
208+
"cli": "nx",
209+
"version": "14.7.0-beta.0",
210+
"description": "Update Cypress if using v10 to support latest component testing features",
211+
"factory": "./src/migrations/update-14-7-0/update-cypress-version-if-10",
212+
"package": "@nrwl/cypress",
213+
"name": "update-cypress-if-v10"
214+
},
215+
{
216+
"cli": "nx",
217+
"version": "14.2.0-beta.0",
218+
"description": "Adjusts calls to createTreeWithEmptyWorkspace to reflect new API",
219+
"factory": "./src/migrations/update-14-2-0/split-create-empty-tree",
220+
"package": "@nrwl/devkit",
221+
"name": "split-create-tree"
222+
},
223+
{
224+
"version": "14.0.0-beta.2",
225+
"cli": "nx",
226+
"description": "Update move jest config files to .ts files.",
227+
"factory": "./src/migrations/update-14-0-0/update-jest-config-ext",
228+
"package": "@nrwl/jest",
229+
"name": "update-jest-config-extensions"
230+
},
231+
{
232+
"version": "14.1.5-beta.0",
233+
"cli": "nx",
234+
"description": "Update to export default in jest config and revert jest.preset.ts to jest.preset.js",
235+
"factory": "./src/migrations/update-14-1-5/update-exports-jest-config",
236+
"package": "@nrwl/jest",
237+
"name": "update-to-export-default"
238+
},
239+
{
240+
"version": "14.5.5-beta.0",
241+
"cli": "nx",
242+
"description": "Exclude jest.config.ts from tsconfig where missing.",
243+
"factory": "./src/migrations/update-14-0-0/update-jest-config-ext",
244+
"package": "@nrwl/jest",
245+
"name": "exclude-jest-config-from-ts-config"
246+
},
247+
{
248+
"version": "14.6.0-beta.0",
249+
"cli": "nx",
250+
"description": "Update jest configs to support jest 28 changes (https://jestjs.io/docs/upgrading-to-jest28#configuration-options)",
251+
"factory": "./src/migrations/update-14-6-0/update-configs-jest-28",
252+
"package": "@nrwl/jest",
253+
"name": "update-configs-jest-28"
254+
},
255+
{
256+
"version": "14.6.0-beta.0",
257+
"cli": "nx",
258+
"description": "Update jest test files to support jest 28 changes (https://jestjs.io/docs/upgrading-to-jest28)",
259+
"factory": "./src/migrations/update-14-6-0/update-tests-jest-28",
260+
"package": "@nrwl/jest",
261+
"name": "update-tests-jest-28"
262+
},
263+
{
264+
"cli": "nx",
265+
"version": "14.1.9-beta.0",
266+
"description": "Adds @swc/core and @swc-node as a dev dep if you are using them",
267+
"factory": "./src/migrations/update-14-1-9/add-swc-deps-if-needed",
268+
"package": "@nrwl/linter",
269+
"name": "add-swc-deps"
270+
},
271+
{
272+
"cli": "nx",
273+
"version": "14.2.3-beta.0",
274+
"description": "Adds @swc/core and @swc-node as a dev dep if you are using them (repeated due to prior mistake)",
275+
"factory": "./src/migrations/update-14-1-9/add-swc-deps-if-needed",
276+
"package": "@nrwl/linter",
277+
"name": "add-swc-deps-again"
278+
},
279+
{
280+
"cli": "nx",
281+
"version": "14.4.4",
282+
"description": "Adds @typescript-eslint/utils as a dev dep",
283+
"factory": "./src/migrations/update-14-4-4/experimental-to-utils-deps",
284+
"package": "@nrwl/linter",
285+
"name": "experimental-to-utils-deps"
286+
},
287+
{
288+
"cli": "nx",
289+
"version": "14.4.4",
290+
"description": "Switch from @typescript-eslint/experimental-utils to @typescript-eslint/utils in all rules and rules.spec files",
291+
"factory": "./src/migrations/update-14-4-4/experimental-to-utils-rules",
292+
"package": "@nrwl/linter",
293+
"name": "experimental-to-utils-rules"
294+
}
295+
]
296+
}

‎nx.json‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"defaultBase": "master"
55
},
66
"cli": {
7-
"defaultCollection": "@nrwl/angular",
87
"packageManager": "npm"
98
},
109
"implicitDependencies": {
@@ -16,21 +15,13 @@
1615
},
1716
"tasksRunnerOptions": {
1817
"default": {
19-
"runner": "@nrwl/workspace/tasks-runners/default",
18+
"runner": "nx/tasks-runners/default",
2019
"options": {
2120
"cacheableOperations": ["build", "lint", "test", "e2e"],
2221
"parallel": 3
2322
}
2423
}
2524
},
26-
"targetDependencies": {
27-
"build": [
28-
{
29-
"target": "build",
30-
"projects": "dependencies"
31-
}
32-
]
33-
},
3425
"generators": {
3526
"@nrwl/angular:application": {
3627
"style": "scss",
@@ -50,5 +41,11 @@
5041
"appsDir": "apps",
5142
"libsDir": "packages"
5243
},
53-
"defaultProject": "angular-winbox"
44+
"defaultProject": "angular-winbox",
45+
"$schema": "./node_modules/nx/schemas/nx-schema.json",
46+
"targetDefaults": {
47+
"build": {
48+
"dependsOn": ["^build"]
49+
}
50+
}
5451
}

0 commit comments

Comments
 (0)