@nrwl/workspace 15.9.0-beta.0 → 15.9.0-beta.10
Sign up to get free protection for your applications and to get access to all the features.
- package/generators.json +1 -0
- package/package.json +30 -31
- package/src/generators/library/library.d.ts +1 -1
- package/src/generators/library/library.js +1 -1
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.d.ts +1 -1
- package/src/generators/move/lib/update-cypress-config.js +8 -2
- package/src/generators/move/lib/update-cypress-config.js.map +1 -1
- package/src/generators/new/generate-preset.js +32 -8
- package/src/generators/new/generate-preset.js.map +1 -1
- package/src/generators/new/generate-workspace-files.js +2 -1
- package/src/generators/new/generate-workspace-files.js.map +1 -1
- package/src/generators/new/new.d.ts +2 -1
- package/src/generators/new/new.js +10 -9
- package/src/generators/new/new.js.map +1 -1
- package/src/generators/preset/preset.js.map +1 -1
- package/src/generators/remove/lib/check-project-is-safe-to-remove.js +1 -1
- package/src/generators/remove/lib/check-project-is-safe-to-remove.js.map +1 -1
- package/src/utils/versions.d.ts +2 -1
- package/src/utils/versions.js +5 -2
- package/src/utils/versions.js.map +1 -1
- package/src/utilities/plugins/community-plugins.d.ts +0 -3
- package/src/utilities/plugins/community-plugins.js +0 -47
- package/src/utilities/plugins/community-plugins.js.map +0 -1
- package/src/utilities/plugins/core-plugins.d.ts +0 -3
- package/src/utilities/plugins/core-plugins.js +0 -80
- package/src/utilities/plugins/core-plugins.js.map +0 -1
- package/src/utilities/plugins/index.d.ts +0 -4
- package/src/utilities/plugins/index.js +0 -16
- package/src/utilities/plugins/index.js.map +0 -1
- package/src/utilities/plugins/installed-plugins.d.ts +0 -3
- package/src/utilities/plugins/installed-plugins.js +0 -56
- package/src/utilities/plugins/installed-plugins.js.map +0 -1
- package/src/utilities/plugins/models.d.ts +0 -1
- package/src/utilities/plugins/models.js +0 -5
- package/src/utilities/plugins/models.js.map +0 -1
- package/src/utilities/plugins/plugin-capabilities.d.ts +0 -1
- package/src/utilities/plugins/plugin-capabilities.js +0 -5
- package/src/utilities/plugins/plugin-capabilities.js.map +0 -1
- package/src/utilities/plugins/shared.d.ts +0 -1
- package/src/utilities/plugins/shared.js +0 -9
- package/src/utilities/plugins/shared.js.map +0 -1
package/generators.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/workspace",
|
|
3
|
-
"version": "15.9.0-beta.
|
|
3
|
+
"version": "15.9.0-beta.10",
|
|
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": {
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"Cypress",
|
|
20
20
|
"CLI"
|
|
21
21
|
],
|
|
22
|
-
"main": "./index
|
|
22
|
+
"main": "./index",
|
|
23
23
|
"typings": "./index.d.ts",
|
|
24
24
|
"author": "Victor Savkin",
|
|
25
25
|
"license": "MIT",
|
|
@@ -33,37 +33,36 @@
|
|
|
33
33
|
"requirements": {},
|
|
34
34
|
"migrations": "./migrations.json",
|
|
35
35
|
"packageGroup": {
|
|
36
|
-
"@nrwl/js": "15.9.0-beta.
|
|
37
|
-
"@nrwl/jest": "15.9.0-beta.
|
|
38
|
-
"@nrwl/linter": "15.9.0-beta.
|
|
39
|
-
"@nrwl/angular": "15.9.0-beta.
|
|
40
|
-
"@nrwl/cli": "15.9.0-beta.
|
|
41
|
-
"@nrwl/cypress": "15.9.0-beta.
|
|
42
|
-
"@nrwl/detox": "15.9.0-beta.
|
|
43
|
-
"@nrwl/devkit": "15.9.0-beta.
|
|
44
|
-
"@nrwl/esbuild": "15.9.0-beta.
|
|
45
|
-
"@nrwl/eslint-plugin-nx": "15.9.0-beta.
|
|
46
|
-
"@nrwl/expo": "15.9.0-beta.
|
|
47
|
-
"@nrwl/express": "15.9.0-beta.
|
|
48
|
-
"@nrwl/nest": "15.9.0-beta.
|
|
49
|
-
"@nrwl/next": "15.9.0-beta.
|
|
50
|
-
"@nrwl/node": "15.9.0-beta.
|
|
36
|
+
"@nrwl/js": "15.9.0-beta.10",
|
|
37
|
+
"@nrwl/jest": "15.9.0-beta.10",
|
|
38
|
+
"@nrwl/linter": "15.9.0-beta.10",
|
|
39
|
+
"@nrwl/angular": "15.9.0-beta.10",
|
|
40
|
+
"@nrwl/cli": "15.9.0-beta.10",
|
|
41
|
+
"@nrwl/cypress": "15.9.0-beta.10",
|
|
42
|
+
"@nrwl/detox": "15.9.0-beta.10",
|
|
43
|
+
"@nrwl/devkit": "15.9.0-beta.10",
|
|
44
|
+
"@nrwl/esbuild": "15.9.0-beta.10",
|
|
45
|
+
"@nrwl/eslint-plugin-nx": "15.9.0-beta.10",
|
|
46
|
+
"@nrwl/expo": "15.9.0-beta.10",
|
|
47
|
+
"@nrwl/express": "15.9.0-beta.10",
|
|
48
|
+
"@nrwl/nest": "15.9.0-beta.10",
|
|
49
|
+
"@nrwl/next": "15.9.0-beta.10",
|
|
50
|
+
"@nrwl/node": "15.9.0-beta.10",
|
|
51
51
|
"@nrwl/nx-cloud": "latest",
|
|
52
|
-
"@nrwl/nx-plugin": "15.9.0-beta.
|
|
53
|
-
"@nrwl/react-native": "15.9.0-beta.
|
|
54
|
-
"@nrwl/react": "15.9.0-beta.
|
|
55
|
-
"@nrwl/rollup": "15.9.0-beta.
|
|
56
|
-
"@nrwl/storybook": "15.9.0-beta.
|
|
57
|
-
"@nrwl/tao": "15.9.0-beta.
|
|
58
|
-
"@nrwl/vite": "15.9.0-beta.
|
|
59
|
-
"@nrwl/web": "15.9.0-beta.
|
|
60
|
-
"@nrwl/webpack": "15.9.0-beta.
|
|
61
|
-
"nx": "15.9.0-beta.
|
|
52
|
+
"@nrwl/nx-plugin": "15.9.0-beta.10",
|
|
53
|
+
"@nrwl/react-native": "15.9.0-beta.10",
|
|
54
|
+
"@nrwl/react": "15.9.0-beta.10",
|
|
55
|
+
"@nrwl/rollup": "15.9.0-beta.10",
|
|
56
|
+
"@nrwl/storybook": "15.9.0-beta.10",
|
|
57
|
+
"@nrwl/tao": "15.9.0-beta.10",
|
|
58
|
+
"@nrwl/vite": "15.9.0-beta.10",
|
|
59
|
+
"@nrwl/web": "15.9.0-beta.10",
|
|
60
|
+
"@nrwl/webpack": "15.9.0-beta.10",
|
|
61
|
+
"nx": "15.9.0-beta.10"
|
|
62
62
|
}
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
|
-
"@nrwl/devkit": "15.9.0-beta.
|
|
66
|
-
"@nrwl/linter": "15.9.0-beta.0",
|
|
65
|
+
"@nrwl/devkit": "15.9.0-beta.10",
|
|
67
66
|
"@parcel/watcher": "2.0.4",
|
|
68
67
|
"chalk": "^4.1.0",
|
|
69
68
|
"chokidar": "^3.5.1",
|
|
@@ -76,7 +75,7 @@
|
|
|
76
75
|
"ignore": "^5.0.4",
|
|
77
76
|
"minimatch": "3.0.5",
|
|
78
77
|
"npm-run-path": "^4.0.1",
|
|
79
|
-
"nx": "15.9.0-beta.
|
|
78
|
+
"nx": "15.9.0-beta.10",
|
|
80
79
|
"open": "^8.4.0",
|
|
81
80
|
"rxjs": "^6.5.4",
|
|
82
81
|
"tmp": "~0.2.1",
|
|
@@ -88,5 +87,5 @@
|
|
|
88
87
|
"access": "public"
|
|
89
88
|
},
|
|
90
89
|
"types": "./index.d.ts",
|
|
91
|
-
"gitHead": "
|
|
90
|
+
"gitHead": "2c13d4ae3d70058a88f493706240d3da472e90cf"
|
|
92
91
|
}
|
|
@@ -142,7 +142,7 @@ function normalizeOptions(tree, options) {
|
|
|
142
142
|
options.unitTestRunner = 'jest';
|
|
143
143
|
}
|
|
144
144
|
if (!options.linter) {
|
|
145
|
-
const { Linter } =
|
|
145
|
+
const { Linter } = (0, devkit_1.ensurePackage)('@nrwl/linter', versions_1.nxVersion);
|
|
146
146
|
options.linter = Linter.EsLint;
|
|
147
147
|
}
|
|
148
148
|
const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/library/library.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,8 +13,14 @@ function updateCypressConfig(tree, schema, project) {
|
|
|
13
13
|
const cypressJsonPath = path.join(schema.relativeToRootDestination, 'cypress.json');
|
|
14
14
|
if (tree.exists(cypressJsonPath)) {
|
|
15
15
|
const cypressJson = JSON.parse(tree.read(cypressJsonPath).toString('utf-8'));
|
|
16
|
-
|
|
17
|
-
|
|
16
|
+
// videosFolder is not required because videos can be turned off - it also has a default
|
|
17
|
+
if (cypressJson.videosFolder) {
|
|
18
|
+
cypressJson.videosFolder = cypressJson.videosFolder.replace(project.root, schema.relativeToRootDestination);
|
|
19
|
+
}
|
|
20
|
+
// screenshotsFolder is not required as it has a default
|
|
21
|
+
if (cypressJson.screenshotsFolder) {
|
|
22
|
+
cypressJson.screenshotsFolder = cypressJson.screenshotsFolder.replace(project.root, schema.relativeToRootDestination);
|
|
23
|
+
}
|
|
18
24
|
tree.write(cypressJsonPath, JSON.stringify(cypressJson));
|
|
19
25
|
return tree;
|
|
20
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-cypress-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-cypress-config.ts"],"names":[],"mappings":";;;AACA,6BAA6B;AAQ7B;;;;;;GAMG;AACH,SAAgB,mBAAmB,CACjC,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAC/B,MAAM,CAAC,yBAAyB,EAChC,cAAc,CACf,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QAChC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CACvB,CAAC;QACxB,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC,OAAO,CACzD,OAAO,CAAC,IAAI,EACZ,MAAM,CAAC,yBAAyB,CACjC,CAAC;
|
|
1
|
+
{"version":3,"file":"update-cypress-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-cypress-config.ts"],"names":[],"mappings":";;;AACA,6BAA6B;AAQ7B;;;;;;GAMG;AACH,SAAgB,mBAAmB,CACjC,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAC/B,MAAM,CAAC,yBAAyB,EAChC,cAAc,CACf,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QAChC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CACvB,CAAC;QACxB,wFAAwF;QACxF,IAAI,WAAW,CAAC,YAAY,EAAE;YAC5B,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC,OAAO,CACzD,OAAO,CAAC,IAAI,EACZ,MAAM,CAAC,yBAAyB,CACjC,CAAC;SACH;QACD,wDAAwD;QACxD,IAAI,WAAW,CAAC,iBAAiB,EAAE;YACjC,WAAW,CAAC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC,OAAO,CACnE,OAAO,CAAC,IAAI,EACZ,MAAM,CAAC,yBAAyB,CACjC,CAAC;SACH;QAED,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;KACb;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CACjC,MAAM,CAAC,yBAAyB,EAChC,mBAAmB,CACpB,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;QAClC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,IAAI,MAAM,CAAC,IAAI,MAAM,CAAC,WAAW,GAAG,EAAE,GAAG,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,UAAU;aAC1B,OAAO,CAAC,QAAQ,EAAE,IAAI,MAAM,CAAC,cAAc,GAAG,CAAC;aAC/C,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,yBAAyB,CAAC,CAAC;QAEtD,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;KAC3C;AACH,CAAC;AA/CD,kDA+CC"}
|
|
@@ -15,7 +15,7 @@ function addPresetDependencies(host, options) {
|
|
|
15
15
|
options.preset === presets_1.Preset.NPM) {
|
|
16
16
|
return;
|
|
17
17
|
}
|
|
18
|
-
const { dependencies, dev } = getPresetDependencies(options
|
|
18
|
+
const { dependencies, dev } = getPresetDependencies(options);
|
|
19
19
|
return (0, devkit_1.addDependenciesToPackageJson)(host, dependencies, dev, (0, path_1.join)(options.directory, 'package.json'));
|
|
20
20
|
}
|
|
21
21
|
exports.addPresetDependencies = addPresetDependencies;
|
|
@@ -71,35 +71,59 @@ function generatePreset(host, opts) {
|
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
73
|
exports.generatePreset = generatePreset;
|
|
74
|
-
function getPresetDependencies(preset,
|
|
74
|
+
function getPresetDependencies({ preset, presetVersion, bundler, }) {
|
|
75
75
|
switch (preset) {
|
|
76
76
|
case presets_1.Preset.TS:
|
|
77
77
|
return { dependencies: {}, dev: { '@nrwl/js': versions_1.nxVersion } };
|
|
78
78
|
case presets_1.Preset.AngularMonorepo:
|
|
79
79
|
case presets_1.Preset.AngularStandalone:
|
|
80
|
-
return {
|
|
80
|
+
return {
|
|
81
|
+
dependencies: { '@nrwl/angular': versions_1.nxVersion },
|
|
82
|
+
dev: {
|
|
83
|
+
'@angular-devkit/core': versions_1.angularCliVersion,
|
|
84
|
+
'@angular-devkit/schematics': versions_1.angularCliVersion,
|
|
85
|
+
'@schematics/angular': versions_1.angularCliVersion,
|
|
86
|
+
typescript: versions_1.typescriptVersion,
|
|
87
|
+
},
|
|
88
|
+
};
|
|
81
89
|
case presets_1.Preset.Express:
|
|
82
90
|
return { dependencies: {}, dev: { '@nrwl/express': versions_1.nxVersion } };
|
|
83
91
|
case presets_1.Preset.Nest:
|
|
84
|
-
return {
|
|
92
|
+
return {
|
|
93
|
+
dependencies: {},
|
|
94
|
+
dev: { '@nrwl/nest': versions_1.nxVersion, typescript: versions_1.typescriptVersion },
|
|
95
|
+
};
|
|
85
96
|
case presets_1.Preset.NextJs:
|
|
86
97
|
return { dependencies: { '@nrwl/next': versions_1.nxVersion }, dev: {} };
|
|
87
98
|
case presets_1.Preset.ReactMonorepo:
|
|
88
|
-
return { dependencies: {}, dev: { '@nrwl/react': versions_1.nxVersion } };
|
|
89
99
|
case presets_1.Preset.ReactStandalone:
|
|
90
|
-
return {
|
|
100
|
+
return {
|
|
101
|
+
dependencies: {},
|
|
102
|
+
dev: {
|
|
103
|
+
'@nrwl/react': versions_1.nxVersion,
|
|
104
|
+
'@nrwl/cypress': versions_1.nxVersion,
|
|
105
|
+
'@nrwl/jest': bundler !== 'vite' ? versions_1.nxVersion : undefined,
|
|
106
|
+
'@nrwl/vite': bundler === 'vite' ? versions_1.nxVersion : undefined,
|
|
107
|
+
'@nrwl/webpack': bundler === 'webpack' ? versions_1.nxVersion : undefined,
|
|
108
|
+
},
|
|
109
|
+
};
|
|
91
110
|
case presets_1.Preset.ReactNative:
|
|
92
111
|
return { dependencies: {}, dev: { '@nrwl/react-native': versions_1.nxVersion } };
|
|
93
112
|
case presets_1.Preset.Expo:
|
|
94
113
|
return { dependencies: {}, dev: { '@nrwl/expo': versions_1.nxVersion } };
|
|
95
114
|
case presets_1.Preset.WebComponents:
|
|
96
|
-
return {
|
|
115
|
+
return {
|
|
116
|
+
dependencies: {},
|
|
117
|
+
dev: { '@nrwl/web': versions_1.nxVersion, typescript: versions_1.typescriptVersion },
|
|
118
|
+
};
|
|
97
119
|
case presets_1.Preset.NodeServer:
|
|
98
120
|
return { dependencies: {}, dev: { '@nrwl/node': versions_1.nxVersion } };
|
|
99
121
|
default: {
|
|
100
122
|
return {
|
|
101
123
|
dev: {},
|
|
102
|
-
dependencies: {
|
|
124
|
+
dependencies: {
|
|
125
|
+
[preset]: presetVersion !== null && presetVersion !== void 0 ? presetVersion : (0, get_npm_package_version_1.getNpmPackageVersion)(preset),
|
|
126
|
+
},
|
|
103
127
|
};
|
|
104
128
|
}
|
|
105
129
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-preset.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AACtB,8CAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"generate-preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-preset.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,7 +52,8 @@ function createAppsAndLibsFolders(tree, options) {
|
|
|
52
52
|
}
|
|
53
53
|
else if (options.preset === presets_1.Preset.AngularStandalone ||
|
|
54
54
|
options.preset === presets_1.Preset.ReactStandalone ||
|
|
55
|
-
options.preset === presets_1.Preset.NodeServer
|
|
55
|
+
options.preset === presets_1.Preset.NodeServer ||
|
|
56
|
+
options.isCustomPreset) {
|
|
56
57
|
// don't generate any folders
|
|
57
58
|
}
|
|
58
59
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-workspace-files.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-workspace-files.ts"],"names":[],"mappings":";;;;AAAA,yCAUsB;AACtB,mDAAiD;AACjD,+BAA8C;AAC9C,8CAA0C;AAC1C,+DAAiE;AAGjE,SAAsB,sBAAsB,CAC1C,IAAU,EACV,OAAyB;;QAEzB,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;SACzD;QACD,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACpC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5B,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3B,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE5B,MAAM,CAAC,YAAY,CAAC,GAAG,IAAA,iCAAwB,EAC7C,OAAO,CAAC,cAAgC,CACzC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACb,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,IAAI,CAAC,YAAY,IAAI,CAAC,EAAE;YAC3D,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC5B;aAAM,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,IAAI,CAAC,YAAY,IAAI,CAAC,EAAE;YAClE,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAChC;QACD,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7B,wBAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACxC,4BAA4B,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE5C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AA1BD,wDA0BC;AAED,SAAS,iBAAiB,CAAC,IAAU,EAAE,OAAyB;IAC9D,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QAC5D,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,GAAG,EAAE;YACnE,yBAAyB,CAAC,IAAI,EAAE,SAAS,EAAE,qBAAqB,CAAC,CAAC;YAClE,OAAO,IAAI,CAAC,oBAAoB,CAAC;YACjC,OAAO,IAAI,CAAC,cAAc,CAAC;YAC3B,OAAO,IAAI,CAAC,kBAAkB,CAAC;YAC/B,OAAO,IAAI,CAAC,eAAe,CAAC;YAC5B,OAAO,IAAI,CAAC,QAAQ,CAAC;SACtB;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,wBAAwB,CAAC,IAAU,EAAE,OAAyB;IACrE,IACE,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI;QAC9B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,EAAE;QAC5B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,GAAG,EAC7B;QACA,IAAI,CAAC,KAAK,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,SAAS,EAAE,mBAAmB,CAAC,EAAE,EAAE,CAAC,CAAC;KAC9D;SAAM,IACL,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,iBAAiB;QAC3C,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,eAAe;QACzC,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,UAAU,
|
|
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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"}
|
|
@@ -20,6 +20,7 @@ interface Schema {
|
|
|
20
20
|
}
|
|
21
21
|
export interface NormalizedSchema extends Schema {
|
|
22
22
|
presetVersion?: string;
|
|
23
|
+
isCustomPreset: boolean;
|
|
23
24
|
}
|
|
24
|
-
export declare function newGenerator(host: Tree,
|
|
25
|
+
export declare function newGenerator(host: Tree, opts: Schema): Promise<() => Promise<void>>;
|
|
25
26
|
export default newGenerator;
|
|
@@ -7,20 +7,19 @@ const path_1 = require("path");
|
|
|
7
7
|
const presets_1 = require("../utils/presets");
|
|
8
8
|
const generate_workspace_files_1 = require("./generate-workspace-files");
|
|
9
9
|
const generate_preset_1 = require("./generate-preset");
|
|
10
|
-
function newGenerator(host,
|
|
10
|
+
function newGenerator(host, opts) {
|
|
11
11
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
12
|
-
options = normalizeOptions(
|
|
12
|
+
const options = normalizeOptions(opts);
|
|
13
13
|
validateOptions(options, host);
|
|
14
14
|
yield (0, generate_workspace_files_1.generateWorkspaceFiles)(host, Object.assign(Object.assign({}, options), { nxCloud: undefined }));
|
|
15
15
|
(0, generate_preset_1.addPresetDependencies)(host, options);
|
|
16
|
-
const isCustomPreset = !Object.values(presets_1.Preset).includes(options.preset);
|
|
17
16
|
addCloudDependencies(host, options);
|
|
18
17
|
return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
19
18
|
(0, devkit_1.installPackagesTask)(host, false, options.directory, options.packageManager);
|
|
20
19
|
// TODO: move all of these into create-nx-workspace
|
|
21
20
|
if (options.preset !== presets_1.Preset.NPM &&
|
|
22
21
|
options.preset !== presets_1.Preset.Core &&
|
|
23
|
-
!isCustomPreset) {
|
|
22
|
+
!options.isCustomPreset) {
|
|
24
23
|
yield (0, generate_preset_1.generatePreset)(host, options);
|
|
25
24
|
}
|
|
26
25
|
});
|
|
@@ -50,19 +49,21 @@ function validateOptions(options, host) {
|
|
|
50
49
|
}
|
|
51
50
|
}
|
|
52
51
|
function normalizeOptions(options) {
|
|
53
|
-
|
|
52
|
+
const normalized = Object.assign({}, options);
|
|
53
|
+
normalized.name = (0, devkit_1.names)(options.name).fileName;
|
|
54
54
|
if (!options.directory) {
|
|
55
|
-
|
|
55
|
+
normalized.directory = options.name;
|
|
56
56
|
}
|
|
57
57
|
// If the preset already contains a version in the name
|
|
58
58
|
// -- my-package@2.0.1
|
|
59
59
|
// -- @scope/package@version
|
|
60
60
|
const match = options.preset.match(/^(?<package>(@.+\/)?[^@]+)(@(?<version>\d+\.\d+\.\d+))?$/);
|
|
61
61
|
if (match) {
|
|
62
|
-
|
|
63
|
-
|
|
62
|
+
normalized.preset = match.groups.package;
|
|
63
|
+
normalized.presetVersion = match.groups.version;
|
|
64
64
|
}
|
|
65
|
-
|
|
65
|
+
normalized.isCustomPreset = !Object.values(presets_1.Preset).includes(options.preset);
|
|
66
|
+
return normalized;
|
|
66
67
|
}
|
|
67
68
|
function addCloudDependencies(host, options) {
|
|
68
69
|
if (options.nxCloud) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AAEtB,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,OAAO,GAAG,qBAAqB,CAAC,CAAC;YAE7C,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;aACzB,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,iBAAiB,EAAE;YACtD,MAAM,EACJ,oBAAoB,EAAE,2BAA2B,GAClD,GAAG,OAAO,CAAC,OAAO,GAAG,qBAAqB,CAAC,CAAC;YAE7C,OAAO,2BAA2B,CAAC,IAAI,EAAE;gBACvC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,WAAW,EAAE,IAAI;gBACjB,UAAU,EAAE,OAAO,CAAC,aAAa;aAClC,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,aAAa,EAAE;YAClD,MAAM,EACJ,oBAAoB,EAAE,yBAAyB,GAChD,GAAG,OAAO,CAAC,OAAO,GAAG,QAAQ,CAAC,CAAC;YAEhC,OAAO,yBAAyB,CAAC,IAAI,EAAE;gBACrC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,MAAA,OAAO,CAAC,OAAO,mCAAI,SAAS;aACtC,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,eAAe,EAAE;YACpD,MAAM,EACJ,oBAAoB,EAAE,yBAAyB,GAChD,GAAG,OAAO,CAAC,OAAO,GAAG,QAAQ,CAAC,CAAC;YAEhC,OAAO,yBAAyB,CAAC,IAAI,EAAE;gBACrC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,WAAW,EAAE,IAAI;gBACjB,OAAO,EAAE,MAAA,OAAO,CAAC,OAAO,mCAAI,MAAM;gBAClC,aAAa,EAAE,SAAS;gBACxB,cAAc,EAAE,OAAO,CAAC,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM;aAC/D,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,MAAM,EAAE;YAC3C,MAAM,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,GAAG,OAAO,CAAC,OAAO;gBACxE,OAAO,CAAC,CAAC;YAEX,OAAO,wBAAwB,CAAC,IAAI,EAAE;gBACpC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;aACvB,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,aAAa,EAAE;YAClD,MAAM,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC,OAAO;gBACvE,MAAM,CAAC,CAAC;YAEV,OAAO,uBAAuB,CAAC,IAAI,EAAE;gBACnC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,MAAM;aAChB,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI,EAAE;YACzC,MAAM,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,GAAG,OAAO,CAAC,OAAO;gBACxE,OAAO,CAAC,CAAC;YAEX,OAAO,wBAAwB,CAAC,IAAI,EAAE;gBACpC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,MAAM,EAAE,OAAO,CAAC,MAAM;aACvB,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,OAAO,EAAE;YAC5C,MAAM,EACJ,oBAAoB,EAAE,2BAA2B,GAClD,GAAG,OAAO,CAAC,OAAO,GAAG,UAAU,CAAC,CAAC;YAClC,OAAO,2BAA2B,CAAC,IAAI,EAAE;gBACvC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,MAAM,EAAE,OAAO,CAAC,MAAM;aACvB,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,WAAW,EAAE;YAChD,MAAM,EAAE,+BAA+B,EAAE,GAAG,OAAO,CAAC,OAAO;gBACzD,eAAe,CAAC,CAAC;YACnB,OAAO,+BAA+B,CAAC,IAAI,EAAE;gBAC3C,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,aAAa,EAAE,OAAO;aACvB,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI,EAAE;YACzC,MAAM,EAAE,wBAAwB,EAAE,GAAG,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC;YAChE,OAAO,wBAAwB,CAAC,IAAI,EAAE;gBACpC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,aAAa,EAAE,OAAO;aACvB,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,EAAE,EAAE;YACvC,MAAM,CAAC,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;YAC3B,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC;YACnD,CAAC,CAAC,eAAe,GAAG;gBAClB,OAAO,EAAE,UAAU;gBACnB,OAAO,EAAE,UAAU;aACpB,CAAC;YACF,IAAA,qBAAY,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YACtB,OAAO,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;SAChC;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,UAAU,EAAE;YAC/C,MAAM,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,GAAG,OAAO,CAAC,OAAO;gBACxE,OAAO,CAAC,CAAC;YACX,OAAO,wBAAwB,CAAC,IAAI,EAAE;gBACpC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;SACJ;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,kBAAkB,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;SACrD;;CACF;AAED,SAAS,gBAAgB,CAAC,OAAe;IACvC,OAAO,CAAC,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC5C,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -14,7 +14,7 @@ function checkProjectIsSafeToRemove(tree, schema, project) {
|
|
|
14
14
|
const containedProjects = [];
|
|
15
15
|
for (const [_, p] of (0, devkit_1.getProjects)(tree)) {
|
|
16
16
|
if (project.name !== p.name &&
|
|
17
|
-
!(0, devkit_1.normalizePath)((0, path_1.relative)(project.root, p.root)).startsWith('
|
|
17
|
+
!(0, devkit_1.normalizePath)((0, path_1.relative)(project.root, p.root)).startsWith('..')) {
|
|
18
18
|
containedProjects.push(p.name);
|
|
19
19
|
}
|
|
20
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-project-is-safe-to-remove.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/check-project-is-safe-to-remove.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAEtB,+BAAgC;AAEhC,SAAgB,0BAA0B,CACxC,IAAU,EACV,MAAc,EACd,OAA6B;IAE7B,IAAI,OAAO,CAAC,IAAI,KAAK,GAAG,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,IAAI,MAAM,CAAC,WAAW,gFAAgF,CACvG,CAAC;KACH;IACD,IAAI,MAAM,CAAC,WAAW,EAAE;QACtB,eAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QAC7C,OAAO;KACR;IACD,MAAM,iBAAiB,GAAG,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;QACtC,IACE,OAAO,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI;YACvB,CAAC,IAAA,sBAAa,EAAC,IAAA,eAAQ,EAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"check-project-is-safe-to-remove.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/check-project-is-safe-to-remove.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAEtB,+BAAgC;AAEhC,SAAgB,0BAA0B,CACxC,IAAU,EACV,MAAc,EACd,OAA6B;IAE7B,IAAI,OAAO,CAAC,IAAI,KAAK,GAAG,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,IAAI,MAAM,CAAC,WAAW,gFAAgF,CACvG,CAAC;KACH;IACD,IAAI,MAAM,CAAC,WAAW,EAAE;QACtB,eAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QAC7C,OAAO;KACR;IACD,MAAM,iBAAiB,GAAG,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;QACtC,IACE,OAAO,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI;YACvB,CAAC,IAAA,sBAAa,EAAC,IAAA,eAAQ,EAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAC/D;YACA,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SAChC;KACF;IACD,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CACb,IACE,MAAM,CAAC,WACT,6HAA6H,iBAAiB,CAAC,IAAI,CACjJ,OAAO,CACR,0DAA0D,CAC5D,CAAC;KACH;AACH,CAAC;AAhCD,gEAgCC"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export declare const nxVersion: any;
|
|
2
|
-
export declare const angularCliVersion = "~15.2.0";
|
|
3
2
|
export declare const typescriptVersion = "~4.9.5";
|
|
4
3
|
export declare const typescriptESLintVersion = "^5.36.1";
|
|
5
4
|
export declare const eslintVersion = "~8.15.0";
|
|
6
5
|
export declare const eslintConfigPrettierVersion = "8.1.0";
|
|
6
|
+
export declare const angularCliVersion = "~15.2.0";
|
|
7
|
+
export declare const prettierVersion = "^2.6.2";
|
package/src/utils/versions.js
CHANGED
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.prettierVersion = exports.angularCliVersion = exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.typescriptESLintVersion = exports.typescriptVersion = exports.nxVersion = void 0;
|
|
4
4
|
exports.nxVersion = require('../../package.json').version;
|
|
5
|
-
exports.angularCliVersion = '~15.2.0';
|
|
6
5
|
exports.typescriptVersion = '~4.9.5';
|
|
7
6
|
exports.typescriptESLintVersion = '^5.36.1';
|
|
8
7
|
exports.eslintVersion = '~8.15.0';
|
|
9
8
|
exports.eslintConfigPrettierVersion = '8.1.0';
|
|
9
|
+
// TODO: remove when preset generation is reworked and
|
|
10
|
+
// deps are not installed from workspace
|
|
11
|
+
exports.angularCliVersion = '~15.2.0';
|
|
12
|
+
exports.prettierVersion = '^2.6.2';
|
|
10
13
|
//# sourceMappingURL=versions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,iBAAiB,GAAG,
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,uBAAuB,GAAG,SAAS,CAAC;AACpC,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,2BAA2B,GAAG,OAAO,CAAC;AAEnD,sDAAsD;AACtD,wCAAwC;AAC3B,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,eAAe,GAAG,QAAQ,CAAC"}
|
|
@@ -1,3 +0,0 @@
|
|
|
1
|
-
import type { CommunityPlugin, PluginCapabilities } from './models';
|
|
2
|
-
export declare function fetchCommunityPlugins(): Promise<CommunityPlugin[]>;
|
|
3
|
-
export declare function listCommunityPlugins(installedPlugins: Map<string, PluginCapabilities>, communityPlugins?: CommunityPlugin[]): void;
|
|
@@ -1,47 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.listCommunityPlugins = exports.fetchCommunityPlugins = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
|
-
const https_1 = require("https");
|
|
6
|
-
const chalk = require("chalk");
|
|
7
|
-
const output_1 = require("../output");
|
|
8
|
-
const COMMUNITY_PLUGINS_JSON_URL = 'https://raw.githubusercontent.com/nrwl/nx/master/community/approved-plugins.json';
|
|
9
|
-
function fetchCommunityPlugins() {
|
|
10
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
|
-
return new Promise((resolve, reject) => {
|
|
12
|
-
const req = (0, https_1.get)(COMMUNITY_PLUGINS_JSON_URL, (res) => {
|
|
13
|
-
if (res.statusCode < 200 || res.statusCode >= 300) {
|
|
14
|
-
reject(new Error(`Request failed with status code ${res.statusCode}`));
|
|
15
|
-
}
|
|
16
|
-
const data = [];
|
|
17
|
-
res.on('data', (chunk) => {
|
|
18
|
-
data.push(chunk);
|
|
19
|
-
});
|
|
20
|
-
res.on('end', () => {
|
|
21
|
-
try {
|
|
22
|
-
resolve(JSON.parse(Buffer.concat(data).toString('utf-8')));
|
|
23
|
-
}
|
|
24
|
-
catch (e) {
|
|
25
|
-
reject(e);
|
|
26
|
-
}
|
|
27
|
-
});
|
|
28
|
-
});
|
|
29
|
-
req.on('error', reject);
|
|
30
|
-
req.end();
|
|
31
|
-
});
|
|
32
|
-
});
|
|
33
|
-
}
|
|
34
|
-
exports.fetchCommunityPlugins = fetchCommunityPlugins;
|
|
35
|
-
function listCommunityPlugins(installedPlugins, communityPlugins) {
|
|
36
|
-
if (!communityPlugins)
|
|
37
|
-
return;
|
|
38
|
-
const availableCommunityPlugins = communityPlugins.filter((p) => !installedPlugins.has(p.name));
|
|
39
|
-
output_1.output.log({
|
|
40
|
-
title: `Community plugins:`,
|
|
41
|
-
bodyLines: availableCommunityPlugins.map((p) => {
|
|
42
|
-
return `${chalk.bold(p.name)} - ${p.description}`;
|
|
43
|
-
}),
|
|
44
|
-
});
|
|
45
|
-
}
|
|
46
|
-
exports.listCommunityPlugins = listCommunityPlugins;
|
|
47
|
-
//# sourceMappingURL=community-plugins.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"community-plugins.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/community-plugins.ts"],"names":[],"mappings":";;;;AAAA,iCAA4B;AAC5B,+BAA+B;AAC/B,sCAAmC;AAGnC,MAAM,0BAA0B,GAC9B,kFAAkF,CAAC;AAErF,SAAsB,qBAAqB;;QACzC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,GAAG,GAAG,IAAA,WAAG,EAAC,0BAA0B,EAAE,CAAC,GAAG,EAAE,EAAE;gBAClD,IAAI,GAAG,CAAC,UAAU,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,EAAE;oBACjD,MAAM,CAAC,IAAI,KAAK,CAAC,mCAAmC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;iBACxE;gBAED,MAAM,IAAI,GAAG,EAAE,CAAC;gBAChB,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;oBACvB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnB,CAAC,CAAC,CAAC;gBACH,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;oBACjB,IAAI;wBACF,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;qBAC5D;oBAAC,OAAO,CAAC,EAAE;wBACV,MAAM,CAAC,CAAC,CAAC,CAAC;qBACX;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACxB,GAAG,CAAC,GAAG,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAvBD,sDAuBC;AAED,SAAgB,oBAAoB,CAClC,gBAAiD,EACjD,gBAAoC;IAEpC,IAAI,CAAC,gBAAgB;QAAE,OAAO;IAE9B,MAAM,yBAAyB,GAAG,gBAAgB,CAAC,MAAM,CACvD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CACrC,CAAC;IAEF,eAAM,CAAC,GAAG,CAAC;QACT,KAAK,EAAE,oBAAoB;QAC3B,SAAS,EAAE,yBAAyB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC7C,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;QACpD,CAAC,CAAC;KACH,CAAC,CAAC;AACL,CAAC;AAhBD,oDAgBC"}
|
|
@@ -1,80 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.listCorePlugins = exports.fetchCorePlugins = void 0;
|
|
4
|
-
const chalk = require("chalk");
|
|
5
|
-
const output_1 = require("../output");
|
|
6
|
-
function fetchCorePlugins() {
|
|
7
|
-
const corePlugins = [
|
|
8
|
-
{
|
|
9
|
-
name: '@nrwl/angular',
|
|
10
|
-
capabilities: 'generators',
|
|
11
|
-
},
|
|
12
|
-
{
|
|
13
|
-
name: '@nrwl/cypress',
|
|
14
|
-
capabilities: 'executors,generators',
|
|
15
|
-
},
|
|
16
|
-
{
|
|
17
|
-
name: '@nrwl/express',
|
|
18
|
-
capabilities: 'executors,generators',
|
|
19
|
-
},
|
|
20
|
-
{
|
|
21
|
-
name: '@nrwl/jest',
|
|
22
|
-
capabilities: 'executors,generators',
|
|
23
|
-
},
|
|
24
|
-
{
|
|
25
|
-
name: '@nrwl/linter',
|
|
26
|
-
capabilities: 'executors',
|
|
27
|
-
},
|
|
28
|
-
{
|
|
29
|
-
name: '@nrwl/nest',
|
|
30
|
-
capabilities: 'executors,generators',
|
|
31
|
-
},
|
|
32
|
-
{
|
|
33
|
-
name: '@nrwl/next',
|
|
34
|
-
capabilities: 'executors,generators',
|
|
35
|
-
},
|
|
36
|
-
{
|
|
37
|
-
name: '@nrwl/node',
|
|
38
|
-
capabilities: 'executors,generators',
|
|
39
|
-
},
|
|
40
|
-
{
|
|
41
|
-
name: '@nrwl/nx-plugin',
|
|
42
|
-
capabilities: 'executors,generators',
|
|
43
|
-
},
|
|
44
|
-
{
|
|
45
|
-
name: '@nrwl/react',
|
|
46
|
-
capabilities: 'executors,generators',
|
|
47
|
-
},
|
|
48
|
-
{
|
|
49
|
-
name: '@nrwl/js',
|
|
50
|
-
capabilities: 'executors,generators',
|
|
51
|
-
},
|
|
52
|
-
{
|
|
53
|
-
name: '@nrwl/storybook',
|
|
54
|
-
capabilities: 'executors,generators',
|
|
55
|
-
},
|
|
56
|
-
{
|
|
57
|
-
name: '@nrwl/web',
|
|
58
|
-
capabilities: 'executors,generators',
|
|
59
|
-
},
|
|
60
|
-
{
|
|
61
|
-
name: '@nrwl/workspace',
|
|
62
|
-
capabilities: 'executors,generators',
|
|
63
|
-
},
|
|
64
|
-
];
|
|
65
|
-
return corePlugins;
|
|
66
|
-
}
|
|
67
|
-
exports.fetchCorePlugins = fetchCorePlugins;
|
|
68
|
-
function listCorePlugins(installedPlugins, corePlugins) {
|
|
69
|
-
const alsoAvailable = corePlugins.filter((p) => !installedPlugins.has(p.name));
|
|
70
|
-
if (alsoAvailable.length) {
|
|
71
|
-
output_1.output.log({
|
|
72
|
-
title: `Also available:`,
|
|
73
|
-
bodyLines: alsoAvailable.map((p) => {
|
|
74
|
-
return `${chalk.bold(p.name)} (${p.capabilities})`;
|
|
75
|
-
}),
|
|
76
|
-
});
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
exports.listCorePlugins = listCorePlugins;
|
|
80
|
-
//# sourceMappingURL=core-plugins.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"core-plugins.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/core-plugins.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,sCAAmC;AAGnC,SAAgB,gBAAgB;IAC9B,MAAM,WAAW,GAAiB;QAChC;YACE,IAAI,EAAE,eAAe;YACrB,YAAY,EAAE,YAAY;SAC3B;QACD;YACE,IAAI,EAAE,eAAe;YACrB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,eAAe;YACrB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,YAAY;YAClB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,cAAc;YACpB,YAAY,EAAE,WAAW;SAC1B;QACD;YACE,IAAI,EAAE,YAAY;YAClB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,YAAY;YAClB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,YAAY;YAClB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,iBAAiB;YACvB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,aAAa;YACnB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,UAAU;YAChB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,iBAAiB;YACvB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,WAAW;YACjB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,iBAAiB;YACvB,YAAY,EAAE,sBAAsB;SACrC;KACF,CAAC;IACF,OAAO,WAAW,CAAC;AACrB,CAAC;AA5DD,4CA4DC;AAED,SAAgB,eAAe,CAC7B,gBAAiD,EACjD,WAAyB;IAEzB,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,CACtC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CACrC,CAAC;IAEF,IAAI,aAAa,CAAC,MAAM,EAAE;QACxB,eAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,iBAAiB;YACxB,SAAS,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACjC,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,YAAY,GAAG,CAAC;YACrD,CAAC,CAAC;SACH,CAAC,CAAC;KACJ;AACH,CAAC;AAhBD,0CAgBC"}
|
|
@@ -1,4 +0,0 @@
|
|
|
1
|
-
export { fetchCommunityPlugins, listCommunityPlugins, } from './community-plugins';
|
|
2
|
-
export { fetchCorePlugins, listCorePlugins } from './core-plugins';
|
|
3
|
-
export { getInstalledPluginsFromPackageJson, listInstalledPlugins, } from './installed-plugins';
|
|
4
|
-
export { getPluginCapabilities, listPluginCapabilities, } from './plugin-capabilities';
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.listPluginCapabilities = exports.getPluginCapabilities = exports.listInstalledPlugins = exports.getInstalledPluginsFromPackageJson = exports.listCorePlugins = exports.fetchCorePlugins = exports.listCommunityPlugins = exports.fetchCommunityPlugins = void 0;
|
|
4
|
-
var community_plugins_1 = require("./community-plugins");
|
|
5
|
-
Object.defineProperty(exports, "fetchCommunityPlugins", { enumerable: true, get: function () { return community_plugins_1.fetchCommunityPlugins; } });
|
|
6
|
-
Object.defineProperty(exports, "listCommunityPlugins", { enumerable: true, get: function () { return community_plugins_1.listCommunityPlugins; } });
|
|
7
|
-
var core_plugins_1 = require("./core-plugins");
|
|
8
|
-
Object.defineProperty(exports, "fetchCorePlugins", { enumerable: true, get: function () { return core_plugins_1.fetchCorePlugins; } });
|
|
9
|
-
Object.defineProperty(exports, "listCorePlugins", { enumerable: true, get: function () { return core_plugins_1.listCorePlugins; } });
|
|
10
|
-
var installed_plugins_1 = require("./installed-plugins");
|
|
11
|
-
Object.defineProperty(exports, "getInstalledPluginsFromPackageJson", { enumerable: true, get: function () { return installed_plugins_1.getInstalledPluginsFromPackageJson; } });
|
|
12
|
-
Object.defineProperty(exports, "listInstalledPlugins", { enumerable: true, get: function () { return installed_plugins_1.listInstalledPlugins; } });
|
|
13
|
-
var plugin_capabilities_1 = require("./plugin-capabilities");
|
|
14
|
-
Object.defineProperty(exports, "getPluginCapabilities", { enumerable: true, get: function () { return plugin_capabilities_1.getPluginCapabilities; } });
|
|
15
|
-
Object.defineProperty(exports, "listPluginCapabilities", { enumerable: true, get: function () { return plugin_capabilities_1.listPluginCapabilities; } });
|
|
16
|
-
//# sourceMappingURL=index.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/index.ts"],"names":[],"mappings":";;;AAAA,yDAG6B;AAF3B,0HAAA,qBAAqB,OAAA;AACrB,yHAAA,oBAAoB,OAAA;AAEtB,+CAAmE;AAA1D,gHAAA,gBAAgB,OAAA;AAAE,+GAAA,eAAe,OAAA;AAC1C,yDAG6B;AAF3B,uIAAA,kCAAkC,OAAA;AAClC,yHAAA,oBAAoB,OAAA;AAEtB,6DAG+B;AAF7B,4HAAA,qBAAqB,OAAA;AACrB,6HAAA,sBAAsB,OAAA"}
|
|
@@ -1,3 +0,0 @@
|
|
|
1
|
-
import type { CommunityPlugin, CorePlugin, PluginCapabilities } from './models';
|
|
2
|
-
export declare function getInstalledPluginsFromPackageJson(workspaceRoot: string, corePlugins: CorePlugin[], communityPlugins?: CommunityPlugin[]): Map<string, PluginCapabilities>;
|
|
3
|
-
export declare function listInstalledPlugins(installedPlugins: Map<string, PluginCapabilities>): void;
|
|
@@ -1,56 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.listInstalledPlugins = exports.getInstalledPluginsFromPackageJson = void 0;
|
|
4
|
-
const chalk = require("chalk");
|
|
5
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const output_1 = require("../output");
|
|
7
|
-
const plugin_capabilities_1 = require("./plugin-capabilities");
|
|
8
|
-
const shared_1 = require("./shared");
|
|
9
|
-
const package_json_1 = require("nx/src/utils/package-json");
|
|
10
|
-
function getInstalledPluginsFromPackageJson(workspaceRoot, corePlugins, communityPlugins = []) {
|
|
11
|
-
const packageJson = (0, devkit_1.readJsonFile)(`${workspaceRoot}/package.json`);
|
|
12
|
-
const plugins = new Set([
|
|
13
|
-
...corePlugins.map((p) => p.name),
|
|
14
|
-
...communityPlugins.map((p) => p.name),
|
|
15
|
-
...Object.keys(packageJson.dependencies || {}),
|
|
16
|
-
...Object.keys(packageJson.devDependencies || {}),
|
|
17
|
-
]);
|
|
18
|
-
return new Map(Array.from(plugins)
|
|
19
|
-
.filter((name) => {
|
|
20
|
-
try {
|
|
21
|
-
// Check for `package.json` existence instead of requiring the module itself
|
|
22
|
-
// because malformed entries like `main`, may throw false exceptions.
|
|
23
|
-
(0, package_json_1.readModulePackageJson)(name);
|
|
24
|
-
return true;
|
|
25
|
-
}
|
|
26
|
-
catch (_a) {
|
|
27
|
-
return false;
|
|
28
|
-
}
|
|
29
|
-
})
|
|
30
|
-
.sort()
|
|
31
|
-
.map((name) => [
|
|
32
|
-
name,
|
|
33
|
-
(0, plugin_capabilities_1.getPluginCapabilities)(workspaceRoot, name),
|
|
34
|
-
])
|
|
35
|
-
.filter(([, x]) => x && !!(x.generators || x.executors)));
|
|
36
|
-
}
|
|
37
|
-
exports.getInstalledPluginsFromPackageJson = getInstalledPluginsFromPackageJson;
|
|
38
|
-
function listInstalledPlugins(installedPlugins) {
|
|
39
|
-
const bodyLines = [];
|
|
40
|
-
for (const [, p] of installedPlugins) {
|
|
41
|
-
const capabilities = [];
|
|
42
|
-
if ((0, shared_1.hasElements)(p.executors)) {
|
|
43
|
-
capabilities.push('executors');
|
|
44
|
-
}
|
|
45
|
-
if ((0, shared_1.hasElements)(p.generators)) {
|
|
46
|
-
capabilities.push('generators');
|
|
47
|
-
}
|
|
48
|
-
bodyLines.push(`${chalk.bold(p.name)} (${capabilities.join()})`);
|
|
49
|
-
}
|
|
50
|
-
output_1.output.log({
|
|
51
|
-
title: `Installed plugins:`,
|
|
52
|
-
bodyLines: bodyLines,
|
|
53
|
-
});
|
|
54
|
-
}
|
|
55
|
-
exports.listInstalledPlugins = listInstalledPlugins;
|
|
56
|
-
//# sourceMappingURL=installed-plugins.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"installed-plugins.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/installed-plugins.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,yCAA4C;AAC5C,sCAAmC;AAEnC,+DAA8D;AAC9D,qCAAuC;AACvC,4DAAkE;AAElE,SAAgB,kCAAkC,CAChD,aAAqB,EACrB,WAAyB,EACzB,mBAAsC,EAAE;IAExC,MAAM,WAAW,GAAG,IAAA,qBAAY,EAAC,GAAG,aAAa,eAAe,CAAC,CAAC;IAElE,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC;QACtB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACjC,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACtC,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;QAC9C,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;KAClD,CAAC,CAAC;IAEH,OAAO,IAAI,GAAG,CACZ,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;SAChB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACf,IAAI;YACF,4EAA4E;YAC5E,qEAAqE;YACrE,IAAA,oCAAqB,EAAC,IAAI,CAAC,CAAC;YAC5B,OAAO,IAAI,CAAC;SACb;QAAC,WAAM;YACN,OAAO,KAAK,CAAC;SACd;IACH,CAAC,CAAC;SACD,IAAI,EAAE;SACN,GAAG,CAA+B,CAAC,IAAI,EAAE,EAAE,CAAC;QAC3C,IAAI;QACJ,IAAA,2CAAqB,EAAC,aAAa,EAAE,IAAI,CAAC;KAC3C,CAAC;SACD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,CAC3D,CAAC;AACJ,CAAC;AAjCD,gFAiCC;AAED,SAAgB,oBAAoB,CAClC,gBAAiD;IAEjD,MAAM,SAAS,GAAa,EAAE,CAAC;IAE/B,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,gBAAgB,EAAE;QACpC,MAAM,YAAY,GAAG,EAAE,CAAC;QACxB,IAAI,IAAA,oBAAW,EAAC,CAAC,CAAC,SAAS,CAAC,EAAE;YAC5B,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAChC;QACD,IAAI,IAAA,oBAAW,EAAC,CAAC,CAAC,UAAU,CAAC,EAAE;YAC7B,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SACjC;QACD,SAAS,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,YAAY,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KAClE;IAED,eAAM,CAAC,GAAG,CAAC;QACT,KAAK,EAAE,oBAAoB;QAC3B,SAAS,EAAE,SAAS;KACrB,CAAC,CAAC;AACL,CAAC;AApBD,oDAoBC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export * from 'nx/src/utils/plugins/models';
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/models.ts"],"names":[],"mappings":";;;AAAA,sEAA4C"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export * from 'nx/src/utils/plugins/plugin-capabilities';
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-capabilities.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/plugin-capabilities.ts"],"names":[],"mappings":";;;AAAA,mFAAyD"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export declare function hasElements(obj: any): boolean;
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
// Lifted in part from https://github.com/nrwl/angular-console
|
|
3
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.hasElements = void 0;
|
|
5
|
-
function hasElements(obj) {
|
|
6
|
-
return obj && Object.values(obj).length > 0;
|
|
7
|
-
}
|
|
8
|
-
exports.hasElements = hasElements;
|
|
9
|
-
//# sourceMappingURL=shared.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/shared.ts"],"names":[],"mappings":";AAAA,8DAA8D;;;AAE9D,SAAgB,WAAW,CAAC,GAAQ;IAClC,OAAO,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AAC9C,CAAC;AAFD,kCAEC"}
|