@nx/plugin 16.0.0-beta.7 → 16.0.0-rc.0
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 +7 -7
- package/src/generators/create-package/create-package.js +0 -3
- package/src/generators/create-package/create-package.js.map +1 -1
- package/src/generators/create-package/files/create-framework-package/bin/index.ts__tmpl__ +7 -6
- package/src/generators/create-package/files/e2e/__name__.spec.ts__tmpl__ +1 -2
- package/src/generators/create-package/schema.json +1 -0
- package/src/generators/e2e-project/files/tests/__pluginName__.spec.ts__tmpl__ +3 -4
- package/src/generators/generator/generator.js +2 -2
- package/src/generators/generator/generator.js.map +1 -1
- package/src/generators/plugin/plugin.js +1 -1
- package/src/generators/plugin/plugin.js.map +1 -1
- package/src/generators/plugin/utils/normalize-schema.js +3 -1
- package/src/generators/plugin/utils/normalize-schema.js.map +1 -1
- package/src/migrations/update-16-0-0/cli-in-schema-json.js +61 -6
- package/src/migrations/update-16-0-0/cli-in-schema-json.js.map +1 -1
- package/src/utils/testing-utils/commands.js +2 -1
- package/src/utils/testing-utils/commands.js.map +1 -1
- /package/src/generators/generator/files/generator/__fileName__/{generator.spec.ts__tmpl__ → generator.spec.ts.template} +0 -0
- /package/src/generators/generator/files/generator/__fileName__/{generator.ts__tmpl__ → generator.ts.template} +0 -0
- /package/src/generators/generator/files/generator/__fileName__/{schema.d.ts__tmpl__ → schema.d.ts.template} +0 -0
- /package/src/generators/generator/files/generator/__fileName__/{schema.json__tmpl__ → schema.json.template} +0 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/plugin",
|
|
3
|
-
"version": "16.0.0-
|
|
3
|
+
"version": "16.0.0-rc.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "This plugin is used to create Nx plugins! It contains generators for generating common plugin features like generators, executors, migrations and more.",
|
|
6
6
|
"repository": {
|
|
@@ -28,11 +28,11 @@
|
|
|
28
28
|
"migrations": "./migrations.json"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@nrwl/nx-plugin": "16.0.0-
|
|
32
|
-
"@nx/devkit": "16.0.0-
|
|
33
|
-
"@nx/jest": "16.0.0-
|
|
34
|
-
"@nx/js": "16.0.0-
|
|
35
|
-
"@nx/linter": "16.0.0-
|
|
31
|
+
"@nrwl/nx-plugin": "16.0.0-rc.0",
|
|
32
|
+
"@nx/devkit": "16.0.0-rc.0",
|
|
33
|
+
"@nx/jest": "16.0.0-rc.0",
|
|
34
|
+
"@nx/js": "16.0.0-rc.0",
|
|
35
|
+
"@nx/linter": "16.0.0-rc.0",
|
|
36
36
|
"@phenomnomnominal/tsquery": "~5.0.1",
|
|
37
37
|
"dotenv": "~10.0.0",
|
|
38
38
|
"fs-extra": "^11.1.0",
|
|
@@ -41,5 +41,5 @@
|
|
|
41
41
|
"publishConfig": {
|
|
42
42
|
"access": "public"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "19e34df1cd3e286cacc9e73781cbb8fbbcd6fc69"
|
|
45
45
|
}
|
|
@@ -19,9 +19,6 @@ function createPackageGenerator(host, schema) {
|
|
|
19
19
|
}, {});
|
|
20
20
|
tasks.push(installTask);
|
|
21
21
|
yield createCliPackage(host, options, pluginPackageName);
|
|
22
|
-
if (options.e2eTestRunner !== 'none') {
|
|
23
|
-
tasks.push(yield addE2eProject(host, options));
|
|
24
|
-
}
|
|
25
22
|
if (!options.skipFormat) {
|
|
26
23
|
yield (0, devkit_1.formatFiles)(host);
|
|
27
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-package.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/create-package/create-package.ts"],"names":[],"mappings":";;;;AAAA,uCAaoB;AACpB,+BAAgE;AAChE,oDAAkD;AAClD,sDAAwD;AAExD,+DAA6E;AAC7E,4CAAqD;AACrD,6DAAyD;AAEzD,SAAsB,sBAAsB,CAC1C,IAAU,EACV,MAA2B;;QAE3B,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,MAAM,OAAO,GAAG,IAAA,kCAAe,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC9C,MAAM,iBAAiB,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAElE,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ;YACE,qBAAqB,EAAE,oBAAS;SACjC,EACD,EAAE,CACH,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAExB,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"create-package.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/create-package/create-package.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,17 +10,18 @@ async function main() {
|
|
|
10
10
|
|
|
11
11
|
console.log(`Creating the workspace: ${name}`);
|
|
12
12
|
|
|
13
|
+
// This assumes "<%= preset %>" and "<%= projectName %>" are at the same version
|
|
14
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
15
|
+
const presetVersion = require('../package.json').version,
|
|
16
|
+
|
|
13
17
|
// TODO: update below to customize the workspace
|
|
14
|
-
const { directory } = await createWorkspace(
|
|
15
|
-
name,
|
|
18
|
+
const { directory } = await createWorkspace(`<%= preset %>@${presetVersion}`, {
|
|
19
|
+
name,
|
|
16
20
|
nxCloud: false,
|
|
17
21
|
packageManager: 'npm',
|
|
18
|
-
// This assumes "<%= preset %>" and "<%= projectName %>" are at the same version
|
|
19
|
-
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
20
|
-
presetVersion: require('../package.json').version,
|
|
21
22
|
});
|
|
22
23
|
|
|
23
24
|
console.log(`Successfully created the workspace: ${directory}.`);
|
|
24
25
|
}
|
|
25
26
|
|
|
26
|
-
main();
|
|
27
|
+
main();
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import {
|
|
2
|
-
uniq,
|
|
3
2
|
runCreatePackageCli,
|
|
4
3
|
removeTmpProject,
|
|
5
4
|
} from '@nx/plugin/testing';
|
|
6
5
|
|
|
7
6
|
describe('<%= name %> e2e', () => {
|
|
8
|
-
const project =
|
|
7
|
+
const project = '<%= name %>';
|
|
9
8
|
let createPackageResult;
|
|
10
9
|
|
|
11
10
|
beforeAll(async () => {
|
|
@@ -4,7 +4,6 @@ import {
|
|
|
4
4
|
readJson,
|
|
5
5
|
runNxCommandAsync,
|
|
6
6
|
runNxCommand,
|
|
7
|
-
uniq,
|
|
8
7
|
} from '@nx/plugin/testing';
|
|
9
8
|
|
|
10
9
|
describe('<%= pluginName %> e2e', () => {
|
|
@@ -18,17 +17,17 @@ describe('<%= pluginName %> e2e', () => {
|
|
|
18
17
|
ensureNxProject('<%= npmPackageName %>', '<%= pluginOutputPath %>');
|
|
19
18
|
});
|
|
20
19
|
|
|
21
|
-
afterAll(() => {
|
|
20
|
+
afterAll(async () => {
|
|
22
21
|
// `nx reset` kills the daemon, and performs
|
|
23
22
|
// some work which can help clean up e2e leftovers
|
|
24
|
-
runNxCommandAsync('reset');
|
|
23
|
+
await runNxCommandAsync('reset');
|
|
25
24
|
});
|
|
26
25
|
|
|
27
26
|
|
|
28
27
|
// Add some tests here to check that your plugin functionality works as expected.
|
|
29
28
|
// A sample test is included below to give you some ideas.
|
|
30
29
|
xit('should be able to build generated projects', async () => {
|
|
31
|
-
const name =
|
|
30
|
+
const name = 'proj';
|
|
32
31
|
const generator = 'PLACEHOLDER';
|
|
33
32
|
await runNxCommandAsync(`generate <%= npmPackageName %>:${generator} --name ${name}`);
|
|
34
33
|
expect(() => runNxCommand('build ${proj}')).not.toThrow();
|
|
@@ -27,11 +27,11 @@ function normalizeOptions(host, options) {
|
|
|
27
27
|
npmPackageName });
|
|
28
28
|
}
|
|
29
29
|
function addFiles(host, options) {
|
|
30
|
-
const indexPath = `${options.projectSourceRoot}/generators/${options.fileName}/files/src/index.
|
|
30
|
+
const indexPath = `${options.projectSourceRoot}/generators/${options.fileName}/files/src/index.ts.template`;
|
|
31
31
|
if (!host.exists(indexPath)) {
|
|
32
32
|
host.write(indexPath, 'const variable = "<%= name %>";');
|
|
33
33
|
}
|
|
34
|
-
(0, devkit_1.generateFiles)(host, path.join(__dirname, './files/generator'), `${options.projectSourceRoot}/generators`,
|
|
34
|
+
(0, devkit_1.generateFiles)(host, path.join(__dirname, './files/generator'), `${options.projectSourceRoot}/generators`, options);
|
|
35
35
|
if (options.unitTestRunner === 'none') {
|
|
36
36
|
host.delete(path.join(options.projectSourceRoot, 'generators', options.fileName, `generator.spec.ts`));
|
|
37
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/generator/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAaoB;AAEpB,6BAA6B;AAC7B,6DAAyD;AACzD,wDAAgE;AAYhE,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;IACnD,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpD,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,GACxD,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAElD,MAAM,cAAc,GAAG,IAAA,iBAAQ,EAC7B,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CACvC,CAAC,IAAI,CAAC;IAEP,IAAI,WAAmB,CAAC;IACxB,IAAI,OAAO,CAAC,WAAW,EAAE;QACvB,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;KACnC;SAAM;QACL,WAAW,GAAG,GAAG,OAAO,CAAC,IAAI,YAAY,CAAC;KAC3C;IAED,uCACK,OAAO,KACV,QAAQ;QACR,SAAS;QACT,WAAW;QACX,WAAW;QACX,iBAAiB;QACjB,QAAQ;QACR,cAAc,IACd;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,MAAM,SAAS,GAAG,GAAG,OAAO,CAAC,iBAAiB,eAAe,OAAO,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/generator/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ function updatePluginConfig(host, options) {
|
|
|
25
25
|
const project = (0, devkit_1.readProjectConfiguration)(host, options.name);
|
|
26
26
|
if (project.targets.build) {
|
|
27
27
|
(_a = (_b = project.targets.build.options).assets) !== null && _a !== void 0 ? _a : (_b.assets = []);
|
|
28
|
-
const root = options.projectRoot === '.' ? '
|
|
28
|
+
const root = options.projectRoot === '.' ? '.' : './' + options.projectRoot;
|
|
29
29
|
project.targets.build.options.assets = [
|
|
30
30
|
...project.targets.build.options.assets,
|
|
31
31
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/plugin/plugin.ts"],"names":[],"mappings":";;;;AAAA,uCAWoB;AACpB,+BAAgE;AAChE,oFAA+E;AAC/E,uCAAoC;AACpC,6BAA6B;AAC7B,4CAAyD;AACzD,wDAAgE;AAChE,+DAA8E;AAC9E,+FAA0F;AAC1F,oFAAuF;AAIvF,MAAM,SAAS,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC,OAAO,CAAC;AAE3D,SAAe,QAAQ,CAAC,IAAU,EAAE,OAAyB;;QAC3D,IAAI,CAAC,MAAM,CAAC,IAAA,sBAAa,EAAC,GAAG,OAAO,CAAC,WAAW,UAAU,CAAC,CAAC,CAAC;QAE7D,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,EACtC,OAAO,CAAC,WAAW,kCAEd,OAAO,KACV,IAAI,EAAE,EAAE,IAEX,CAAC;IACJ,CAAC;CAAA;AAED,SAAS,kBAAkB,CAAC,IAAU,EAAE,OAAyB;;;IAC/D,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7D,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE;QACzB,YAAA,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAC,MAAM,uCAAN,MAAM,GAAK,EAAE,EAAC;QAE5C,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/plugin/plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,9 @@ function normalizeOptions(host, options) {
|
|
|
17
17
|
? name
|
|
18
18
|
: fullProjectDirectory.replace(new RegExp('/', 'g'), '-');
|
|
19
19
|
const fileName = projectName;
|
|
20
|
-
const projectRoot =
|
|
20
|
+
const projectRoot = options.rootProject
|
|
21
|
+
? fullProjectDirectory
|
|
22
|
+
: (0, devkit_1.joinPathFragments)(libsDir, fullProjectDirectory);
|
|
21
23
|
const parsedTags = options.tags
|
|
22
24
|
? options.tags.split(',').map((s) => s.trim())
|
|
23
25
|
: [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-schema.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/src/generators/plugin/utils/normalize-schema.ts"],"names":[],"mappings":";;;AAAA,uCAOoB;AAepB,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAClE,OAAO,CAAC,SAAS,CAClB,CAAC;IACF,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IACvE,MAAM,OAAO,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,cAAc,CAAC;IAClD,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,oBAAoB,GAAG,gBAAgB;QAC3C,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,gBAAgB,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;QAC/C,CAAC,CAAC,OAAO,CAAC,WAAW;YACrB,CAAC,CAAC,GAAG;YACL,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW;QACrC,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IAC5D,MAAM,QAAQ,GAAG,WAAW,CAAC;IAC7B,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"normalize-schema.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/src/generators/plugin/utils/normalize-schema.ts"],"names":[],"mappings":";;;AAAA,uCAOoB;AAepB,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAClE,OAAO,CAAC,SAAS,CAClB,CAAC;IACF,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IACvE,MAAM,OAAO,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,cAAc,CAAC;IAClD,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,oBAAoB,GAAG,gBAAgB;QAC3C,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,gBAAgB,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;QAC/C,CAAC,CAAC,OAAO,CAAC,WAAW;YACrB,CAAC,CAAC,GAAG;YACL,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW;QACrC,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IAC5D,MAAM,QAAQ,GAAG,WAAW,CAAC;IAC7B,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW;QACrC,CAAC,CAAC,oBAAoB;QACtB,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;IAErD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU,IAAI,IAAA,sBAAa,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAE3E,uCACK,OAAO,KACV,OAAO,EAAE,MAAA,OAAO,CAAC,QAAQ,mCAAI,KAAK,EAClC,QAAQ;QACR,QAAQ;QACR,OAAO,EACP,IAAI,EAAE,WAAW,EACjB,WAAW,EACX,gBAAgB,EAAE,oBAAoB,EACtC,UAAU;QACV,cAAc,EACd,WAAW,EAAE,MAAA,OAAO,CAAC,WAAW,mCAAI,KAAK,IACzC;AACJ,CAAC;AA3CD,4CA2CC"}
|
|
@@ -6,24 +6,79 @@ const package_json_1 = require("nx/src/utils/package-json");
|
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
function updateCliPropsForPlugins(tree) {
|
|
8
8
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
9
|
-
for (const
|
|
9
|
+
for (const project of projects.values()) {
|
|
10
10
|
if (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'package.json'))) {
|
|
11
11
|
const packageJson = (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(project.root, 'package.json'));
|
|
12
12
|
const migrateConfig = (0, package_json_1.readNxMigrateConfig)(packageJson);
|
|
13
13
|
if (migrateConfig.migrations) {
|
|
14
|
-
|
|
14
|
+
const migrationsPath = (0, devkit_1.joinPathFragments)(project.root, migrateConfig.migrations);
|
|
15
|
+
if (tree.exists(migrationsPath)) {
|
|
16
|
+
updateMigrationsJsonForPlugin(tree, migrationsPath);
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
devkit_1.output.warn({
|
|
20
|
+
title: `Migrations file specified for ${packageJson.name} does not exist: ${migrationsPath}`,
|
|
21
|
+
bodyLines: [
|
|
22
|
+
'Please ensure that migrations that use the Angular Devkit are placed inside the `schematics` property, and migrations that use the Nx Devkit are placed inside the `generators` property.',
|
|
23
|
+
],
|
|
24
|
+
});
|
|
25
|
+
}
|
|
15
26
|
}
|
|
16
27
|
if (packageJson.generators) {
|
|
17
|
-
|
|
28
|
+
const generatorsPath = (0, devkit_1.joinPathFragments)(project.root, packageJson.generators);
|
|
29
|
+
if (tree.exists(generatorsPath)) {
|
|
30
|
+
removeCliFromGeneratorSchemaJsonFiles(tree, generatorsPath);
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
devkit_1.output.warn({
|
|
34
|
+
title: `Generators file specified for ${packageJson.name} does not exist: ${generatorsPath}`,
|
|
35
|
+
bodyLines: [
|
|
36
|
+
"The `cli` property inside generator's `schema.json` files is no longer supported.",
|
|
37
|
+
],
|
|
38
|
+
});
|
|
39
|
+
}
|
|
18
40
|
}
|
|
19
41
|
if (packageJson.executors) {
|
|
20
|
-
|
|
42
|
+
const executorsPath = (0, devkit_1.joinPathFragments)(project.root, packageJson.executors);
|
|
43
|
+
if (tree.exists(executorsPath)) {
|
|
44
|
+
removeCliFromExecutorSchemaJsonFiles(tree, executorsPath);
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
devkit_1.output.warn({
|
|
48
|
+
title: `Executors file specified for ${packageJson.name} does not exist: ${executorsPath}`,
|
|
49
|
+
bodyLines: [
|
|
50
|
+
"The `cli` property inside executor's `schema.json` files is no longer supported.",
|
|
51
|
+
],
|
|
52
|
+
});
|
|
53
|
+
}
|
|
21
54
|
}
|
|
22
55
|
if (packageJson.builders) {
|
|
23
|
-
|
|
56
|
+
const buildersPath = (0, devkit_1.joinPathFragments)(project.root, packageJson.builders);
|
|
57
|
+
if (tree.exists(buildersPath)) {
|
|
58
|
+
removeCliFromExecutorSchemaJsonFiles(tree, buildersPath);
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
devkit_1.output.warn({
|
|
62
|
+
title: `Builders file specified for ${packageJson.name} does not exist: ${buildersPath}`,
|
|
63
|
+
bodyLines: [
|
|
64
|
+
"The `cli` property inside builder's `schema.json` files is no longer supported.",
|
|
65
|
+
],
|
|
66
|
+
});
|
|
67
|
+
}
|
|
24
68
|
}
|
|
25
69
|
if (packageJson.schematics) {
|
|
26
|
-
|
|
70
|
+
const schematicsPath = (0, devkit_1.joinPathFragments)(project.root, packageJson.schematics);
|
|
71
|
+
if (tree.exists(schematicsPath)) {
|
|
72
|
+
removeCliFromGeneratorSchemaJsonFiles(tree, schematicsPath);
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
devkit_1.output.warn({
|
|
76
|
+
title: `Schematics file specified for ${packageJson.name} does not exist: ${schematicsPath}`,
|
|
77
|
+
bodyLines: [
|
|
78
|
+
"The `cli` property inside schematic's `schema.json` files is no longer supported.",
|
|
79
|
+
],
|
|
80
|
+
});
|
|
81
|
+
}
|
|
27
82
|
}
|
|
28
83
|
}
|
|
29
84
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-in-schema-json.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/migrations/update-16-0-0/cli-in-schema-json.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"cli-in-schema-json.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/migrations/update-16-0-0/cli-in-schema-json.ts"],"names":[],"mappings":";;;AAAA,uCAUoB;AAKpB,4DAA6E;AAC7E,+BAA+B;AAE/B,SAAgB,wBAAwB,CAAC,IAAU;IACjD,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,KAAK,MAAM,OAAO,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE;QACvC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,EAAE;YAChE,MAAM,WAAW,GAAgB,IAAA,iBAAQ,EACvC,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAChD,CAAC;YACF,MAAM,aAAa,GAAG,IAAA,kCAAmB,EAAC,WAAW,CAAC,CAAC;YACvD,IAAI,aAAa,CAAC,UAAU,EAAE;gBAC5B,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,OAAO,CAAC,IAAI,EACZ,aAAa,CAAC,UAAU,CACzB,CAAC;gBACF,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;oBAC/B,6BAA6B,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;iBACrD;qBAAM;oBACL,eAAM,CAAC,IAAI,CAAC;wBACV,KAAK,EAAE,iCAAiC,WAAW,CAAC,IAAI,oBAAoB,cAAc,EAAE;wBAC5F,SAAS,EAAE;4BACT,2LAA2L;yBAC5L;qBACF,CAAC,CAAC;iBACJ;aACF;YACD,IAAI,WAAW,CAAC,UAAU,EAAE;gBAC1B,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,OAAO,CAAC,IAAI,EACZ,WAAW,CAAC,UAAU,CACvB,CAAC;gBACF,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;oBAC/B,qCAAqC,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;iBAC7D;qBAAM;oBACL,eAAM,CAAC,IAAI,CAAC;wBACV,KAAK,EAAE,iCAAiC,WAAW,CAAC,IAAI,oBAAoB,cAAc,EAAE;wBAC5F,SAAS,EAAE;4BACT,mFAAmF;yBACpF;qBACF,CAAC,CAAC;iBACJ;aACF;YACD,IAAI,WAAW,CAAC,SAAS,EAAE;gBACzB,MAAM,aAAa,GAAG,IAAA,0BAAiB,EACrC,OAAO,CAAC,IAAI,EACZ,WAAW,CAAC,SAAS,CACtB,CAAC;gBACF,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;oBAC9B,oCAAoC,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;iBAC3D;qBAAM;oBACL,eAAM,CAAC,IAAI,CAAC;wBACV,KAAK,EAAE,gCAAgC,WAAW,CAAC,IAAI,oBAAoB,aAAa,EAAE;wBAC1F,SAAS,EAAE;4BACT,kFAAkF;yBACnF;qBACF,CAAC,CAAC;iBACJ;aACF;YACD,IAAI,WAAW,CAAC,QAAQ,EAAE;gBACxB,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,OAAO,CAAC,IAAI,EACZ,WAAW,CAAC,QAAQ,CACrB,CAAC;gBACF,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;oBAC7B,oCAAoC,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;iBAC1D;qBAAM;oBACL,eAAM,CAAC,IAAI,CAAC;wBACV,KAAK,EAAE,+BAA+B,WAAW,CAAC,IAAI,oBAAoB,YAAY,EAAE;wBACxF,SAAS,EAAE;4BACT,iFAAiF;yBAClF;qBACF,CAAC,CAAC;iBACJ;aACF;YACD,IAAI,WAAW,CAAC,UAAU,EAAE;gBAC1B,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,OAAO,CAAC,IAAI,EACZ,WAAW,CAAC,UAAU,CACvB,CAAC;gBACF,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;oBAC/B,qCAAqC,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;iBAC7D;qBAAM;oBACL,eAAM,CAAC,IAAI,CAAC;wBACV,KAAK,EAAE,iCAAiC,WAAW,CAAC,IAAI,oBAAoB,cAAc,EAAE;wBAC5F,SAAS,EAAE;4BACT,mFAAmF;yBACpF;qBACF,CAAC,CAAC;iBACJ;aACF;SACF;KACF;AACH,CAAC;AA3FD,4DA2FC;AAED,SAAS,oCAAoC,CAC3C,IAAU,EACV,cAAsB;;IAEtB,MAAM,UAAU,GAAkB,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACjE,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAA,UAAU,CAAC,SAAS,mCAAI,EAAE,CAAC,CAAC,MAAM,CAC3E,MAAM,CAAC,OAAO,CAAC,MAAA,UAAU,CAAC,QAAQ,mCAAI,EAAE,CAAC,CAC1C,EAAE;QACD,2BAA2B,CAAC,cAAc,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;KAC1D;AACH,CAAC;AAED,SAAS,qCAAqC,CAC5C,IAAU,EACV,cAAsB;;IAEtB,MAAM,UAAU,GAAmB,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAClE,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CACxC,MAAA,UAAU,CAAC,UAAU,mCAAI,EAAE,CAC5B,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAA,UAAU,CAAC,UAAU,mCAAI,EAAE,CAAC,CAAC,EAAE;QACrD,2BAA2B,CAAC,cAAc,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;KAC1D;AACH,CAAC;AAED,SAAS,6BAA6B,CAAC,IAAU,EAAE,cAAsB;IACvE,IAAA,mBAAU,EAAiB,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;;QACxD,KAAK,MAAM,SAAS,IAAI,MAAA,IAAI,CAAC,UAAU,mCAAI,EAAE,EAAE;YAC7C,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,GAAG,KAAK,IAAI,CAAC,EAAE;gBAC9C,MAAA,IAAI,CAAC,UAAU,oCAAf,IAAI,CAAC,UAAU,GAAK,EAAE,EAAC;gBACvB,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;gBACxD,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;aACnC;SACF;QACD,KAAK,MAAM,SAAS,IAAI,MAAA,IAAI,CAAC,UAAU,mCAAI,EAAE,EAAE;YAC7C,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,GAAG,KAAK,IAAI,EAAE;gBAC3C,MAAA,IAAI,CAAC,UAAU,oCAAf,IAAI,CAAC,UAAU,GAAK,EAAE,EAAC;gBACvB,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;gBACxD,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;aACnC;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,kBAAe,wBAAwB,CAAC;AAExC,SAAS,2BAA2B,CAClC,cAAsB,EACtB,KAA+C,EAC/C,IAAU;IAEV,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;QACjB,OAAO;KACR;IACD,MAAM,UAAU,GAAG,IAAA,0BAAiB,EAAC,IAAA,cAAO,EAAC,cAAc,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5E,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QAC3B,IAAA,mBAAU,EAAC,IAAI,EAAE,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE;YACpC,IAAI,IAAI,CAAC,GAAG,EAAE;gBACZ,OAAO,IAAI,CAAC,GAAG,CAAC;aACjB;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;SAAM;QACL,OAAO,CAAC,IAAI,CAAC,8BAA8B,UAAU,EAAE,CAAC,CAAC;KAC1D;AACH,CAAC"}
|
|
@@ -16,8 +16,9 @@ function runNxCommand(command, opts = {
|
|
|
16
16
|
silenceError: false,
|
|
17
17
|
}) {
|
|
18
18
|
function _runNxCommand(c) {
|
|
19
|
+
var _a;
|
|
19
20
|
const execSyncOptions = {
|
|
20
|
-
cwd: opts.cwd,
|
|
21
|
+
cwd: (_a = opts.cwd) !== null && _a !== void 0 ? _a : (0, paths_1.tmpProjPath)(),
|
|
21
22
|
env: Object.assign(Object.assign({}, process.env), opts.env),
|
|
22
23
|
};
|
|
23
24
|
if ((0, utils_1.fileExists)((0, paths_1.tmpProjPath)('package.json'))) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/utils/testing-utils/commands.ts"],"names":[],"mappings":";;;AAAA,iDAAsD;AACtD,mCAAsC;AACtC,uCAAsD;AACtD,mCAAqC;AAErC;;;;;;GAMG;AACH,SAAgB,YAAY,CAC1B,OAAgB,EAChB,OAA0E;IACxE,YAAY,EAAE,KAAK;CACpB;IAED,SAAS,aAAa,CAAC,CAAC
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/utils/testing-utils/commands.ts"],"names":[],"mappings":";;;AAAA,iDAAsD;AACtD,mCAAsC;AACtC,uCAAsD;AACtD,mCAAqC;AAErC;;;;;;GAMG;AACH,SAAgB,YAAY,CAC1B,OAAgB,EAChB,OAA0E;IACxE,YAAY,EAAE,KAAK;CACpB;IAED,SAAS,aAAa,CAAC,CAAC;;QACtB,MAAM,eAAe,GAAgB;YACnC,GAAG,EAAE,MAAA,IAAI,CAAC,GAAG,mCAAI,IAAA,mBAAW,GAAE;YAC9B,GAAG,kCAAO,OAAO,CAAC,GAAG,GAAK,IAAI,CAAC,GAAG,CAAE;SACrC,CAAC;QACF,IAAI,IAAA,kBAAU,EAAC,IAAA,mBAAW,EAAC,cAAc,CAAC,CAAC,EAAE;YAC3C,MAAM,GAAG,GAAG,IAAA,iCAAwB,GAAE,CAAC;YACvC,OAAO,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,IAAI,OAAO,OAAO,EAAE,EAAE,eAAe,CAAC,CAAC;SAC/D;aAAM,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;YACvC,OAAO,IAAA,wBAAQ,EAAC,aAAa,OAAO,EAAE,EAAE,eAAe,CAAC,CAAC;SAC1D;aAAM;YACL,OAAO,IAAA,wBAAQ,EAAC,SAAS,OAAO,EAAE,EAAE,eAAe,CAAC,CAAC;SACtD;IACH,CAAC;IAED,IAAI;QACF,OAAO,aAAa,CAAC,OAAO,CAAC;aAC1B,QAAQ,EAAE;aACV,OAAO,CACN,6EAA6E,EAC7E,EAAE,CACH,CAAC;KACL;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,OAAO,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;SAC5B;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YACtD,MAAM,CAAC,CAAC;SACT;KACF;AACH,CAAC;AApCD,oCAoCC;AAED,SAAgB,UAAU,CACxB,OAAe,EACf,IAA+C;;IAE/C,IAAI;QACF,OAAO,IAAA,wBAAQ,EAAC,OAAO,EAAE;YACvB,GAAG,EAAE,MAAA,IAAI,CAAC,GAAG,mCAAI,IAAA,mBAAW,GAAE;YAC9B,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;YAC/B,GAAG,kCAAO,OAAO,CAAC,GAAG,GAAK,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG,CAAE;SACtC,CAAC,CAAC,QAAQ,EAAE,CAAC;KACf;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;KAClD;AACH,CAAC;AAbD,gCAaC"}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|