@nx/plugin 16.1.4 → 16.2.0-beta.1
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/executors.json +4 -2
- package/migrations.json +6 -0
- package/package.json +7 -7
- package/src/executors/e2e/e2e.impl.js +10 -2
- package/src/executors/e2e/e2e.impl.js.map +1 -1
- package/src/generators/e2e-project/e2e.js +13 -23
- package/src/generators/e2e-project/e2e.js.map +1 -1
- package/src/generators/generator/files/generator/__fileName__/generator.spec.ts.template +4 -4
- package/src/generators/generator/files/generator/__fileName__/generator.ts.template +3 -1
- package/src/generators/generator/generator.js +2 -5
- package/src/generators/generator/generator.js.map +1 -1
- package/src/generators/plugin/utils/normalize-schema.d.ts +0 -1
- package/src/generators/plugin/utils/normalize-schema.js +3 -3
- package/src/generators/plugin/utils/normalize-schema.js.map +1 -1
- package/src/migrations/update-16-2-0/replace-e2e-executor.d.ts +2 -0
- package/src/migrations/update-16-2-0/replace-e2e-executor.js +33 -0
- package/src/migrations/update-16-2-0/replace-e2e-executor.js.map +1 -0
package/executors.json
CHANGED
|
@@ -3,14 +3,16 @@
|
|
|
3
3
|
"e2e": {
|
|
4
4
|
"implementation": "./src/executors/e2e/compat",
|
|
5
5
|
"schema": "./src/executors/e2e/schema.json",
|
|
6
|
-
"description": "Creates and runs the E2E tests for an Nx Plugin."
|
|
6
|
+
"description": "Creates and runs the E2E tests for an Nx Plugin.",
|
|
7
|
+
"x-deprecated": "@nx/plugin:e2e is deprecated and will be removed in Nx 18. Use @nx/jest:jest instead."
|
|
7
8
|
}
|
|
8
9
|
},
|
|
9
10
|
"executors": {
|
|
10
11
|
"e2e": {
|
|
11
12
|
"implementation": "./src/executors/e2e/e2e.impl",
|
|
12
13
|
"schema": "./src/executors/e2e/schema.json",
|
|
13
|
-
"description": "Creates and runs the E2E tests for an Nx Plugin."
|
|
14
|
+
"description": "Creates and runs the E2E tests for an Nx Plugin.",
|
|
15
|
+
"x-deprecated": "@nx/plugin:e2e is deprecated and will be removed in Nx 18. Use @nx/jest:jest instead."
|
|
14
16
|
}
|
|
15
17
|
}
|
|
16
18
|
}
|
package/migrations.json
CHANGED
|
@@ -41,6 +41,12 @@
|
|
|
41
41
|
"version": "16.0.0-beta.1",
|
|
42
42
|
"description": "Replace @nrwl/nx-plugin with @nx/plugin",
|
|
43
43
|
"implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
|
|
44
|
+
},
|
|
45
|
+
"update-16-2-0-replace-e2e-executor": {
|
|
46
|
+
"cli": "nx",
|
|
47
|
+
"version": "16.2.0-beta.0",
|
|
48
|
+
"description": "Replace @nx/plugin:e2e with @nx/jest",
|
|
49
|
+
"implementation": "./src/migrations/update-16-2-0/replace-e2e-executor"
|
|
44
50
|
}
|
|
45
51
|
}
|
|
46
52
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/plugin",
|
|
3
|
-
"version": "16.1
|
|
3
|
+
"version": "16.2.0-beta.1",
|
|
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.1
|
|
32
|
-
"@nx/devkit": "16.1
|
|
33
|
-
"@nx/jest": "16.1
|
|
34
|
-
"@nx/js": "16.1
|
|
35
|
-
"@nx/linter": "16.1
|
|
31
|
+
"@nrwl/nx-plugin": "16.2.0-beta.1",
|
|
32
|
+
"@nx/devkit": "16.2.0-beta.1",
|
|
33
|
+
"@nx/jest": "16.2.0-beta.1",
|
|
34
|
+
"@nx/js": "16.2.0-beta.1",
|
|
35
|
+
"@nx/linter": "16.2.0-beta.1",
|
|
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": "79fa3fb0ead486e33a7e00b5c13a0f2545278202"
|
|
45
45
|
}
|
|
@@ -5,11 +5,18 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
require("dotenv/config");
|
|
6
6
|
const devkit_1 = require("@nx/devkit");
|
|
7
7
|
const jest_impl_1 = require("@nx/jest/src/executors/jest/jest.impl");
|
|
8
|
-
// TODO(
|
|
8
|
+
// TODO(v18): remove this
|
|
9
9
|
function nxPluginE2EExecutor(options, context) {
|
|
10
10
|
return tslib_1.__asyncGenerator(this, arguments, function* nxPluginE2EExecutor_1() {
|
|
11
11
|
var _a, e_1, _b, _c;
|
|
12
12
|
const { target } = options, jestOptions = tslib_1.__rest(options, ["target"]);
|
|
13
|
+
devkit_1.output.warn({
|
|
14
|
+
title: `"@nx/plugin:e2e" is deprecated and will be removed in Nx 18`,
|
|
15
|
+
bodyLines: [
|
|
16
|
+
'Use the "@nx/jest:jest" executor instead and set the following:',
|
|
17
|
+
`"dependsOn": ["${target}"]`,
|
|
18
|
+
],
|
|
19
|
+
});
|
|
13
20
|
let success;
|
|
14
21
|
try {
|
|
15
22
|
for (var _d = true, _e = tslib_1.__asyncValues(runBuildTarget(target, context)), _f; _f = yield tslib_1.__await(_e.next()), _a = _f.done, !_a;) {
|
|
@@ -44,7 +51,8 @@ exports.nxPluginE2EExecutor = nxPluginE2EExecutor;
|
|
|
44
51
|
function runBuildTarget(buildTarget, context) {
|
|
45
52
|
return tslib_1.__asyncGenerator(this, arguments, function* runBuildTarget_1() {
|
|
46
53
|
var _a, e_2, _b, _c;
|
|
47
|
-
const
|
|
54
|
+
const graph = yield tslib_1.__await((0, devkit_1.createProjectGraphAsync)());
|
|
55
|
+
const { project, target, configuration } = (0, devkit_1.parseTargetString)(buildTarget, graph);
|
|
48
56
|
const buildTargetOptions = (0, devkit_1.readTargetOptions)({ project, target, configuration }, context);
|
|
49
57
|
const targetSupportsWatch = Object.keys(buildTargetOptions).includes('watch');
|
|
50
58
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"e2e.impl.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/executors/e2e/e2e.impl.ts"],"names":[],"mappings":";;;;AAAA,yBAAuB;AAIvB,
|
|
1
|
+
{"version":3,"file":"e2e.impl.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/executors/e2e/e2e.impl.ts"],"names":[],"mappings":";;;;AAAA,yBAAuB;AAIvB,uCAOoB;AAEpB,qEAAqE;AAGrE,yBAAyB;AACzB,SAAuB,mBAAmB,CACxC,OAAmC,EACnC,OAAwB;;;QAExB,MAAM,EAAE,MAAM,KAAqB,OAAO,EAAvB,WAAW,kBAAK,OAAO,EAApC,UAA0B,CAAU,CAAC;QAE3C,eAAM,CAAC,IAAI,CAAC;YACV,KAAK,EAAE,6DAA6D;YACpE,SAAS,EAAE;gBACT,iEAAiE;gBACjE,kBAAkB,MAAM,IAAI;aAC7B;SACF,CAAC,CAAC;QAEH,IAAI,OAAgB,CAAC;;YACrB,KAAsB,eAAA,KAAA,sBAAA,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA,IAAA;gBAA/B,cAA+B;gBAA/B,WAA+B;;oBAA1C,MAAM,CAAC,KAAA,CAAA;oBAChB,IAAI;wBACF,OAAO,GAAG,sBAAM,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA,CAAC;qBAChD;oBAAC,OAAO,CAAC,EAAE;wBACV,eAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;wBACxB,OAAO,GAAG,KAAK,CAAC;qBACjB;;;;;aACF;;;;;;;;;QAED,6BAAO,EAAE,OAAO,EAAE,EAAC;IACrB,CAAC;CAAA;AAzBD,kDAyBC;AAED,SAAgB,cAAc,CAC5B,WAAmB,EACnB,OAAwB;;;QAExB,MAAM,KAAK,GAAG,sBAAM,IAAA,gCAAuB,GAAE,CAAA,CAAC;QAC9C,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,0BAAiB,EAC1D,WAAW,EACX,KAAK,CACN,CAAC;QACF,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAC1C,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,EAClC,OAAO,CACR,CAAC;QACF,MAAM,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;;YAE9E,KAA2B,eAAA,KAAA,sBAAA,sBAAM,IAAA,oBAAW,EAC1C,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,EAClC,mBAAmB,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAC3C,OAAO,CACR,CAAA,CAAA,IAAA;gBAJ0B,cAI1B;gBAJ0B,WAI1B;;oBAJU,MAAM,MAAM,KAAA,CAAA;oBAKrB,IAAI,CAAC,MAAM,CAAC,OAAO;wBACjB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;oBAC1D,4BAAM,MAAM,CAAC,OAAO,CAAA,CAAC;;;;;aACtB;;;;;;;;;IACH,CAAC;CAAA;AAED,SAAe,QAAQ,CACrB,WAAgC,EAChC,OAAwB;;QAExB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,wBAAY,kCAC/B,WAAW,KAAE,KAAK,EAAE,KAAK,KAC9B,OAAO,CACR,CAAC;QAEF,OAAO,OAAO,CAAC;IACjB,CAAC;CAAA;AAED,kBAAe,mBAAmB,CAAC"}
|
|
@@ -34,24 +34,16 @@ function validatePlugin(host, pluginName) {
|
|
|
34
34
|
function addFiles(host, options) {
|
|
35
35
|
(0, devkit_1.generateFiles)(host, path.join(__dirname, './files'), options.projectRoot, Object.assign(Object.assign({}, options), { tmpl: '', rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot) }));
|
|
36
36
|
}
|
|
37
|
-
function updateWorkspaceConfiguration(host, options) {
|
|
38
|
-
(0, devkit_1.addProjectConfiguration)(host, options.projectName, {
|
|
39
|
-
root: options.projectRoot,
|
|
40
|
-
projectType: 'application',
|
|
41
|
-
sourceRoot: `${options.projectRoot}/tests`,
|
|
42
|
-
targets: {
|
|
43
|
-
e2e: {
|
|
44
|
-
executor: '@nx/plugin:e2e',
|
|
45
|
-
options: { target: `${options.pluginName}:build` },
|
|
46
|
-
},
|
|
47
|
-
},
|
|
48
|
-
tags: [],
|
|
49
|
-
implicitDependencies: [options.pluginName],
|
|
50
|
-
});
|
|
51
|
-
}
|
|
52
37
|
function addJest(host, options) {
|
|
53
38
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
54
|
-
|
|
39
|
+
(0, devkit_1.addProjectConfiguration)(host, options.projectName, {
|
|
40
|
+
root: options.projectRoot,
|
|
41
|
+
projectType: 'application',
|
|
42
|
+
sourceRoot: `${options.projectRoot}/tests`,
|
|
43
|
+
targets: {},
|
|
44
|
+
implicitDependencies: [options.pluginName],
|
|
45
|
+
});
|
|
46
|
+
const jestTask = yield (0, jest_1.jestProjectGenerator)(host, {
|
|
55
47
|
project: options.projectName,
|
|
56
48
|
setupFile: 'none',
|
|
57
49
|
supportTsx: false,
|
|
@@ -59,12 +51,12 @@ function addJest(host, options) {
|
|
|
59
51
|
skipFormat: true,
|
|
60
52
|
});
|
|
61
53
|
const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
|
|
62
|
-
const
|
|
63
|
-
|
|
64
|
-
project.targets.e2e.options = Object.assign(Object.assign({}, e2eOptions), { jestConfig: testOptions.jestConfig });
|
|
54
|
+
const testTarget = project.targets.test;
|
|
55
|
+
project.targets.e2e = Object.assign(Object.assign({}, testTarget), { dependsOn: [`^build`], options: Object.assign(Object.assign({}, testTarget.options), { runInBand: true }), configurations: testTarget.configurations });
|
|
65
56
|
// remove the jest build target
|
|
66
57
|
delete project.targets.test;
|
|
67
58
|
(0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);
|
|
59
|
+
return jestTask;
|
|
68
60
|
});
|
|
69
61
|
}
|
|
70
62
|
function addLintingToApplication(tree, options) {
|
|
@@ -89,11 +81,9 @@ function e2eProjectGenerator(host, schema) {
|
|
|
89
81
|
validatePlugin(host, schema.pluginName);
|
|
90
82
|
const options = normalizeOptions(host, schema);
|
|
91
83
|
addFiles(host, options);
|
|
92
|
-
|
|
93
|
-
yield addJest(host, options);
|
|
84
|
+
tasks.push(yield addJest(host, options));
|
|
94
85
|
if (options.linter !== linter_1.Linter.None) {
|
|
95
|
-
|
|
96
|
-
tasks.push(lintTask);
|
|
86
|
+
tasks.push(yield addLintingToApplication(host, Object.assign({}, options)));
|
|
97
87
|
}
|
|
98
88
|
if (!options.skipFormat) {
|
|
99
89
|
yield (0, devkit_1.formatFiles)(host);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"e2e.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/e2e-project/e2e.ts"],"names":[],"mappings":";;;;AACA,uCAaoB;AACpB,mCAAgD;AAChD,+BAAuD;AACvD,6BAA6B;AAG7B,uCAA0D;AAU1D,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IACnD,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAClE,OAAO,CAAC,gBAAgB,CACzB,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;IAElD,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,UAAU,MAAM,CAAC;IAC9E,MAAM,WAAW,GACf,gBAAgB,IAAI,CAAC,OAAO,CAAC,WAAW;QACtC,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,GAAG,gBAAgB,MAAM,CAAC;QACvD,CAAC,CAAC,OAAO,CAAC,WAAW;YACrB,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC9C,MAAM,kBAAkB,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC,YAAY,CAAC;IAElE,uCACK,OAAO,KACV,WAAW,EACX,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,eAAM,CAAC,MAAM,EACvC,kBAAkB;QAClB,WAAW;QACX,QAAQ,IACR;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,IAAU,EAAE,UAAkB;IACpD,IAAI;QACF,IAAA,iCAAwB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;KAC5C;IAAC,WAAM;QACN,MAAM,IAAI,KAAK,CAAC,iBAAiB,UAAU,sBAAsB,CAAC,CAAC;KACpE;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,WAAW,kCACnE,OAAO,KACV,IAAI,EAAE,EAAE,EACR,gBAAgB,EAAE,IAAA,kCAA6B,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,IAC1E,CAAC;AACL,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"e2e.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/e2e-project/e2e.ts"],"names":[],"mappings":";;;;AACA,uCAaoB;AACpB,mCAAgD;AAChD,+BAAuD;AACvD,6BAA6B;AAG7B,uCAA0D;AAU1D,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IACnD,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAClE,OAAO,CAAC,gBAAgB,CACzB,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;IAElD,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,UAAU,MAAM,CAAC;IAC9E,MAAM,WAAW,GACf,gBAAgB,IAAI,CAAC,OAAO,CAAC,WAAW;QACtC,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,GAAG,gBAAgB,MAAM,CAAC;QACvD,CAAC,CAAC,OAAO,CAAC,WAAW;YACrB,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC9C,MAAM,kBAAkB,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC,YAAY,CAAC;IAElE,uCACK,OAAO,KACV,WAAW,EACX,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,eAAM,CAAC,MAAM,EACvC,kBAAkB;QAClB,WAAW;QACX,QAAQ,IACR;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,IAAU,EAAE,UAAkB;IACpD,IAAI;QACF,IAAA,iCAAwB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;KAC5C;IAAC,WAAM;QACN,MAAM,IAAI,KAAK,CAAC,iBAAiB,UAAU,sBAAsB,CAAC,CAAC;KACpE;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,WAAW,kCACnE,OAAO,KACV,IAAI,EAAE,EAAE,EACR,gBAAgB,EAAE,IAAA,kCAA6B,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,IAC1E,CAAC;AACL,CAAC;AAED,SAAe,OAAO,CAAC,IAAU,EAAE,OAAyB;;QAC1D,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE;YACjD,IAAI,EAAE,OAAO,CAAC,WAAW;YACzB,WAAW,EAAE,aAAa;YAC1B,UAAU,EAAE,GAAG,OAAO,CAAC,WAAW,QAAQ;YAC1C,OAAO,EAAE,EAAE;YACX,oBAAoB,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC;SAC3C,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,MAAM,IAAA,2BAAoB,EAAC,IAAI,EAAE;YAChD,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,SAAS,EAAE,MAAM;YACjB,UAAU,EAAE,KAAK;YACjB,eAAe,EAAE,IAAI;YACrB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACpE,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;QAExC,OAAO,CAAC,OAAO,CAAC,GAAG,mCACd,UAAU,KACb,SAAS,EAAE,CAAC,QAAQ,CAAC,EACrB,OAAO,kCACF,UAAU,CAAC,OAAO,KACrB,SAAS,EAAE,IAAI,KAEjB,cAAc,EAAE,UAAU,CAAC,cAAc,GAC1C,CAAC;QAEF,+BAA+B;QAC/B,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;QAE5B,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAE/D,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AAED,SAAe,uBAAuB,CACpC,IAAU,EACV,OAAyB;;QAEzB,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;YAChD,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,aAAa,EAAE;gBACb,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC;aAC5D;YACD,kBAAkB,EAAE,CAAC,GAAG,OAAO,CAAC,WAAW,UAAU,CAAC;YACtD,cAAc,EAAE,MAAM;YACtB,UAAU,EAAE,IAAI;YAChB,uBAAuB,EAAE,KAAK;SAC/B,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AAED,SAAsB,mBAAmB,CAAC,IAAU,EAAE,MAAc;;QAClE,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QACxC,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/C,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACxB,KAAK,CAAC,IAAI,CAAC,MAAM,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;QAEzC,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,IAAI,EAAE;YAClC,KAAK,CAAC,IAAI,CACR,MAAM,uBAAuB,CAAC,IAAI,oBAC7B,OAAO,EACV,CACH,CAAC;SACH;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AArBD,kDAqBC;AAED,kBAAe,mBAAmB,CAAC;AACtB,QAAA,mBAAmB,GAAG,IAAA,2BAAkB,EAAC,mBAAmB,CAAC,CAAC"}
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
|
|
2
2
|
import { Tree, readProjectConfiguration } from '@nx/devkit';
|
|
3
3
|
|
|
4
|
-
import
|
|
5
|
-
import { <%=
|
|
4
|
+
import { <%= generatorFnName %> } from './generator';
|
|
5
|
+
import { <%= schemaInterfaceName %> } from './schema';
|
|
6
6
|
|
|
7
7
|
describe('<%= name %> generator', () => {
|
|
8
8
|
let tree: Tree;
|
|
9
|
-
const options: <%=
|
|
9
|
+
const options: <%= schemaInterfaceName %> = { name: 'test' };
|
|
10
10
|
|
|
11
11
|
beforeEach(() => {
|
|
12
12
|
tree = createTreeWithEmptyWorkspace();
|
|
13
13
|
});
|
|
14
14
|
|
|
15
15
|
it('should run successfully', async () => {
|
|
16
|
-
await
|
|
16
|
+
await <%= generatorFnName %>(tree, options);
|
|
17
17
|
const config = readProjectConfiguration(tree, 'test');
|
|
18
18
|
expect(config).toBeDefined();
|
|
19
19
|
});
|
|
@@ -7,7 +7,7 @@ import {
|
|
|
7
7
|
import * as path from 'path';
|
|
8
8
|
import { <%= className %>GeneratorSchema } from './schema';
|
|
9
9
|
|
|
10
|
-
export
|
|
10
|
+
export async function <%= generatorFnName %> (tree: Tree, options: <%= schemaInterfaceName %>) {
|
|
11
11
|
const projectRoot = `libs/${options.name}`;
|
|
12
12
|
addProjectConfiguration(
|
|
13
13
|
tree,
|
|
@@ -22,3 +22,5 @@ export default async function (tree: Tree, options: <%= className %>GeneratorSch
|
|
|
22
22
|
generateFiles(tree, path.join(__dirname, 'files'), projectRoot, options);
|
|
23
23
|
await formatFiles(tree);
|
|
24
24
|
}
|
|
25
|
+
|
|
26
|
+
export default <%= generatorFnName %>;
|
|
@@ -8,7 +8,6 @@ const has_generator_1 = require("../../utils/has-generator");
|
|
|
8
8
|
const generator_1 = require("../lint-checks/generator");
|
|
9
9
|
function normalizeOptions(host, options) {
|
|
10
10
|
const { npmScope } = (0, devkit_1.getWorkspaceLayout)(host);
|
|
11
|
-
const { fileName, className } = (0, devkit_1.names)(options.name);
|
|
12
11
|
const { root: projectRoot, sourceRoot: projectSourceRoot } = (0, devkit_1.readProjectConfiguration)(host, options.project);
|
|
13
12
|
const npmPackageName = (0, devkit_1.readJson)(host, path.join(projectRoot, 'package.json')).name;
|
|
14
13
|
let description;
|
|
@@ -18,9 +17,7 @@ function normalizeOptions(host, options) {
|
|
|
18
17
|
else {
|
|
19
18
|
description = `${options.name} generator`;
|
|
20
19
|
}
|
|
21
|
-
return Object.assign(Object.assign({}, options), {
|
|
22
|
-
className,
|
|
23
|
-
description,
|
|
20
|
+
return Object.assign(Object.assign(Object.assign({}, options), (0, devkit_1.names)(options.name)), { description,
|
|
24
21
|
projectRoot,
|
|
25
22
|
projectSourceRoot,
|
|
26
23
|
npmScope,
|
|
@@ -31,7 +28,7 @@ function addFiles(host, options) {
|
|
|
31
28
|
if (!host.exists(indexPath)) {
|
|
32
29
|
host.write(indexPath, 'const variable = "<%= name %>";');
|
|
33
30
|
}
|
|
34
|
-
(0, devkit_1.generateFiles)(host, path.join(__dirname, './files/generator'), `${options.projectSourceRoot}/generators`, options);
|
|
31
|
+
(0, devkit_1.generateFiles)(host, path.join(__dirname, './files/generator'), `${options.projectSourceRoot}/generators`, Object.assign(Object.assign({}, options), { generatorFnName: `${options.propertyName}Generator`, schemaInterfaceName: `${options.className}GeneratorSchema` }));
|
|
35
32
|
if (options.unitTestRunner === 'none') {
|
|
36
33
|
host.delete(path.join(options.projectSourceRoot, 'generators', options.fileName, `generator.spec.ts`));
|
|
37
34
|
}
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/generator/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.normalizeOptions = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
|
|
5
6
|
function normalizeOptions(host, options) {
|
|
6
7
|
var _a, _b;
|
|
7
8
|
const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
|
|
8
|
-
const {
|
|
9
|
+
const { libsDir: defaultLibsDir } = (0, devkit_1.getWorkspaceLayout)(host);
|
|
9
10
|
const libsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : defaultLibsDir;
|
|
10
11
|
const name = (0, devkit_1.names)(options.name).fileName;
|
|
11
12
|
const fullProjectDirectory = projectDirectory
|
|
@@ -23,9 +24,8 @@ function normalizeOptions(host, options) {
|
|
|
23
24
|
const parsedTags = options.tags
|
|
24
25
|
? options.tags.split(',').map((s) => s.trim())
|
|
25
26
|
: [];
|
|
26
|
-
const npmPackageName = options.importPath || (0,
|
|
27
|
+
const npmPackageName = options.importPath || (0, get_import_path_1.getImportPath)(host, name);
|
|
27
28
|
return Object.assign(Object.assign({}, options), { bundler: (_a = options.compiler) !== null && _a !== void 0 ? _a : 'tsc', fileName,
|
|
28
|
-
npmScope,
|
|
29
29
|
libsDir, name: projectName, projectRoot, projectDirectory: fullProjectDirectory, parsedTags,
|
|
30
30
|
npmPackageName, publishable: (_b = options.publishable) !== null && _b !== void 0 ? _b : false });
|
|
31
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-schema.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/src/generators/plugin/utils/normalize-schema.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"normalize-schema.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/src/generators/plugin/utils/normalize-schema.ts"],"names":[],"mappings":";;;AAAA,uCAMoB;AAEpB,sEAAiE;AAajE,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,OAAO,EAAE,cAAc,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAC7D,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,+BAAa,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAEvE,uCACK,OAAO,KACV,OAAO,EAAE,MAAA,OAAO,CAAC,QAAQ,mCAAI,KAAK,EAClC,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;AA1CD,4CA0CC"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
|
|
6
|
+
function replaceE2EExecutor(tree) {
|
|
7
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
+
const projects = (0, devkit_1.getProjects)(tree);
|
|
9
|
+
for (const executor of ['@nx/plugin:e2e', '@nrwl/nx-plugin:e2e']) {
|
|
10
|
+
(0, executor_options_utils_1.forEachExecutorOptions)(tree, executor, (options, project, target, configuration) => {
|
|
11
|
+
var _a;
|
|
12
|
+
const projectConfiguration = projects.get(project);
|
|
13
|
+
const config = Object.assign(Object.assign({}, options), { target: undefined, runInBand: true });
|
|
14
|
+
if (configuration) {
|
|
15
|
+
projectConfiguration.targets[target].configurations[configuration] =
|
|
16
|
+
config;
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
projectConfiguration.targets[target].dependsOn = [
|
|
20
|
+
...((_a = projectConfiguration.targets[target].dependsOn) !== null && _a !== void 0 ? _a : []),
|
|
21
|
+
options.target,
|
|
22
|
+
];
|
|
23
|
+
projectConfiguration.targets[target].executor = '@nx/jest:jest';
|
|
24
|
+
projectConfiguration.targets[target].options = config;
|
|
25
|
+
}
|
|
26
|
+
(0, devkit_1.updateProjectConfiguration)(tree, project, projectConfiguration);
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
exports.default = replaceE2EExecutor;
|
|
33
|
+
//# sourceMappingURL=replace-e2e-executor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"replace-e2e-executor.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/migrations/update-16-2-0/replace-e2e-executor.ts"],"names":[],"mappings":";;;AAAA,uCAKoB;AACpB,6FAA0F;AAG1F,SAA8B,kBAAkB,CAAC,IAAU;;QACzD,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,KAAK,MAAM,QAAQ,IAAI,CAAC,gBAAgB,EAAE,qBAAqB,CAAC,EAAE;YAChE,IAAA,+CAAsB,EACpB,IAAI,EACJ,QAAQ,EACR,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE;;gBAC1C,MAAM,oBAAoB,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAEnD,MAAM,MAAM,mCACP,OAAO,KACV,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,IAAI,GAChB,CAAC;gBACF,IAAI,aAAa,EAAE;oBACjB,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,aAAa,CAAC;wBAChE,MAAM,CAAC;iBACV;qBAAM;oBACL,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,GAAG;wBAC/C,GAAG,CAAC,MAAA,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,mCAAI,EAAE,CAAC;wBACzD,OAAO,CAAC,MAAM;qBACf,CAAC;oBACF,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,GAAG,eAAe,CAAC;oBAChE,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,GAAG,MAAM,CAAC;iBACvD;gBAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC;YAClE,CAAC,CACF,CAAC;SACH;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAhCD,qCAgCC"}
|