@nx/workspace 16.0.0-beta.5 → 16.0.0-beta.7
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/package.json +29 -29
- package/src/generators/preset/preset.js +15 -14
- package/src/generators/preset/preset.js.map +1 -1
- package/src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin.js +72 -11
- package/src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin.js.map +1 -1
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.7",
|
|
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.7",
|
|
37
|
+
"@nrwl/jest": "16.0.0-beta.7",
|
|
38
|
+
"@nrwl/linter": "16.0.0-beta.7",
|
|
39
|
+
"@nrwl/angular": "16.0.0-beta.7",
|
|
40
|
+
"@nrwl/cypress": "16.0.0-beta.7",
|
|
41
|
+
"@nrwl/detox": "16.0.0-beta.7",
|
|
42
|
+
"@nrwl/devkit": "16.0.0-beta.7",
|
|
43
|
+
"@nrwl/esbuild": "16.0.0-beta.7",
|
|
44
|
+
"@nrwl/eslint-plugin-nx": "16.0.0-beta.7",
|
|
45
|
+
"@nrwl/expo": "16.0.0-beta.7",
|
|
46
|
+
"@nrwl/express": "16.0.0-beta.7",
|
|
47
|
+
"@nrwl/nest": "16.0.0-beta.7",
|
|
48
|
+
"@nrwl/next": "16.0.0-beta.7",
|
|
49
|
+
"@nrwl/node": "16.0.0-beta.7",
|
|
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.7",
|
|
52
|
+
"@nrwl/react-native": "16.0.0-beta.7",
|
|
53
|
+
"@nrwl/react": "16.0.0-beta.7",
|
|
54
|
+
"@nrwl/rollup": "16.0.0-beta.7",
|
|
55
|
+
"@nrwl/storybook": "16.0.0-beta.7",
|
|
56
|
+
"@nrwl/tao": "16.0.0-beta.7",
|
|
57
|
+
"@nrwl/vite": "16.0.0-beta.7",
|
|
58
|
+
"@nrwl/web": "16.0.0-beta.7",
|
|
59
|
+
"@nrwl/webpack": "16.0.0-beta.7",
|
|
60
|
+
"nx": "16.0.0-beta.7"
|
|
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.7",
|
|
65
|
+
"@nx/devkit": "16.0.0-beta.7",
|
|
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.7",
|
|
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": "eb477479bf73bca940323a66e486221f00006c0f"
|
|
90
90
|
}
|
|
@@ -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, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
|
|
21
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
|
|
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,7 +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
|
+
e2eTestRunner: (_a = options.e2eTestRunner) !== null && _a !== void 0 ? _a : 'cypress',
|
|
35
35
|
});
|
|
36
36
|
}
|
|
37
37
|
else if (options.preset === presets_1.Preset.AngularStandalone) {
|
|
@@ -43,7 +43,7 @@ function createPreset(tree, options) {
|
|
|
43
43
|
routing: options.routing,
|
|
44
44
|
rootProject: true,
|
|
45
45
|
standalone: options.standaloneApi,
|
|
46
|
-
e2eTestRunner: (
|
|
46
|
+
e2eTestRunner: (_b = options.e2eTestRunner) !== null && _b !== void 0 ? _b : 'cypress',
|
|
47
47
|
});
|
|
48
48
|
}
|
|
49
49
|
else if (options.preset === presets_1.Preset.ReactMonorepo) {
|
|
@@ -53,8 +53,8 @@ function createPreset(tree, options) {
|
|
|
53
53
|
name: options.name,
|
|
54
54
|
style: options.style,
|
|
55
55
|
linter: options.linter,
|
|
56
|
-
bundler: (
|
|
57
|
-
e2eTestRunner: (
|
|
56
|
+
bundler: (_c = options.bundler) !== null && _c !== void 0 ? _c : 'webpack',
|
|
57
|
+
e2eTestRunner: (_d = options.e2eTestRunner) !== null && _d !== void 0 ? _d : 'cypress',
|
|
58
58
|
});
|
|
59
59
|
}
|
|
60
60
|
else if (options.preset === presets_1.Preset.ReactStandalone) {
|
|
@@ -65,8 +65,8 @@ function createPreset(tree, options) {
|
|
|
65
65
|
style: options.style,
|
|
66
66
|
linter: options.linter,
|
|
67
67
|
rootProject: true,
|
|
68
|
-
bundler: (
|
|
69
|
-
e2eTestRunner: (
|
|
68
|
+
bundler: (_e = options.bundler) !== null && _e !== void 0 ? _e : 'vite',
|
|
69
|
+
e2eTestRunner: (_f = options.e2eTestRunner) !== null && _f !== void 0 ? _f : 'cypress',
|
|
70
70
|
unitTestRunner: options.bundler === 'vite' ? 'vitest' : 'jest',
|
|
71
71
|
});
|
|
72
72
|
}
|
|
@@ -77,7 +77,7 @@ function createPreset(tree, options) {
|
|
|
77
77
|
name: options.name,
|
|
78
78
|
style: options.style,
|
|
79
79
|
linter: options.linter,
|
|
80
|
-
e2eTestRunner: (
|
|
80
|
+
e2eTestRunner: (_g = options.e2eTestRunner) !== null && _g !== void 0 ? _g : 'cypress',
|
|
81
81
|
});
|
|
82
82
|
}
|
|
83
83
|
else if (options.preset === presets_1.Preset.NextJsStandalone) {
|
|
@@ -88,6 +88,7 @@ function createPreset(tree, options) {
|
|
|
88
88
|
style: options.style,
|
|
89
89
|
linter: options.linter,
|
|
90
90
|
appDir: options.nextAppDir,
|
|
91
|
+
e2eTestRunner: (_h = options.e2eTestRunner) !== null && _h !== void 0 ? _h : 'cypress',
|
|
91
92
|
rootProject: true,
|
|
92
93
|
});
|
|
93
94
|
}
|
|
@@ -99,7 +100,7 @@ function createPreset(tree, options) {
|
|
|
99
100
|
style: options.style,
|
|
100
101
|
linter: options.linter,
|
|
101
102
|
bundler: 'vite',
|
|
102
|
-
e2eTestRunner: (
|
|
103
|
+
e2eTestRunner: (_j = options.e2eTestRunner) !== null && _j !== void 0 ? _j : 'cypress',
|
|
103
104
|
});
|
|
104
105
|
}
|
|
105
106
|
else if (options.preset === presets_1.Preset.Nest) {
|
|
@@ -108,7 +109,7 @@ function createPreset(tree, options) {
|
|
|
108
109
|
return nestApplicationGenerator(tree, {
|
|
109
110
|
name: options.name,
|
|
110
111
|
linter: options.linter,
|
|
111
|
-
e2eTestRunner: (
|
|
112
|
+
e2eTestRunner: (_k = options.e2eTestRunner) !== null && _k !== void 0 ? _k : 'jest',
|
|
112
113
|
});
|
|
113
114
|
}
|
|
114
115
|
else if (options.preset === presets_1.Preset.Express) {
|
|
@@ -116,7 +117,7 @@ function createPreset(tree, options) {
|
|
|
116
117
|
return expressApplicationGenerator(tree, {
|
|
117
118
|
name: options.name,
|
|
118
119
|
linter: options.linter,
|
|
119
|
-
e2eTestRunner: (
|
|
120
|
+
e2eTestRunner: (_l = options.e2eTestRunner) !== null && _l !== void 0 ? _l : 'jest',
|
|
120
121
|
});
|
|
121
122
|
}
|
|
122
123
|
else if (options.preset === presets_1.Preset.ReactNative) {
|
|
@@ -125,7 +126,7 @@ function createPreset(tree, options) {
|
|
|
125
126
|
return reactNativeApplicationGenerator(tree, {
|
|
126
127
|
name: options.name,
|
|
127
128
|
linter: options.linter,
|
|
128
|
-
e2eTestRunner: (
|
|
129
|
+
e2eTestRunner: (_m = options.e2eTestRunner) !== null && _m !== void 0 ? _m : 'detox',
|
|
129
130
|
});
|
|
130
131
|
}
|
|
131
132
|
else if (options.preset === presets_1.Preset.Expo) {
|
|
@@ -133,7 +134,7 @@ function createPreset(tree, options) {
|
|
|
133
134
|
return expoApplicationGenerator(tree, {
|
|
134
135
|
name: options.name,
|
|
135
136
|
linter: options.linter,
|
|
136
|
-
e2eTestRunner: (
|
|
137
|
+
e2eTestRunner: (_o = options.e2eTestRunner) !== null && _o !== void 0 ? _o : 'detox',
|
|
137
138
|
});
|
|
138
139
|
}
|
|
139
140
|
else if (options.preset === presets_1.Preset.TS) {
|
|
@@ -156,7 +157,7 @@ function createPreset(tree, options) {
|
|
|
156
157
|
framework: options.framework,
|
|
157
158
|
docker: options.docker,
|
|
158
159
|
rootProject: true,
|
|
159
|
-
e2eTestRunner: (
|
|
160
|
+
e2eTestRunner: (_p = options.e2eTestRunner) !== null && _p !== void 0 ? _p : 'jest',
|
|
160
161
|
});
|
|
161
162
|
}
|
|
162
163
|
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;gBACxB,aAAa,EAAE,OAAO,CAAC,aAAa;
|
|
1
|
+
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,14 +6,31 @@ const devkit_1 = require("@nx/devkit");
|
|
|
6
6
|
const path = require("path");
|
|
7
7
|
const move_1 = require("../../generators/move/move");
|
|
8
8
|
const versions_1 = require("../../utils/versions");
|
|
9
|
+
const path_1 = require("path");
|
|
9
10
|
const PROJECT_NAME = 'workspace-plugin';
|
|
10
11
|
const DESTINATION = `tools/${PROJECT_NAME}`;
|
|
11
12
|
function default_1(tree) {
|
|
12
13
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
|
-
|
|
14
|
-
if (!tree.children('tools/generators').length) {
|
|
14
|
+
if (!tree.exists('tools/generators')) {
|
|
15
15
|
return;
|
|
16
16
|
}
|
|
17
|
+
const tasks = [];
|
|
18
|
+
if (hasWorkspaceGenerators(tree)) {
|
|
19
|
+
tasks.push(...(yield moveWorkspaceGeneratorsToLocalPlugin(tree)));
|
|
20
|
+
}
|
|
21
|
+
removeToolsGeneratorsIfEmpty(tree);
|
|
22
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
23
|
+
return () => {
|
|
24
|
+
for (const task of tasks) {
|
|
25
|
+
task();
|
|
26
|
+
}
|
|
27
|
+
};
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
exports.default = default_1;
|
|
31
|
+
function moveWorkspaceGeneratorsToLocalPlugin(tree) {
|
|
32
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
33
|
+
const tasks = [];
|
|
17
34
|
let project = (0, devkit_1.getProjects)(tree).get(PROJECT_NAME);
|
|
18
35
|
if (!project) {
|
|
19
36
|
yield createNewPlugin(tree);
|
|
@@ -23,15 +40,19 @@ function default_1(tree) {
|
|
|
23
40
|
project = (0, devkit_1.readProjectConfiguration)(tree, PROJECT_NAME);
|
|
24
41
|
}
|
|
25
42
|
yield updateExistingPlugin(tree, project);
|
|
26
|
-
|
|
27
|
-
return () => {
|
|
28
|
-
for (const task of tasks) {
|
|
29
|
-
task();
|
|
30
|
-
}
|
|
31
|
-
};
|
|
43
|
+
return tasks;
|
|
32
44
|
});
|
|
33
45
|
}
|
|
34
|
-
|
|
46
|
+
function hasWorkspaceGenerators(tree) {
|
|
47
|
+
const children = tree.children('tools/generators');
|
|
48
|
+
return (children.length > 0 &&
|
|
49
|
+
!(children.length === 1 && children[0] === '.gitkeep'));
|
|
50
|
+
}
|
|
51
|
+
function removeToolsGeneratorsIfEmpty(tree) {
|
|
52
|
+
if (!hasWorkspaceGenerators(tree)) {
|
|
53
|
+
tree.delete('tools/generators');
|
|
54
|
+
}
|
|
55
|
+
}
|
|
35
56
|
// Inspired by packages/nx/src/command-line/workspace-generators.ts
|
|
36
57
|
function collectAndMoveGenerators(tree, destinationProjectRoot) {
|
|
37
58
|
var _a;
|
|
@@ -48,11 +69,50 @@ function collectAndMoveGenerators(tree, destinationProjectRoot) {
|
|
|
48
69
|
schema: `./src/generators/${(0, devkit_1.joinPathFragments)(c, 'schema.json')}`,
|
|
49
70
|
description: (_a = schema.description) !== null && _a !== void 0 ? _a : `Generator ${c}`,
|
|
50
71
|
};
|
|
51
|
-
tree
|
|
72
|
+
moveFilesInDirectory(tree, childDir, (0, devkit_1.joinPathFragments)(destinationDir, c));
|
|
52
73
|
}
|
|
53
74
|
}
|
|
54
75
|
return generators;
|
|
55
76
|
}
|
|
77
|
+
function moveFilesInDirectory(tree, source, destination) {
|
|
78
|
+
const relative = path_1.posix.relative(source, path_1.posix.dirname(destination));
|
|
79
|
+
if (!relative.startsWith('../')) {
|
|
80
|
+
// If the destination is in the same directory or a subdirectory of the source
|
|
81
|
+
// we can just move the files. If it is not, we need to update the relative imports.
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
let offsetLevel = 0;
|
|
85
|
+
const pathParts = relative.split('/');
|
|
86
|
+
for (const part of pathParts) {
|
|
87
|
+
if (part === '..') {
|
|
88
|
+
offsetLevel++;
|
|
89
|
+
}
|
|
90
|
+
else {
|
|
91
|
+
break;
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
for (const c of tree.children(source)) {
|
|
95
|
+
if (!tree.isFile(c)) {
|
|
96
|
+
moveFilesInDirectory(tree, (0, devkit_1.joinPathFragments)(source, c), (0, devkit_1.joinPathFragments)(destination, c));
|
|
97
|
+
}
|
|
98
|
+
tree.rename((0, devkit_1.joinPathFragments)(source, c), (0, devkit_1.joinPathFragments)(destination, c));
|
|
99
|
+
// If its a TS file we can update relative imports with find + replace
|
|
100
|
+
// This could be done with AST, but since we are only looking at relative
|
|
101
|
+
// imports its easy to do via string replace. We replace any strings starting
|
|
102
|
+
// with a relative path outside of their own directory.
|
|
103
|
+
if (c.endsWith('.ts')) {
|
|
104
|
+
let content = tree.read((0, devkit_1.joinPathFragments)(destination, c)).toString();
|
|
105
|
+
// +2 is a bit of a magic number here - represents extra directory levels in a normal
|
|
106
|
+
// plugin structure compared to the workspace-generator layout
|
|
107
|
+
const extraDirectoriesInPluginStructure = 2;
|
|
108
|
+
content = content.replace(new RegExp(`'` + `\.\.\/`.repeat(offsetLevel), 'g'), "'" + '../'.repeat(offsetLevel + extraDirectoriesInPluginStructure));
|
|
109
|
+
content = content.replace(new RegExp(`"` + `\.\.\/`.repeat(offsetLevel), 'g'), '"' + '../'.repeat(offsetLevel + extraDirectoriesInPluginStructure));
|
|
110
|
+
// We write it back in the same spot, since it is moved as if it was a regular file after this
|
|
111
|
+
tree.write((0, devkit_1.joinPathFragments)(source, c), content);
|
|
112
|
+
}
|
|
113
|
+
tree.rename((0, devkit_1.joinPathFragments)(source, c), (0, devkit_1.joinPathFragments)(destination, c));
|
|
114
|
+
}
|
|
115
|
+
}
|
|
56
116
|
function createNewPlugin(tree) {
|
|
57
117
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
58
118
|
(0, devkit_1.ensurePackage)('@nx/plugin', versions_1.nxVersion);
|
|
@@ -62,7 +122,7 @@ function createNewPlugin(tree) {
|
|
|
62
122
|
// nx-ignore-next-line
|
|
63
123
|
const { Linter } = (0, devkit_1.ensurePackage)('@nx/linter', versions_1.nxVersion);
|
|
64
124
|
const { npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
|
|
65
|
-
const importPath = npmScope ?
|
|
125
|
+
const importPath = npmScope ? `@${npmScope}/${PROJECT_NAME}` : PROJECT_NAME;
|
|
66
126
|
yield pluginGenerator(tree, {
|
|
67
127
|
minimal: true,
|
|
68
128
|
name: PROJECT_NAME,
|
|
@@ -74,6 +134,7 @@ function createNewPlugin(tree) {
|
|
|
74
134
|
skipLintChecks: false,
|
|
75
135
|
unitTestRunner: 'jest',
|
|
76
136
|
e2eTestRunner: 'none',
|
|
137
|
+
publishable: false,
|
|
77
138
|
});
|
|
78
139
|
getCreateGeneratorsJson()(tree, (0, devkit_1.readProjectConfiguration)(tree, PROJECT_NAME).root, PROJECT_NAME);
|
|
79
140
|
yield moveGeneratedPlugin(tree, DESTINATION, importPath);
|
|
@@ -1 +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":";;;AAAA,uCAcoB;AACpB,sBAAsB;AACtB,6BAA6B;AAK7B,qDAA2D;AAC3D,mDAAiD;
|
|
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":";;;AAAA,uCAcoB;AACpB,sBAAsB;AACtB,6BAA6B;AAK7B,qDAA2D;AAC3D,mDAAiD;AAEjD,+BAA6B;AAE7B,MAAM,YAAY,GAAG,kBAAkB,CAAC;AACxC,MAAM,WAAW,GAAG,SAAS,YAAY,EAAE,CAAC;AAE5C,mBAA+B,IAAU;;QACvC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE;YACpC,OAAO;SACR;QACD,MAAM,KAAK,GAAG,EAAE,CAAC;QACjB,IAAI,sBAAsB,CAAC,IAAI,CAAC,EAAE;YAChC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,oCAAoC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACnE;QACD,4BAA4B,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACxB,OAAO,GAAG,EAAE;YACV,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACxB,IAAI,EAAE,CAAC;aACR;QACH,CAAC,CAAC;IACJ,CAAC;CAAA;AAfD,4BAeC;AAED,SAAe,oCAAoC,CAAC,IAAU;;QAC5D,MAAM,KAAK,GAAG,EAAE,CAAC;QACjB,IAAI,OAAO,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAClD,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC;YAC5B,KAAK,CAAC,IAAI,CACR,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,YAAY,EAAE,oBAAS;aACxB,CACF,CACF,CAAC;YACF,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;SACxD;QACD,MAAM,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1C,OAAO,KAAK,CAAC;IACf,CAAC;CAAA;AAED,SAAS,sBAAsB,CAAC,IAAU;IACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;IACnD,OAAO,CACL,QAAQ,CAAC,MAAM,GAAG,CAAC;QACnB,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CACvD,CAAC;AACJ,CAAC;AAED,SAAS,4BAA4B,CAAC,IAAU;IAC9C,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE;QACjC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;KACjC;AACH,CAAC;AAED,mEAAmE;AACnE,SAAS,wBAAwB,CAAC,IAAU,EAAE,sBAA8B;;IAC1E,MAAM,UAAU,GAAwC,EAAE,CAAC;IAC3D,MAAM,aAAa,GAAG,kBAAkB,CAAC;IACzC,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,sBAAsB,EACtB,KAAK,EACL,YAAY,CACb,CAAC;IACF,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE;QACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;QAC7C,MAAM,UAAU,GAAG,IAAA,0BAAiB,EAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;QAC9D,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;YAC3B,MAAM,MAAM,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAC1C,UAAU,CAAC,CAAC,CAAC,GAAG;gBACd,cAAc,EAAE,oBAAoB,CAAC,EAAE;gBACvC,MAAM,EAAE,oBAAoB,IAAA,0BAAiB,EAAC,CAAC,EAAE,aAAa,CAAC,EAAE;gBACjE,WAAW,EAAE,MAAA,MAAM,CAAC,WAAW,mCAAI,aAAa,CAAC,EAAE;aACpD,CAAC;YACF,oBAAoB,CAClB,IAAI,EACJ,QAAQ,EACR,IAAA,0BAAiB,EAAC,cAAc,EAAE,CAAC,CAAC,CACrC,CAAC;SACH;KACF;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAU,EAAE,MAAc,EAAE,WAAmB;IAC3E,MAAM,QAAQ,GAAG,YAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;IACpE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;QAC/B,8EAA8E;QAC9E,oFAAoF;QACpF,OAAO;KACR;IACD,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtC,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE;QAC5B,IAAI,IAAI,KAAK,IAAI,EAAE;YACjB,WAAW,EAAE,CAAC;SACf;aAAM;YACL,MAAM;SACP;KACF;IACD,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;QACrC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;YACnB,oBAAoB,CAClB,IAAI,EACJ,IAAA,0BAAiB,EAAC,MAAM,EAAE,CAAC,CAAC,EAC5B,IAAA,0BAAiB,EAAC,WAAW,EAAE,CAAC,CAAC,CAClC,CAAC;SACH;QACD,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EAAC,MAAM,EAAE,CAAC,CAAC,EAC5B,IAAA,0BAAiB,EAAC,WAAW,EAAE,CAAC,CAAC,CAClC,CAAC;QACF,sEAAsE;QACtE,yEAAyE;QACzE,6EAA6E;QAC7E,uDAAuD;QACvD,IAAI,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACrB,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAA,0BAAiB,EAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YACtE,qFAAqF;YACrF,8DAA8D;YAC9D,MAAM,iCAAiC,GAAG,CAAC,CAAC;YAC5C,OAAO,GAAG,OAAO,CAAC,OAAO,CACvB,IAAI,MAAM,CAAC,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,GAAG,CAAC,EACnD,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,WAAW,GAAG,iCAAiC,CAAC,CACpE,CAAC;YACF,OAAO,GAAG,OAAO,CAAC,OAAO,CACvB,IAAI,MAAM,CAAC,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,GAAG,CAAC,EACnD,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,WAAW,GAAG,iCAAiC,CAAC,CACpE,CAAC;YACF,8FAA8F;YAC9F,IAAI,CAAC,KAAK,CAAC,IAAA,0BAAiB,EAAC,MAAM,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;SACnD;QACD,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EAAC,MAAM,EAAE,CAAC,CAAC,EAC5B,IAAA,0BAAiB,EAAC,WAAW,EAAE,CAAC,CAAC,CAClC,CAAC;KACH;AACH,CAAC;AAED,SAAe,eAAe,CAAC,IAAU;;QACvC,IAAA,sBAAa,EAAC,YAAY,EAAE,oBAAS,CAAC,CAAC;QACvC,MAAM,EAAE,eAAe,EAAE;QACvB,sBAAsB;QACtB,OAAO,CAAC,yCAAyC,CAAC,CAAC;QAErD,sBAAsB;QACtB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,sBAAa,EAAC,YAAY,EAAE,oBAAS,CAAC,CAAC;QAE1D,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,QAAQ,IAAI,YAAY,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC;QAE5E,MAAM,eAAe,CAAC,IAAI,EAAE;YAC1B,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,YAAY;YAClB,UAAU,EAAE,UAAU;YACtB,YAAY,EAAE,KAAK;YACnB,QAAQ,EAAE,KAAK;YACf,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,UAAU,EAAE,IAAI;YAChB,cAAc,EAAE,KAAK;YACrB,cAAc,EAAE,MAAM;YACtB,aAAa,EAAE,MAAM;YACrB,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC;QACH,uBAAuB,EAAE,CACvB,IAAI,EACJ,IAAA,iCAAwB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC,IAAI,EACjD,YAAY,CACb,CAAC;QACF,MAAM,mBAAmB,CAAC,IAAI,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;IAC3D,CAAC;CAAA;AAED,SAAS,mBAAmB,CAC1B,IAAU,EACV,WAAmB,EACnB,UAAkB;IAElB,MAAM,MAAM,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAC5D,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE;QAC/B,OAAO,IAAA,oBAAa,EAAC,IAAI,EAAE;YACzB,WAAW;YACX,WAAW,EAAE,YAAY;YACzB,cAAc,EAAE,YAAY;YAC5B,gBAAgB,EAAE,IAAI;YACtB,yBAAyB,EAAE,IAAI;YAC/B,UAAU,EAAE,UAAU;SACvB,CAAC,CAAC;KACJ;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAU,EAAE,OAA6B;IACrE,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAC1B,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAChD,CAAC;IACF,MAAM,qBAAqB,GAAG,IAAA,0BAAiB,EAC7C,OAAO,CAAC,IAAI,EACZ,iBAAiB,CAClB,CAAC;IACF,IAAI,kBAAkB,GACpB,WAAW,CAAC,UAAU;QACtB,WAAW,CAAC,UAAU;QACtB,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC;QAChC,CAAC,CAAC,qBAAqB;QACvB,CAAC,CAAC,IAAI,CAAC;IACX,IAAI,CAAC,kBAAkB,EAAE;QACvB,uBAAuB,EAAE,CACvB,IAAI,EACJ,IAAA,iCAAwB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC,IAAI,EACjD,YAAY,CACb,CAAC;QACF,kBAAkB,GAAG,qBAAqB,CAAC;KAC5C;IACD,IAAA,mBAAU,EAAiB,IAAI,EAAE,kBAAkB,EAAE,CAAC,IAAI,EAAE,EAAE;;QAC5D,MAAM,UAAU,GAAG,wBAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAChE,MAAA,IAAI,CAAC,UAAU,oCAAf,IAAI,CAAC,UAAU,GAAK,EAAE,EAAC;QACvB,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YAClC,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;gBAC9B,eAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,aAAa,SAAS,sBAAsB,OAAO,CAAC,IAAI,EAAE;oBACjE,SAAS,EAAE;wBACT,2HAA2H;qBAC5H;iBACF,CAAC,CAAC;aACJ;iBAAM;gBACL,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;aACpD;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,uBAAuB;IAO9B,yFAAyF;IACzF,0DAA0D;IAC1D,MAAM,EAAE,oBAAoB,EAAE;IAC5B,sBAAsB;IACtB,OAAO,CAAC,+CAA+C,CAAC,CAAC;IAC3D,OAAO,oBAAoB,CAAC;AAC9B,CAAC"}
|