@nx/workspace 16.0.0-beta.3 → 16.0.0-beta.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/migrations.json +6 -0
- package/package.json +29 -29
- package/src/generators/move/lib/create-project-configuration-in-new-destination.js +6 -5
- package/src/generators/move/lib/create-project-configuration-in-new-destination.js.map +1 -1
- package/src/generators/move/lib/normalize-schema.js +3 -3
- package/src/generators/move/lib/normalize-schema.js.map +1 -1
- package/src/generators/move/lib/update-imports.js +3 -1
- package/src/generators/move/lib/update-imports.js.map +1 -1
- package/src/generators/move/lib/utils.js +3 -0
- package/src/generators/move/lib/utils.js.map +1 -1
- package/src/generators/move/schema.d.ts +2 -1
- package/src/generators/new/generate-preset.js +7 -2
- package/src/generators/new/generate-preset.js.map +1 -1
- package/src/generators/new/generate-workspace-files.js +5 -2
- package/src/generators/new/generate-workspace-files.js.map +1 -1
- package/src/generators/new/new.d.ts +2 -0
- package/src/generators/new/new.js.map +1 -1
- package/src/generators/new/schema.json +10 -0
- package/src/generators/preset/preset.js +25 -6
- package/src/generators/preset/preset.js.map +1 -1
- package/src/generators/preset/schema.d.ts +3 -1
- package/src/generators/preset/schema.json +13 -2
- package/src/generators/utils/presets.d.ts +1 -0
- package/src/generators/utils/presets.js +1 -0
- package/src/generators/utils/presets.js.map +1 -1
- package/src/generators/workspace-generator/schema.d.ts +1 -4
- package/src/generators/workspace-generator/schema.json +1 -17
- package/src/generators/workspace-generator/workspace-generator.d.ts +1 -1
- package/src/generators/workspace-generator/workspace-generator.js +9 -17
- package/src/generators/workspace-generator/workspace-generator.js.map +1 -1
- package/src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin.d.ts +2 -0
- package/src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin.js +135 -0
- package/src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin.js.map +1 -0
- package/src/generators/workspace-generator/files/index.ts__tmpl__ +0 -10
- package/src/generators/workspace-generator/files/schema.json__tmpl__ +0 -17
package/migrations.json
CHANGED
|
@@ -89,6 +89,12 @@
|
|
|
89
89
|
"version": "16.0.0-beta.1",
|
|
90
90
|
"description": "Replace @nrwl/workspace with @nx/workspace",
|
|
91
91
|
"implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
|
|
92
|
+
},
|
|
93
|
+
"16-0-0-move-workspace-generators-into-local-plugin": {
|
|
94
|
+
"version": "16.0.0-beta.4",
|
|
95
|
+
"description": "Generates a plugin called 'workspace-plugin' containing your workspace generators.",
|
|
96
|
+
"cli": "nx",
|
|
97
|
+
"implementation": "./src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin"
|
|
92
98
|
}
|
|
93
99
|
},
|
|
94
100
|
"packageJsonUpdates": {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/workspace",
|
|
3
|
-
"version": "16.0.0-beta.
|
|
3
|
+
"version": "16.0.0-beta.5",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
|
|
6
6
|
"repository": {
|
|
@@ -33,36 +33,36 @@
|
|
|
33
33
|
"requirements": {},
|
|
34
34
|
"migrations": "./migrations.json",
|
|
35
35
|
"packageGroup": {
|
|
36
|
-
"@nrwl/js": "16.0.0-beta.
|
|
37
|
-
"@nrwl/jest": "16.0.0-beta.
|
|
38
|
-
"@nrwl/linter": "16.0.0-beta.
|
|
39
|
-
"@nrwl/angular": "16.0.0-beta.
|
|
40
|
-
"@nrwl/cypress": "16.0.0-beta.
|
|
41
|
-
"@nrwl/detox": "16.0.0-beta.
|
|
42
|
-
"@nrwl/devkit": "16.0.0-beta.
|
|
43
|
-
"@nrwl/esbuild": "16.0.0-beta.
|
|
44
|
-
"@nrwl/eslint-plugin-nx": "16.0.0-beta.
|
|
45
|
-
"@nrwl/expo": "16.0.0-beta.
|
|
46
|
-
"@nrwl/express": "16.0.0-beta.
|
|
47
|
-
"@nrwl/nest": "16.0.0-beta.
|
|
48
|
-
"@nrwl/next": "16.0.0-beta.
|
|
49
|
-
"@nrwl/node": "16.0.0-beta.
|
|
36
|
+
"@nrwl/js": "16.0.0-beta.5",
|
|
37
|
+
"@nrwl/jest": "16.0.0-beta.5",
|
|
38
|
+
"@nrwl/linter": "16.0.0-beta.5",
|
|
39
|
+
"@nrwl/angular": "16.0.0-beta.5",
|
|
40
|
+
"@nrwl/cypress": "16.0.0-beta.5",
|
|
41
|
+
"@nrwl/detox": "16.0.0-beta.5",
|
|
42
|
+
"@nrwl/devkit": "16.0.0-beta.5",
|
|
43
|
+
"@nrwl/esbuild": "16.0.0-beta.5",
|
|
44
|
+
"@nrwl/eslint-plugin-nx": "16.0.0-beta.5",
|
|
45
|
+
"@nrwl/expo": "16.0.0-beta.5",
|
|
46
|
+
"@nrwl/express": "16.0.0-beta.5",
|
|
47
|
+
"@nrwl/nest": "16.0.0-beta.5",
|
|
48
|
+
"@nrwl/next": "16.0.0-beta.5",
|
|
49
|
+
"@nrwl/node": "16.0.0-beta.5",
|
|
50
50
|
"nx-cloud": "latest",
|
|
51
|
-
"@nrwl/nx-plugin": "16.0.0-beta.
|
|
52
|
-
"@nrwl/react-native": "16.0.0-beta.
|
|
53
|
-
"@nrwl/react": "16.0.0-beta.
|
|
54
|
-
"@nrwl/rollup": "16.0.0-beta.
|
|
55
|
-
"@nrwl/storybook": "16.0.0-beta.
|
|
56
|
-
"@nrwl/tao": "16.0.0-beta.
|
|
57
|
-
"@nrwl/vite": "16.0.0-beta.
|
|
58
|
-
"@nrwl/web": "16.0.0-beta.
|
|
59
|
-
"@nrwl/webpack": "16.0.0-beta.
|
|
60
|
-
"nx": "16.0.0-beta.
|
|
51
|
+
"@nrwl/nx-plugin": "16.0.0-beta.5",
|
|
52
|
+
"@nrwl/react-native": "16.0.0-beta.5",
|
|
53
|
+
"@nrwl/react": "16.0.0-beta.5",
|
|
54
|
+
"@nrwl/rollup": "16.0.0-beta.5",
|
|
55
|
+
"@nrwl/storybook": "16.0.0-beta.5",
|
|
56
|
+
"@nrwl/tao": "16.0.0-beta.5",
|
|
57
|
+
"@nrwl/vite": "16.0.0-beta.5",
|
|
58
|
+
"@nrwl/web": "16.0.0-beta.5",
|
|
59
|
+
"@nrwl/webpack": "16.0.0-beta.5",
|
|
60
|
+
"nx": "16.0.0-beta.5"
|
|
61
61
|
}
|
|
62
62
|
},
|
|
63
63
|
"dependencies": {
|
|
64
|
-
"@nrwl/workspace": "16.0.0-beta.
|
|
65
|
-
"@nx/devkit": "16.0.0-beta.
|
|
64
|
+
"@nrwl/workspace": "16.0.0-beta.5",
|
|
65
|
+
"@nx/devkit": "16.0.0-beta.5",
|
|
66
66
|
"@parcel/watcher": "2.0.4",
|
|
67
67
|
"chalk": "^4.1.0",
|
|
68
68
|
"chokidar": "^3.5.1",
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
"ignore": "^5.0.4",
|
|
75
75
|
"minimatch": "3.0.5",
|
|
76
76
|
"npm-run-path": "^4.0.1",
|
|
77
|
-
"nx": "16.0.0-beta.
|
|
77
|
+
"nx": "16.0.0-beta.5",
|
|
78
78
|
"open": "^8.4.0",
|
|
79
79
|
"rxjs": "^6.5.4",
|
|
80
80
|
"tmp": "~0.2.1",
|
|
@@ -86,5 +86,5 @@
|
|
|
86
86
|
"access": "public"
|
|
87
87
|
},
|
|
88
88
|
"types": "./index.d.ts",
|
|
89
|
-
"gitHead": "
|
|
89
|
+
"gitHead": "04fed26279d04c2b02663df5872c6857eb7914bf"
|
|
90
90
|
}
|
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createProjectConfigurationInNewDestination = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
4
5
|
const devkit_1 = require("@nx/devkit");
|
|
5
6
|
function createProjectConfigurationInNewDestination(tree, schema, projectConfig) {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
}
|
|
7
|
+
projectConfig.name = schema.newProjectName;
|
|
8
|
+
// Subtle bug if project name === path, where the updated name was being overrideen.
|
|
9
|
+
const { name } = projectConfig, rest = tslib_1.__rest(projectConfig, ["name"]);
|
|
9
10
|
// replace old root path with new one
|
|
10
|
-
const projectString = JSON.stringify(
|
|
11
|
+
const projectString = JSON.stringify(rest);
|
|
11
12
|
const newProjectString = projectString.replace(new RegExp(projectConfig.root, 'g'), schema.relativeToRootDestination);
|
|
12
|
-
const newProject = JSON.parse(newProjectString);
|
|
13
|
+
const newProject = Object.assign({ name }, JSON.parse(newProjectString));
|
|
13
14
|
// Create a new project with the root replaced
|
|
14
15
|
(0, devkit_1.addProjectConfiguration)(tree, schema.newProjectName, newProject);
|
|
15
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-project-configuration-in-new-destination.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/create-project-configuration-in-new-destination.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"create-project-configuration-in-new-destination.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/create-project-configuration-in-new-destination.ts"],"names":[],"mappings":";;;;AAAA,uCAIoB;AAGpB,SAAgB,0CAA0C,CACxD,IAAU,EACV,MAAwB,EACxB,aAAmC;IAEnC,aAAa,CAAC,IAAI,GAAG,MAAM,CAAC,cAAc,CAAC;IAE3C,oFAAoF;IACpF,MAAM,EAAE,IAAI,KAAc,aAAa,EAAtB,IAAI,kBAAK,aAAa,EAAjC,QAAiB,CAAgB,CAAC;IAExC,qCAAqC;IACrC,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,gBAAgB,GAAG,aAAa,CAAC,OAAO,CAC5C,IAAI,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,EACnC,MAAM,CAAC,yBAAyB,CACjC,CAAC;IACF,MAAM,UAAU,mBACd,IAAI,IACD,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAChC,CAAC;IAEF,8CAA8C;IAC9C,IAAA,gCAAuB,EAAC,IAAI,EAAE,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;AACnE,CAAC;AAvBD,gGAuBC"}
|
|
@@ -5,13 +5,13 @@ const devkit_1 = require("@nx/devkit");
|
|
|
5
5
|
const path_1 = require("nx/src/utils/path");
|
|
6
6
|
const utils_1 = require("./utils");
|
|
7
7
|
function normalizeSchema(tree, schema, projectConfiguration) {
|
|
8
|
-
var _a;
|
|
8
|
+
var _a, _b;
|
|
9
9
|
const destination = schema.destination.startsWith('/')
|
|
10
10
|
? (0, utils_1.normalizeSlashes)(schema.destination.slice(1))
|
|
11
11
|
: schema.destination;
|
|
12
|
-
const newProjectName = (0, utils_1.getNewProjectName)(destination);
|
|
12
|
+
const newProjectName = (_a = schema.newProjectName) !== null && _a !== void 0 ? _a : (0, utils_1.getNewProjectName)(destination);
|
|
13
13
|
const { npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
|
|
14
|
-
return Object.assign(Object.assign({}, schema), { destination, importPath: (
|
|
14
|
+
return Object.assign(Object.assign({}, schema), { destination, importPath: (_b = schema.importPath) !== null && _b !== void 0 ? _b : (0, utils_1.normalizeSlashes)((0, path_1.getImportPath)(npmScope, destination)), newProjectName, relativeToRootDestination: (0, utils_1.getDestination)(tree, schema, projectConfiguration) });
|
|
15
15
|
}
|
|
16
16
|
exports.normalizeSchema = normalizeSchema;
|
|
17
17
|
//# sourceMappingURL=normalize-schema.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-schema.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/normalize-schema.ts"],"names":[],"mappings":";;;AAAA,uCAA4E;AAC5E,4CAAkD;AAElD,mCAA8E;AAE9E,SAAgB,eAAe,CAC7B,IAAU,EACV,MAAc,EACd,oBAA0C;;IAE1C,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC;QACpD,CAAC,CAAC,IAAA,wBAAgB,EAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC/C,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC;IACvB,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"normalize-schema.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/normalize-schema.ts"],"names":[],"mappings":";;;AAAA,uCAA4E;AAC5E,4CAAkD;AAElD,mCAA8E;AAE9E,SAAgB,eAAe,CAC7B,IAAU,EACV,MAAc,EACd,oBAA0C;;IAE1C,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC;QACpD,CAAC,CAAC,IAAA,wBAAgB,EAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC/C,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC;IACvB,MAAM,cAAc,GAClB,MAAA,MAAM,CAAC,cAAc,mCAAI,IAAA,yBAAiB,EAAC,WAAW,CAAC,CAAC;IAC1D,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAE9C,uCACK,MAAM,KACT,WAAW,EACX,UAAU,EACR,MAAA,MAAM,CAAC,UAAU,mCACjB,IAAA,wBAAgB,EAAC,IAAA,oBAAa,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,EACxD,cAAc,EACd,yBAAyB,EAAE,IAAA,sBAAc,EACvC,IAAI,EACJ,MAAM,EACN,oBAAoB,CACrB,IACD;AACJ,CAAC;AAzBD,0CAyBC"}
|
|
@@ -64,7 +64,9 @@ function updateImports(tree, schema, project) {
|
|
|
64
64
|
const updatedPath = path.map((x) => (0, devkit_1.joinPathFragments)(projectRoot.to, (0, path_1.relative)(projectRoot.from, x)));
|
|
65
65
|
if (schema.updateImportPath) {
|
|
66
66
|
tsConfig.compilerOptions.paths[projectRef.to] = updatedPath;
|
|
67
|
-
|
|
67
|
+
if (projectRef.from !== projectRef.to) {
|
|
68
|
+
delete tsConfig.compilerOptions.paths[projectRef.from];
|
|
69
|
+
}
|
|
68
70
|
}
|
|
69
71
|
else {
|
|
70
72
|
tsConfig.compilerOptions.paths[projectRef.from] = updatedPath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-imports.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-imports.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,9 @@ const devkit_1 = require("@nx/devkit");
|
|
|
10
10
|
* folders. In that case, they're on their own :/
|
|
11
11
|
*/
|
|
12
12
|
function getDestination(host, schema, project) {
|
|
13
|
+
if (schema.destinationRelativeToRoot) {
|
|
14
|
+
return schema.destination;
|
|
15
|
+
}
|
|
13
16
|
const projectType = project.projectType;
|
|
14
17
|
const workspaceLayout = (0, devkit_1.getWorkspaceLayout)(host);
|
|
15
18
|
let rootFolder = workspaceLayout.libsDir;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/utils.ts"],"names":[],"mappings":";;;AAAA,uCAKoB;AAIpB;;;;;;GAMG;AACH,SAAgB,cAAc,CAC5B,IAAU,EACV,MAAc,EACd,OAA6B;IAE7B,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAExC,MAAM,eAAe,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAEjD,IAAI,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC;IACzC,IAAI,WAAW,KAAK,aAAa,EAAE;QACjC,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC;KACtC;IACD,OAAO,IAAA,0BAAiB,EAAC,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;AAC3D,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/utils.ts"],"names":[],"mappings":";;;AAAA,uCAKoB;AAIpB;;;;;;GAMG;AACH,SAAgB,cAAc,CAC5B,IAAU,EACV,MAAc,EACd,OAA6B;IAE7B,IAAI,MAAM,CAAC,yBAAyB,EAAE;QACpC,OAAO,MAAM,CAAC,WAAW,CAAC;KAC3B;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAExC,MAAM,eAAe,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAEjD,IAAI,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC;IACzC,IAAI,WAAW,KAAK,aAAa,EAAE;QACjC,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC;KACtC;IACD,OAAO,IAAA,0BAAiB,EAAC,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;AAC3D,CAAC;AAlBD,wCAkBC;AAED;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,IAAY;IAC5C,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAClC,CAAC;AAFD,8CAEC;AAED;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,KAAa;IAC5C,OAAO,KAAK;SACT,KAAK,CAAC,GAAG,CAAC;SACV,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SAClB,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AALD,4CAKC"}
|
|
@@ -4,10 +4,11 @@ export interface Schema {
|
|
|
4
4
|
importPath?: string;
|
|
5
5
|
updateImportPath: boolean;
|
|
6
6
|
skipFormat?: boolean;
|
|
7
|
+
destinationRelativeToRoot?: boolean;
|
|
8
|
+
newProjectName?: string;
|
|
7
9
|
}
|
|
8
10
|
|
|
9
11
|
export interface NormalizedSchema extends Schema {
|
|
10
12
|
importPath: string;
|
|
11
|
-
newProjectName: string;
|
|
12
13
|
relativeToRootDestination: string;
|
|
13
14
|
}
|
|
@@ -61,17 +61,21 @@ function generatePreset(host, opts) {
|
|
|
61
61
|
opts.bundler ? `--bundler=${opts.bundler}` : null,
|
|
62
62
|
opts.framework ? `--framework=${opts.framework}` : null,
|
|
63
63
|
opts.docker ? `--docker=${opts.docker}` : null,
|
|
64
|
+
opts.nextAppDir ? `--nextAppDir=${opts.nextAppDir}` : null,
|
|
64
65
|
opts.packageManager ? `--packageManager=${opts.packageManager}` : null,
|
|
65
66
|
opts.standaloneApi !== undefined
|
|
66
67
|
? `--standaloneApi=${opts.standaloneApi}`
|
|
67
68
|
: null,
|
|
68
69
|
parsedArgs.interactive ? '--interactive=true' : '--interactive=false',
|
|
69
70
|
opts.routing !== undefined ? `--routing=${opts.routing}` : null,
|
|
71
|
+
opts.e2eTestRunner !== undefined
|
|
72
|
+
? `--e2eTestRunner=${opts.e2eTestRunner}`
|
|
73
|
+
: null,
|
|
70
74
|
].filter((e) => !!e);
|
|
71
75
|
}
|
|
72
76
|
}
|
|
73
77
|
exports.generatePreset = generatePreset;
|
|
74
|
-
function getPresetDependencies({ preset, presetVersion, bundler, }) {
|
|
78
|
+
function getPresetDependencies({ preset, presetVersion, bundler, e2eTestRunner, }) {
|
|
75
79
|
var _a;
|
|
76
80
|
switch (preset) {
|
|
77
81
|
case presets_1.Preset.TS:
|
|
@@ -93,6 +97,7 @@ function getPresetDependencies({ preset, presetVersion, bundler, }) {
|
|
|
93
97
|
dev: { '@nx/nest': versions_1.nxVersion, typescript: versions_1.typescriptVersion },
|
|
94
98
|
};
|
|
95
99
|
case presets_1.Preset.NextJs:
|
|
100
|
+
case presets_1.Preset.NextJsStandalone:
|
|
96
101
|
return { dependencies: { '@nx/next': versions_1.nxVersion }, dev: {} };
|
|
97
102
|
case presets_1.Preset.ReactMonorepo:
|
|
98
103
|
case presets_1.Preset.ReactStandalone:
|
|
@@ -100,7 +105,7 @@ function getPresetDependencies({ preset, presetVersion, bundler, }) {
|
|
|
100
105
|
dependencies: {},
|
|
101
106
|
dev: {
|
|
102
107
|
'@nx/react': versions_1.nxVersion,
|
|
103
|
-
'@nx/cypress': versions_1.nxVersion,
|
|
108
|
+
'@nx/cypress': e2eTestRunner !== 'none' ? versions_1.nxVersion : undefined,
|
|
104
109
|
'@nx/jest': bundler !== 'vite' ? versions_1.nxVersion : undefined,
|
|
105
110
|
'@nx/vite': bundler === 'vite' ? versions_1.nxVersion : undefined,
|
|
106
111
|
'@nx/webpack': bundler === 'webpack' ? versions_1.nxVersion : undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-preset.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generate-preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-preset.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,6 +52,7 @@ function createAppsAndLibsFolders(tree, options) {
|
|
|
52
52
|
else if (options.preset === presets_1.Preset.AngularStandalone ||
|
|
53
53
|
options.preset === presets_1.Preset.ReactStandalone ||
|
|
54
54
|
options.preset === presets_1.Preset.NodeStandalone ||
|
|
55
|
+
options.preset === presets_1.Preset.NextJsStandalone ||
|
|
55
56
|
options.isCustomPreset) {
|
|
56
57
|
// don't generate any folders
|
|
57
58
|
}
|
|
@@ -100,7 +101,8 @@ function createFiles(tree, options) {
|
|
|
100
101
|
const formattedNames = (0, devkit_1.names)(options.name);
|
|
101
102
|
const filesDirName = options.preset === presets_1.Preset.AngularStandalone ||
|
|
102
103
|
options.preset === presets_1.Preset.ReactStandalone ||
|
|
103
|
-
options.preset === presets_1.Preset.NodeStandalone
|
|
104
|
+
options.preset === presets_1.Preset.NodeStandalone ||
|
|
105
|
+
options.preset === presets_1.Preset.NextJsStandalone
|
|
104
106
|
? './files-root-app'
|
|
105
107
|
: options.preset === presets_1.Preset.NPM || options.preset === presets_1.Preset.Core
|
|
106
108
|
? './files-package-based-repo'
|
|
@@ -126,7 +128,8 @@ function createYarnrcYml(tree, options) {
|
|
|
126
128
|
function addNpmScripts(tree, options) {
|
|
127
129
|
if (options.preset === presets_1.Preset.AngularStandalone ||
|
|
128
130
|
options.preset === presets_1.Preset.ReactStandalone ||
|
|
129
|
-
options.preset === presets_1.Preset.NodeStandalone
|
|
131
|
+
options.preset === presets_1.Preset.NodeStandalone ||
|
|
132
|
+
options.preset === presets_1.Preset.NextJsStandalone) {
|
|
130
133
|
(0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'package.json'), (json) => {
|
|
131
134
|
Object.assign(json.scripts, {
|
|
132
135
|
start: 'nx serve',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-workspace-files.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-workspace-files.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generate-workspace-files.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-workspace-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,11 +12,13 @@ interface Schema {
|
|
|
12
12
|
defaultBase: string;
|
|
13
13
|
framework?: string;
|
|
14
14
|
docker?: boolean;
|
|
15
|
+
nextAppDir?: boolean;
|
|
15
16
|
linter?: Linter;
|
|
16
17
|
bundler?: 'vite' | 'webpack';
|
|
17
18
|
standaloneApi?: boolean;
|
|
18
19
|
routing?: boolean;
|
|
19
20
|
packageManager?: PackageManager;
|
|
21
|
+
e2eTestRunner?: 'cypress' | 'detox' | 'jest' | 'none';
|
|
20
22
|
}
|
|
21
23
|
export interface NormalizedSchema extends Schema {
|
|
22
24
|
presetVersion?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":";;;;AAAA,uCAMoB;AAEpB,+BAA4B;AAC5B,8CAA0C;AAE1C,yEAAoE;AACpE,uDAA0E;
|
|
1
|
+
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,6 +71,16 @@
|
|
|
71
71
|
"description": "The framework which the application is using",
|
|
72
72
|
"type": "string",
|
|
73
73
|
"enum": ["express", "koa", "fastify", "nest", "none"]
|
|
74
|
+
},
|
|
75
|
+
"nextAppDir": {
|
|
76
|
+
"description": "Enable experimental app directory for the project",
|
|
77
|
+
"type": "boolean",
|
|
78
|
+
"default": false
|
|
79
|
+
},
|
|
80
|
+
"e2eTestRunner": {
|
|
81
|
+
"description": "The tool to use for running e2e tests.",
|
|
82
|
+
"type": "string",
|
|
83
|
+
"enum": ["cypress", "jest", "detox", "none"]
|
|
74
84
|
}
|
|
75
85
|
},
|
|
76
86
|
"additionalProperties": true
|
|
@@ -18,7 +18,7 @@ function presetGenerator(tree, options) {
|
|
|
18
18
|
exports.presetGenerator = presetGenerator;
|
|
19
19
|
exports.default = presetGenerator;
|
|
20
20
|
function createPreset(tree, options) {
|
|
21
|
-
var _a, _b;
|
|
21
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
|
|
22
22
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
23
23
|
if (options.preset === presets_1.Preset.Empty || options.preset === presets_1.Preset.Apps) {
|
|
24
24
|
return;
|
|
@@ -31,6 +31,7 @@ function createPreset(tree, options) {
|
|
|
31
31
|
linter: options.linter,
|
|
32
32
|
standalone: options.standaloneApi,
|
|
33
33
|
routing: options.routing,
|
|
34
|
+
e2eTestRunner: options.e2eTestRunner,
|
|
34
35
|
});
|
|
35
36
|
}
|
|
36
37
|
else if (options.preset === presets_1.Preset.AngularStandalone) {
|
|
@@ -42,6 +43,7 @@ function createPreset(tree, options) {
|
|
|
42
43
|
routing: options.routing,
|
|
43
44
|
rootProject: true,
|
|
44
45
|
standalone: options.standaloneApi,
|
|
46
|
+
e2eTestRunner: (_a = options.e2eTestRunner) !== null && _a !== void 0 ? _a : 'cypress',
|
|
45
47
|
});
|
|
46
48
|
}
|
|
47
49
|
else if (options.preset === presets_1.Preset.ReactMonorepo) {
|
|
@@ -51,7 +53,8 @@ function createPreset(tree, options) {
|
|
|
51
53
|
name: options.name,
|
|
52
54
|
style: options.style,
|
|
53
55
|
linter: options.linter,
|
|
54
|
-
bundler: (
|
|
56
|
+
bundler: (_b = options.bundler) !== null && _b !== void 0 ? _b : 'webpack',
|
|
57
|
+
e2eTestRunner: (_c = options.e2eTestRunner) !== null && _c !== void 0 ? _c : 'cypress',
|
|
55
58
|
});
|
|
56
59
|
}
|
|
57
60
|
else if (options.preset === presets_1.Preset.ReactStandalone) {
|
|
@@ -62,8 +65,8 @@ function createPreset(tree, options) {
|
|
|
62
65
|
style: options.style,
|
|
63
66
|
linter: options.linter,
|
|
64
67
|
rootProject: true,
|
|
65
|
-
bundler: (
|
|
66
|
-
e2eTestRunner: 'cypress',
|
|
68
|
+
bundler: (_d = options.bundler) !== null && _d !== void 0 ? _d : 'vite',
|
|
69
|
+
e2eTestRunner: (_e = options.e2eTestRunner) !== null && _e !== void 0 ? _e : 'cypress',
|
|
67
70
|
unitTestRunner: options.bundler === 'vite' ? 'vitest' : 'jest',
|
|
68
71
|
});
|
|
69
72
|
}
|
|
@@ -74,6 +77,18 @@ function createPreset(tree, options) {
|
|
|
74
77
|
name: options.name,
|
|
75
78
|
style: options.style,
|
|
76
79
|
linter: options.linter,
|
|
80
|
+
e2eTestRunner: (_f = options.e2eTestRunner) !== null && _f !== void 0 ? _f : 'cypress',
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
else if (options.preset === presets_1.Preset.NextJsStandalone) {
|
|
84
|
+
const { applicationGenerator: nextApplicationGenerator } = require('@nx' +
|
|
85
|
+
'/next');
|
|
86
|
+
return nextApplicationGenerator(tree, {
|
|
87
|
+
name: options.name,
|
|
88
|
+
style: options.style,
|
|
89
|
+
linter: options.linter,
|
|
90
|
+
appDir: options.nextAppDir,
|
|
91
|
+
rootProject: true,
|
|
77
92
|
});
|
|
78
93
|
}
|
|
79
94
|
else if (options.preset === presets_1.Preset.WebComponents) {
|
|
@@ -84,6 +99,7 @@ function createPreset(tree, options) {
|
|
|
84
99
|
style: options.style,
|
|
85
100
|
linter: options.linter,
|
|
86
101
|
bundler: 'vite',
|
|
102
|
+
e2eTestRunner: (_g = options.e2eTestRunner) !== null && _g !== void 0 ? _g : 'cypress',
|
|
87
103
|
});
|
|
88
104
|
}
|
|
89
105
|
else if (options.preset === presets_1.Preset.Nest) {
|
|
@@ -92,6 +108,7 @@ function createPreset(tree, options) {
|
|
|
92
108
|
return nestApplicationGenerator(tree, {
|
|
93
109
|
name: options.name,
|
|
94
110
|
linter: options.linter,
|
|
111
|
+
e2eTestRunner: (_h = options.e2eTestRunner) !== null && _h !== void 0 ? _h : 'jest',
|
|
95
112
|
});
|
|
96
113
|
}
|
|
97
114
|
else if (options.preset === presets_1.Preset.Express) {
|
|
@@ -99,6 +116,7 @@ function createPreset(tree, options) {
|
|
|
99
116
|
return expressApplicationGenerator(tree, {
|
|
100
117
|
name: options.name,
|
|
101
118
|
linter: options.linter,
|
|
119
|
+
e2eTestRunner: (_j = options.e2eTestRunner) !== null && _j !== void 0 ? _j : 'jest',
|
|
102
120
|
});
|
|
103
121
|
}
|
|
104
122
|
else if (options.preset === presets_1.Preset.ReactNative) {
|
|
@@ -107,7 +125,7 @@ function createPreset(tree, options) {
|
|
|
107
125
|
return reactNativeApplicationGenerator(tree, {
|
|
108
126
|
name: options.name,
|
|
109
127
|
linter: options.linter,
|
|
110
|
-
e2eTestRunner: 'detox',
|
|
128
|
+
e2eTestRunner: (_k = options.e2eTestRunner) !== null && _k !== void 0 ? _k : 'detox',
|
|
111
129
|
});
|
|
112
130
|
}
|
|
113
131
|
else if (options.preset === presets_1.Preset.Expo) {
|
|
@@ -115,7 +133,7 @@ function createPreset(tree, options) {
|
|
|
115
133
|
return expoApplicationGenerator(tree, {
|
|
116
134
|
name: options.name,
|
|
117
135
|
linter: options.linter,
|
|
118
|
-
e2eTestRunner: 'detox',
|
|
136
|
+
e2eTestRunner: (_l = options.e2eTestRunner) !== null && _l !== void 0 ? _l : 'detox',
|
|
119
137
|
});
|
|
120
138
|
}
|
|
121
139
|
else if (options.preset === presets_1.Preset.TS) {
|
|
@@ -138,6 +156,7 @@ function createPreset(tree, options) {
|
|
|
138
156
|
framework: options.framework,
|
|
139
157
|
docker: options.docker,
|
|
140
158
|
rootProject: true,
|
|
159
|
+
e2eTestRunner: (_m = options.e2eTestRunner) !== null && _m !== void 0 ? _m : 'jest',
|
|
141
160
|
});
|
|
142
161
|
}
|
|
143
162
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":";;;;AAAA,uCAMoB;AAEpB,8CAA0C;AAE1C,SAAsB,eAAe,CAAC,IAAU,EAAE,OAAe;;QAC/D,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACrD,OAAO,GAAS,EAAE;YAChB,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;YAC1B,IAAI,UAAU;gBAAE,MAAM,UAAU,EAAE,CAAC;QACrC,CAAC,CAAA,CAAC;IACJ,CAAC;CAAA;AAPD,0CAOC;AAED,kBAAe,eAAe,CAAC;AAE/B,SAAe,YAAY,CAAC,IAAU,EAAE,OAAe;;;QACrD,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI,EAAE;YACrE,OAAO;SACR;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,eAAe,EAAE;YACpD,MAAM,EACJ,oBAAoB,EAAE,2BAA2B,GAClD,GAAG,OAAO,CAAC,KAAK,GAAG,qBAAqB,CAAC,CAAC;YAE3C,OAAO,2BAA2B,CAAC,IAAI,EAAE;gBACvC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE,OAAO,CAAC,aAAa;gBACjC,OAAO,EAAE,OAAO,CAAC,OAAO;
|
|
1
|
+
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,8 +10,10 @@ export interface Schema {
|
|
|
10
10
|
standaloneConfig?: boolean;
|
|
11
11
|
framework?: string;
|
|
12
12
|
packageManager?: PackageManager;
|
|
13
|
-
bundler?: 'vite' | 'webpack';
|
|
13
|
+
bundler?: 'vite' | 'webpack' | 'rspack';
|
|
14
14
|
docker?: boolean;
|
|
15
|
+
nextAppDir?: boolean;
|
|
15
16
|
routing?: boolean;
|
|
16
17
|
standaloneApi?: boolean;
|
|
18
|
+
e2eTestRunner?: 'cypress' | 'jest' | 'detox' | 'none';
|
|
17
19
|
}
|
|
@@ -76,13 +76,24 @@
|
|
|
76
76
|
"bundler": {
|
|
77
77
|
"description": "The bundler to use for building the application.",
|
|
78
78
|
"type": "string",
|
|
79
|
-
"enum": ["webpack", "vite"],
|
|
79
|
+
"enum": ["webpack", "vite", "rspack"],
|
|
80
80
|
"default": "vite"
|
|
81
81
|
},
|
|
82
82
|
"docker": {
|
|
83
83
|
"description": "Generate a Dockerfile",
|
|
84
84
|
"type": "boolean",
|
|
85
85
|
"default": false
|
|
86
|
+
},
|
|
87
|
+
"nextAppDir": {
|
|
88
|
+
"description": "Enable experimental app/ for the project",
|
|
89
|
+
"type": "boolean",
|
|
90
|
+
"default": false
|
|
91
|
+
},
|
|
92
|
+
"e2eTestRunner": {
|
|
93
|
+
"description": "The tool to use for running e2e tests.",
|
|
94
|
+
"type": "string",
|
|
95
|
+
"enum": ["cypress", "jest", "detox", "none"]
|
|
86
96
|
}
|
|
87
|
-
}
|
|
97
|
+
},
|
|
98
|
+
"required": ["preset", "name"]
|
|
88
99
|
}
|
|
@@ -13,6 +13,7 @@ var Preset;
|
|
|
13
13
|
Preset["AngularStandalone"] = "angular-standalone";
|
|
14
14
|
Preset["ReactMonorepo"] = "react-monorepo";
|
|
15
15
|
Preset["ReactStandalone"] = "react-standalone";
|
|
16
|
+
Preset["NextJsStandalone"] = "nextjs-standalone";
|
|
16
17
|
Preset["ReactNative"] = "react-native";
|
|
17
18
|
Preset["Expo"] = "expo";
|
|
18
19
|
Preset["NextJs"] = "next";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"presets.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/presets.ts"],"names":[],"mappings":";;;AAAA,IAAY,
|
|
1
|
+
{"version":3,"file":"presets.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/presets.ts"],"names":[],"mappings":";;;AAAA,IAAY,MAkBX;AAlBD,WAAY,MAAM;IAChB,uBAAa,CAAA;IACb,yBAAe,CAAA;IACf,uBAAa,CAAA;IACb,qBAAW,CAAA;IACX,mBAAS,CAAA;IACT,0CAAgC,CAAA;IAChC,8CAAoC,CAAA;IACpC,kDAAwC,CAAA;IACxC,0CAAgC,CAAA;IAChC,8CAAoC,CAAA;IACpC,gDAAsC,CAAA;IACtC,sCAA4B,CAAA;IAC5B,uBAAa,CAAA;IACb,yBAAe,CAAA;IACf,uBAAa,CAAA;IACb,6BAAmB,CAAA;IACnB,4CAAkC,CAAA;AACpC,CAAC,EAlBW,MAAM,GAAN,cAAM,KAAN,cAAM,QAkBjB"}
|
|
@@ -4,22 +4,6 @@
|
|
|
4
4
|
"title": "Create a custom generator",
|
|
5
5
|
"description": "Create a custom generator.",
|
|
6
6
|
"type": "object",
|
|
7
|
-
"properties": {
|
|
8
|
-
"name": {
|
|
9
|
-
"type": "string",
|
|
10
|
-
"description": "Generator name.",
|
|
11
|
-
"$default": {
|
|
12
|
-
"$source": "argv",
|
|
13
|
-
"index": 0
|
|
14
|
-
},
|
|
15
|
-
"x-prompt": "What name would you like to use for the workspace generator?"
|
|
16
|
-
},
|
|
17
|
-
"skipFormat": {
|
|
18
|
-
"description": "Skip formatting files.",
|
|
19
|
-
"type": "boolean",
|
|
20
|
-
"default": false,
|
|
21
|
-
"x-priority": "internal"
|
|
22
|
-
}
|
|
23
|
-
},
|
|
7
|
+
"properties": {},
|
|
24
8
|
"required": ["name"]
|
|
25
9
|
}
|
|
@@ -2,26 +2,18 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const versions_1 = require("../../utils/versions");
|
|
6
5
|
function default_1(host, schema) {
|
|
7
6
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
yield (0, devkit_1.formatFiles)(host);
|
|
18
|
-
}
|
|
19
|
-
return installTask;
|
|
7
|
+
const message = (0, devkit_1.stripIndents) `Workspace Generators are no longer supported. Instead,
|
|
8
|
+
Nx now supports executing generators or executors from local plugins. To get
|
|
9
|
+
started, install @nx/plugin and run \`nx g plugin\`.
|
|
10
|
+
|
|
11
|
+
Afterwards, or if you already have an Nx plugin, you can run
|
|
12
|
+
\`nx g generator --project {my-plugin}\` to add a new generator.
|
|
13
|
+
|
|
14
|
+
For more information, see: https://nx.dev/deprecated/workspace-generators`;
|
|
15
|
+
throw new Error(message);
|
|
20
16
|
});
|
|
21
17
|
}
|
|
22
18
|
exports.default = default_1;
|
|
23
|
-
function normalizeOptions(options) {
|
|
24
|
-
const name = (0, devkit_1.names)(options.name).fileName;
|
|
25
|
-
return Object.assign(Object.assign({}, options), { name, tmpl: '' });
|
|
26
|
-
}
|
|
27
19
|
//# sourceMappingURL=workspace-generator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-generator.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/workspace-generator/workspace-generator.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"workspace-generator.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/workspace-generator/workspace-generator.ts"],"names":[],"mappings":";;;AACA,uCAAgD;AAEhD,mBAA+B,IAAU,EAAE,MAAc;;QACvD,MAAM,OAAO,GAAG,IAAA,qBAAY,EAAA;;;;;;;8EAOgD,CAAC;QAE7E,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;CAAA;AAXD,4BAWC"}
|
|
@@ -0,0 +1,135 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
// nx-ignore-next-line
|
|
6
|
+
const path = require("path");
|
|
7
|
+
const move_1 = require("../../generators/move/move");
|
|
8
|
+
const versions_1 = require("../../utils/versions");
|
|
9
|
+
const PROJECT_NAME = 'workspace-plugin';
|
|
10
|
+
const DESTINATION = `tools/${PROJECT_NAME}`;
|
|
11
|
+
function default_1(tree) {
|
|
12
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
|
+
const tasks = [];
|
|
14
|
+
if (!tree.children('tools/generators').length) {
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
17
|
+
let project = (0, devkit_1.getProjects)(tree).get(PROJECT_NAME);
|
|
18
|
+
if (!project) {
|
|
19
|
+
yield createNewPlugin(tree);
|
|
20
|
+
tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
|
|
21
|
+
'@nx/plugin': versions_1.nxVersion,
|
|
22
|
+
}));
|
|
23
|
+
project = (0, devkit_1.readProjectConfiguration)(tree, PROJECT_NAME);
|
|
24
|
+
}
|
|
25
|
+
yield updateExistingPlugin(tree, project);
|
|
26
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
27
|
+
return () => {
|
|
28
|
+
for (const task of tasks) {
|
|
29
|
+
task();
|
|
30
|
+
}
|
|
31
|
+
};
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
exports.default = default_1;
|
|
35
|
+
// Inspired by packages/nx/src/command-line/workspace-generators.ts
|
|
36
|
+
function collectAndMoveGenerators(tree, destinationProjectRoot) {
|
|
37
|
+
var _a;
|
|
38
|
+
const generators = {};
|
|
39
|
+
const generatorsDir = 'tools/generators';
|
|
40
|
+
const destinationDir = (0, devkit_1.joinPathFragments)(destinationProjectRoot, 'src', 'generators');
|
|
41
|
+
for (const c of tree.children('tools/generators')) {
|
|
42
|
+
const childDir = path.join(generatorsDir, c);
|
|
43
|
+
const schemaPath = (0, devkit_1.joinPathFragments)(childDir, 'schema.json');
|
|
44
|
+
if (tree.exists(schemaPath)) {
|
|
45
|
+
const schema = (0, devkit_1.readJson)(tree, schemaPath);
|
|
46
|
+
generators[c] = {
|
|
47
|
+
implementation: `./src/generators/${c}`,
|
|
48
|
+
schema: `./src/generators/${(0, devkit_1.joinPathFragments)(c, 'schema.json')}`,
|
|
49
|
+
description: (_a = schema.description) !== null && _a !== void 0 ? _a : `Generator ${c}`,
|
|
50
|
+
};
|
|
51
|
+
tree.rename(childDir, (0, devkit_1.joinPathFragments)(destinationDir, c));
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
return generators;
|
|
55
|
+
}
|
|
56
|
+
function createNewPlugin(tree) {
|
|
57
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
58
|
+
(0, devkit_1.ensurePackage)('@nx/plugin', versions_1.nxVersion);
|
|
59
|
+
const { pluginGenerator } =
|
|
60
|
+
// nx-ignore-next-line
|
|
61
|
+
require('@nx/plugin/src/generators/plugin/plugin');
|
|
62
|
+
// nx-ignore-next-line
|
|
63
|
+
const { Linter } = (0, devkit_1.ensurePackage)('@nx/linter', versions_1.nxVersion);
|
|
64
|
+
const { npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
|
|
65
|
+
const importPath = npmScope ? `${npmScope}/${PROJECT_NAME}` : PROJECT_NAME;
|
|
66
|
+
yield pluginGenerator(tree, {
|
|
67
|
+
minimal: true,
|
|
68
|
+
name: PROJECT_NAME,
|
|
69
|
+
importPath: importPath,
|
|
70
|
+
skipTsConfig: false,
|
|
71
|
+
compiler: 'tsc',
|
|
72
|
+
linter: Linter.EsLint,
|
|
73
|
+
skipFormat: true,
|
|
74
|
+
skipLintChecks: false,
|
|
75
|
+
unitTestRunner: 'jest',
|
|
76
|
+
e2eTestRunner: 'none',
|
|
77
|
+
});
|
|
78
|
+
getCreateGeneratorsJson()(tree, (0, devkit_1.readProjectConfiguration)(tree, PROJECT_NAME).root, PROJECT_NAME);
|
|
79
|
+
yield moveGeneratedPlugin(tree, DESTINATION, importPath);
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
function moveGeneratedPlugin(tree, destination, importPath) {
|
|
83
|
+
const config = (0, devkit_1.readProjectConfiguration)(tree, PROJECT_NAME);
|
|
84
|
+
if (config.root !== DESTINATION) {
|
|
85
|
+
return (0, move_1.moveGenerator)(tree, {
|
|
86
|
+
destination,
|
|
87
|
+
projectName: PROJECT_NAME,
|
|
88
|
+
newProjectName: PROJECT_NAME,
|
|
89
|
+
updateImportPath: true,
|
|
90
|
+
destinationRelativeToRoot: true,
|
|
91
|
+
importPath: importPath,
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
function updateExistingPlugin(tree, project) {
|
|
96
|
+
const packageJson = (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(project.root, 'package.json'));
|
|
97
|
+
const defaultGeneratorsPath = (0, devkit_1.joinPathFragments)(project.root, 'generators.json');
|
|
98
|
+
let generatorsJsonPath = packageJson.generators ||
|
|
99
|
+
packageJson.schematics ||
|
|
100
|
+
tree.exists(defaultGeneratorsPath)
|
|
101
|
+
? defaultGeneratorsPath
|
|
102
|
+
: null;
|
|
103
|
+
if (!generatorsJsonPath) {
|
|
104
|
+
getCreateGeneratorsJson()(tree, (0, devkit_1.readProjectConfiguration)(tree, PROJECT_NAME).root, PROJECT_NAME);
|
|
105
|
+
generatorsJsonPath = defaultGeneratorsPath;
|
|
106
|
+
}
|
|
107
|
+
(0, devkit_1.updateJson)(tree, generatorsJsonPath, (json) => {
|
|
108
|
+
var _a;
|
|
109
|
+
const generators = collectAndMoveGenerators(tree, project.root);
|
|
110
|
+
(_a = json.generators) !== null && _a !== void 0 ? _a : (json.generators = {});
|
|
111
|
+
for (const generator in generators) {
|
|
112
|
+
if (json.generators[generator]) {
|
|
113
|
+
devkit_1.output.warn({
|
|
114
|
+
title: `Generator ${generator} already exists in ${project.name}`,
|
|
115
|
+
bodyLines: [
|
|
116
|
+
'Since you have a generator with the same name in your plugin, the generator from workspace-generators has been discarded.',
|
|
117
|
+
],
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
json.generators[generator] = generators[generator];
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
return json;
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
function getCreateGeneratorsJson() {
|
|
128
|
+
// We cant use `as typeof import('@nx/plugin/src/generators/generator/generator');` here
|
|
129
|
+
// because it will cause a typescript error at build time.
|
|
130
|
+
const { createGeneratorsJson } =
|
|
131
|
+
// nx-ignore-next-line
|
|
132
|
+
require('@nx/plugin/src/generators/generator/generator');
|
|
133
|
+
return createGeneratorsJson;
|
|
134
|
+
}
|
|
135
|
+
//# sourceMappingURL=move-workspace-generators-to-local-plugin.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"move-workspace-generators-to-local-plugin.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
import { Tree, formatFiles, installPackagesTask } from '@nx/devkit';
|
|
2
|
-
import { libraryGenerator } from '@nx/js';
|
|
3
|
-
|
|
4
|
-
export default async function(tree: Tree, schema: any) {
|
|
5
|
-
await libraryGenerator(tree, {name: schema.name});
|
|
6
|
-
await formatFiles(tree);
|
|
7
|
-
return () => {
|
|
8
|
-
installPackagesTask(tree)
|
|
9
|
-
}
|
|
10
|
-
}
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"$schema": "http://json-schema.org/schema",
|
|
3
|
-
"cli": "nx",
|
|
4
|
-
"$id": "<%= name %>",
|
|
5
|
-
"type": "object",
|
|
6
|
-
"properties": {
|
|
7
|
-
"name": {
|
|
8
|
-
"type": "string",
|
|
9
|
-
"description": "Library name",
|
|
10
|
-
"$default": {
|
|
11
|
-
"$source": "argv",
|
|
12
|
-
"index": 0
|
|
13
|
-
}
|
|
14
|
-
}
|
|
15
|
-
},
|
|
16
|
-
"required": ["name"]
|
|
17
|
-
}
|