@nrwl/nx-plugin 13.1.2 → 13.2.0-beta.3
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/README.md +1 -1
- package/package.json +6 -6
- package/src/executors/e2e/compat.js +1 -1
- package/src/executors/e2e/compat.js.map +1 -1
- package/src/executors/e2e/e2e.impl.js +13 -13
- package/src/executors/e2e/e2e.impl.js.map +1 -1
- package/src/generators/e2e-project/e2e.js +12 -12
- package/src/generators/e2e-project/e2e.js.map +1 -1
- package/src/generators/executor/executor.js +7 -7
- package/src/generators/executor/executor.js.map +1 -1
- package/src/generators/generator/generator.js +7 -7
- package/src/generators/generator/generator.js.map +1 -1
- package/src/generators/migration/migration.js +11 -11
- package/src/generators/migration/migration.js.map +1 -1
- package/src/generators/plugin/plugin.js +18 -18
- package/src/generators/plugin/plugin.js.map +1 -1
- package/src/migrations/update-10-2-0/update-10-2-0.js +4 -4
- package/src/migrations/update-10-2-0/update-10-2-0.js.map +1 -1
- package/src/migrations/update-11-0-0/rename-ng-update-into-nx-migrate.js +2 -2
- package/src/migrations/update-11-0-0/rename-ng-update-into-nx-migrate.js.map +1 -1
- package/src/migrations/update-11-0-0/update-schema-version-for-executors-and-generators.js +4 -4
- package/src/migrations/update-11-0-0/update-schema-version-for-executors-and-generators.js.map +1 -1
- package/src/utils/testing-utils/async-commands.js +3 -3
- package/src/utils/testing-utils/async-commands.js.map +1 -1
- package/src/utils/testing-utils/commands.js +5 -5
- package/src/utils/testing-utils/commands.js.map +1 -1
- package/src/utils/testing-utils/index.js +5 -5
- package/src/utils/testing-utils/index.js.map +1 -1
- package/src/utils/testing-utils/nx-project.js +9 -9
- package/src/utils/testing-utils/nx-project.js.map +1 -1
- package/src/utils/testing-utils/utils.js +17 -17
- package/src/utils/testing-utils/utils.js.map +1 -1
- package/src/utils/versions.js +1 -1
- package/testing.js +1 -1
- package/testing.js.map +1 -1
package/README.md
CHANGED
|
@@ -114,6 +114,6 @@ Even though Nx isn't technology specific, we provide 3 separate flavours of the
|
|
|
114
114
|
|
|
115
115
|
# Engage with the Core Team and the Community
|
|
116
116
|
|
|
117
|
-
- [Nx
|
|
117
|
+
- [The Nx Show Playlist on YouTube](https://www.youtube.com/playlist?list=PLakNactNC1dE8KLQ5zd3fQwu_yQHjTmR5). It's a regular YouTube stream where we talk all things Nx. Join the stream, ask questions, etc.
|
|
118
118
|
- [Follow Nx on Twitter](https://twitter.com/NxDevTools)
|
|
119
119
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/nx-plugin",
|
|
3
|
-
"version": "13.
|
|
3
|
+
"version": "13.2.0-beta.3",
|
|
4
4
|
"description": "Plugin for creating plugins for Nx :)",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -27,13 +27,13 @@
|
|
|
27
27
|
"migrations": "./migrations.json"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@nrwl/devkit": "13.
|
|
31
|
-
"@nrwl/jest": "13.
|
|
32
|
-
"@nrwl/linter": "13.
|
|
33
|
-
"@nrwl/node": "13.
|
|
30
|
+
"@nrwl/devkit": "13.2.0-beta.3",
|
|
31
|
+
"@nrwl/jest": "13.2.0-beta.3",
|
|
32
|
+
"@nrwl/linter": "13.2.0-beta.3",
|
|
33
|
+
"@nrwl/node": "13.2.0-beta.3",
|
|
34
34
|
"fs-extra": "^9.1.0",
|
|
35
35
|
"rxjs": "^6.5.4",
|
|
36
|
-
"tslib": "^2.
|
|
36
|
+
"tslib": "^2.3.0",
|
|
37
37
|
"yargs": "15.4.1"
|
|
38
38
|
},
|
|
39
39
|
"typings": "./index.d.ts"
|
|
@@ -3,5 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.nxPluginE2EBuilder = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const e2e_impl_1 = require("./e2e.impl");
|
|
6
|
-
exports.nxPluginE2EBuilder = devkit_1.convertNxExecutor(e2e_impl_1.nxPluginE2EExecutor);
|
|
6
|
+
exports.nxPluginE2EBuilder = (0, devkit_1.convertNxExecutor)(e2e_impl_1.nxPluginE2EExecutor);
|
|
7
7
|
//# sourceMappingURL=compat.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/executors/e2e/compat.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AACjD,yCAAiD;AAEpC,QAAA,kBAAkB,GAAG,0BAAiB,
|
|
1
|
+
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/executors/e2e/compat.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AACjD,yCAAiD;AAEpC,QAAA,kBAAkB,GAAG,IAAA,0BAAiB,EAAC,8BAAmB,CAAC,CAAC"}
|
|
@@ -6,14 +6,14 @@ require("dotenv/config");
|
|
|
6
6
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
7
|
const jest_impl_1 = require("@nrwl/jest/src/executors/jest/jest.impl");
|
|
8
8
|
function nxPluginE2EExecutor(options, context) {
|
|
9
|
-
return tslib_1.__asyncGenerator(this, arguments, function* nxPluginE2EExecutor_1() {
|
|
9
|
+
return (0, tslib_1.__asyncGenerator)(this, arguments, function* nxPluginE2EExecutor_1() {
|
|
10
10
|
var e_1, _a;
|
|
11
11
|
let success;
|
|
12
12
|
try {
|
|
13
|
-
for (var _b = tslib_1.__asyncValues(runBuildTarget(options.target, context)), _c; _c = yield tslib_1.__await(_b.next()), !_c.done;) {
|
|
13
|
+
for (var _b = (0, tslib_1.__asyncValues)(runBuildTarget(options.target, context)), _c; _c = yield (0, tslib_1.__await)(_b.next()), !_c.done;) {
|
|
14
14
|
const _ = _c.value;
|
|
15
15
|
try {
|
|
16
|
-
success = yield tslib_1.__await(runTests(options.jestConfig, context));
|
|
16
|
+
success = yield (0, tslib_1.__await)(runTests(options.jestConfig, context));
|
|
17
17
|
}
|
|
18
18
|
catch (e) {
|
|
19
19
|
devkit_1.logger.error(e.message);
|
|
@@ -24,40 +24,40 @@ function nxPluginE2EExecutor(options, context) {
|
|
|
24
24
|
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
25
25
|
finally {
|
|
26
26
|
try {
|
|
27
|
-
if (_c && !_c.done && (_a = _b.return)) yield tslib_1.__await(_a.call(_b));
|
|
27
|
+
if (_c && !_c.done && (_a = _b.return)) yield (0, tslib_1.__await)(_a.call(_b));
|
|
28
28
|
}
|
|
29
29
|
finally { if (e_1) throw e_1.error; }
|
|
30
30
|
}
|
|
31
|
-
return yield tslib_1.__await({ success });
|
|
31
|
+
return yield (0, tslib_1.__await)({ success });
|
|
32
32
|
});
|
|
33
33
|
}
|
|
34
34
|
exports.nxPluginE2EExecutor = nxPluginE2EExecutor;
|
|
35
35
|
function runBuildTarget(buildTarget, context) {
|
|
36
|
-
return tslib_1.__asyncGenerator(this, arguments, function* runBuildTarget_1() {
|
|
36
|
+
return (0, tslib_1.__asyncGenerator)(this, arguments, function* runBuildTarget_1() {
|
|
37
37
|
var e_2, _a;
|
|
38
|
-
const { project, target, configuration } = devkit_1.parseTargetString(buildTarget);
|
|
39
|
-
const buildTargetOptions = devkit_1.readTargetOptions({ project, target, configuration }, context);
|
|
38
|
+
const { project, target, configuration } = (0, devkit_1.parseTargetString)(buildTarget);
|
|
39
|
+
const buildTargetOptions = (0, devkit_1.readTargetOptions)({ project, target, configuration }, context);
|
|
40
40
|
const targetSupportsWatch = Object.keys(buildTargetOptions).includes('watch');
|
|
41
41
|
try {
|
|
42
|
-
for (var _b = tslib_1.__asyncValues(yield tslib_1.__await(devkit_1.runExecutor({ project, target, configuration }, targetSupportsWatch ? { watch: false } : {}, context))), _c; _c = yield tslib_1.__await(_b.next()), !_c.done;) {
|
|
42
|
+
for (var _b = (0, tslib_1.__asyncValues)(yield (0, tslib_1.__await)((0, devkit_1.runExecutor)({ project, target, configuration }, targetSupportsWatch ? { watch: false } : {}, context))), _c; _c = yield (0, tslib_1.__await)(_b.next()), !_c.done;) {
|
|
43
43
|
const output = _c.value;
|
|
44
44
|
if (!output.success)
|
|
45
45
|
throw new Error('Could not compile application files.');
|
|
46
|
-
yield yield tslib_1.__await(output.success);
|
|
46
|
+
yield yield (0, tslib_1.__await)(output.success);
|
|
47
47
|
}
|
|
48
48
|
}
|
|
49
49
|
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
50
50
|
finally {
|
|
51
51
|
try {
|
|
52
|
-
if (_c && !_c.done && (_a = _b.return)) yield tslib_1.__await(_a.call(_b));
|
|
52
|
+
if (_c && !_c.done && (_a = _b.return)) yield (0, tslib_1.__await)(_a.call(_b));
|
|
53
53
|
}
|
|
54
54
|
finally { if (e_2) throw e_2.error; }
|
|
55
55
|
}
|
|
56
56
|
});
|
|
57
57
|
}
|
|
58
58
|
function runTests(jestConfig, context) {
|
|
59
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
60
|
-
const { success } = yield jest_impl_1.jestExecutor({ jestConfig, watch: false }, context);
|
|
59
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
60
|
+
const { success } = yield (0, jest_impl_1.jestExecutor)({ jestConfig, watch: false }, context);
|
|
61
61
|
return success;
|
|
62
62
|
});
|
|
63
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"e2e.impl.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/executors/e2e/e2e.impl.ts"],"names":[],"mappings":";;;;AAAA,yBAAuB;AAIvB,yCAMsB;AACtB,uEAAuE;AAGvE,SAAuB,mBAAmB,CACxC,OAAmC,EACnC,OAAwB;;;QAExB,IAAI,OAAgB,CAAC;;YACrB,KAAsB,IAAA,KAAA,
|
|
1
|
+
{"version":3,"file":"e2e.impl.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/executors/e2e/e2e.impl.ts"],"names":[],"mappings":";;;;AAAA,yBAAuB;AAIvB,yCAMsB;AACtB,uEAAuE;AAGvE,SAAuB,mBAAmB,CACxC,OAAmC,EACnC,OAAwB;;;QAExB,IAAI,OAAgB,CAAC;;YACrB,KAAsB,IAAA,KAAA,2BAAA,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA,IAAA;gBAAlD,MAAM,CAAC,WAAA,CAAA;gBAChB,IAAI;oBACF,OAAO,GAAG,2BAAM,QAAQ,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA,CAAC;iBACvD;gBAAC,OAAO,CAAC,EAAE;oBACV,eAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;oBACxB,OAAO,GAAG,KAAK,CAAC;iBACjB;aACF;;;;;;;;;QAED,kCAAO,EAAE,OAAO,EAAE,EAAC;IACrB,CAAC;CAAA;AAfD,kDAeC;AAED,SAAgB,cAAc,CAC5B,WAAmB,EACnB,OAAwB;;;QAExB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,0BAAiB,EAAC,WAAW,CAAC,CAAC;QAC1E,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,IAAA,KAAA,2BAAA,2BAAM,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;gBAJU,MAAM,MAAM,WAAA,CAAA;gBAKrB,IAAI,CAAC,MAAM,CAAC,OAAO;oBACjB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;gBAC1D,iCAAM,MAAM,CAAC,OAAO,CAAA,CAAC;aACtB;;;;;;;;;IACH,CAAC;CAAA;AAED,SAAe,QAAQ,CACrB,UAAkB,EAClB,OAAwB;;QAExB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,wBAAY,EAAC,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC;QAE9E,OAAO,OAAO,CAAC;IACjB,CAAC;CAAA;AAED,kBAAe,mBAAmB,CAAC"}
|
|
@@ -6,12 +6,12 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
const path = require("path");
|
|
7
7
|
const jest_1 = require("@nrwl/jest");
|
|
8
8
|
function normalizeOptions(host, options) {
|
|
9
|
-
const { npmScope, appsDir } = devkit_1.getWorkspaceLayout(host);
|
|
9
|
+
const { npmScope, appsDir } = (0, devkit_1.getWorkspaceLayout)(host);
|
|
10
10
|
const projectName = `${options.pluginName}-e2e`;
|
|
11
11
|
const projectRoot = options.projectDirectory
|
|
12
12
|
? path.join(appsDir, `${options.projectDirectory}-e2e`)
|
|
13
13
|
: path.join(appsDir, projectName);
|
|
14
|
-
const pluginPropertyName = devkit_1.names(options.pluginName).propertyName;
|
|
14
|
+
const pluginPropertyName = (0, devkit_1.names)(options.pluginName).propertyName;
|
|
15
15
|
return Object.assign(Object.assign({}, options), { projectName,
|
|
16
16
|
pluginPropertyName,
|
|
17
17
|
projectRoot,
|
|
@@ -19,17 +19,17 @@ function normalizeOptions(host, options) {
|
|
|
19
19
|
}
|
|
20
20
|
function validatePlugin(host, pluginName) {
|
|
21
21
|
try {
|
|
22
|
-
devkit_1.readProjectConfiguration(host, pluginName);
|
|
22
|
+
(0, devkit_1.readProjectConfiguration)(host, pluginName);
|
|
23
23
|
}
|
|
24
24
|
catch (_a) {
|
|
25
25
|
throw new Error(`Project name "${pluginName}" doesn't not exist.`);
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
function addFiles(host, options) {
|
|
29
|
-
devkit_1.generateFiles(host, path.join(__dirname, './files'), options.projectRoot, Object.assign(Object.assign({}, options), { tmpl: '', offsetFromRoot: devkit_1.offsetFromRoot(options.projectRoot) }));
|
|
29
|
+
(0, devkit_1.generateFiles)(host, path.join(__dirname, './files'), options.projectRoot, Object.assign(Object.assign({}, options), { tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot) }));
|
|
30
30
|
}
|
|
31
31
|
function updateWorkspaceConfiguration(host, options) {
|
|
32
|
-
devkit_1.addProjectConfiguration(host, options.projectName, {
|
|
32
|
+
(0, devkit_1.addProjectConfiguration)(host, options.projectName, {
|
|
33
33
|
root: options.projectRoot,
|
|
34
34
|
projectType: 'application',
|
|
35
35
|
sourceRoot: `${options.projectRoot}/src`,
|
|
@@ -44,33 +44,33 @@ function updateWorkspaceConfiguration(host, options) {
|
|
|
44
44
|
}, options.standaloneConfig);
|
|
45
45
|
}
|
|
46
46
|
function addJest(host, options) {
|
|
47
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
48
|
-
yield jest_1.jestProjectGenerator(host, {
|
|
47
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
48
|
+
yield (0, jest_1.jestProjectGenerator)(host, {
|
|
49
49
|
project: options.projectName,
|
|
50
50
|
setupFile: 'none',
|
|
51
51
|
supportTsx: false,
|
|
52
52
|
skipSerializers: true,
|
|
53
53
|
});
|
|
54
|
-
const project = devkit_1.readProjectConfiguration(host, options.projectName);
|
|
54
|
+
const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
|
|
55
55
|
const testOptions = project.targets.test.options;
|
|
56
56
|
const e2eOptions = project.targets.e2e.options;
|
|
57
57
|
project.targets.e2e.options = Object.assign(Object.assign({}, e2eOptions), { jestConfig: testOptions.jestConfig });
|
|
58
58
|
// remove the jest build target
|
|
59
59
|
delete project.targets.test;
|
|
60
|
-
devkit_1.updateProjectConfiguration(host, options.projectName, project);
|
|
60
|
+
(0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);
|
|
61
61
|
});
|
|
62
62
|
}
|
|
63
63
|
function e2eProjectGenerator(host, schema) {
|
|
64
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
64
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
65
65
|
validatePlugin(host, schema.pluginName);
|
|
66
66
|
const options = normalizeOptions(host, schema);
|
|
67
67
|
addFiles(host, options);
|
|
68
68
|
updateWorkspaceConfiguration(host, options);
|
|
69
69
|
yield addJest(host, options);
|
|
70
|
-
yield devkit_1.formatFiles(host);
|
|
70
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
71
71
|
});
|
|
72
72
|
}
|
|
73
73
|
exports.e2eProjectGenerator = e2eProjectGenerator;
|
|
74
74
|
exports.default = e2eProjectGenerator;
|
|
75
|
-
exports.e2eProjectSchematic = devkit_1.convertNxGenerator(e2eProjectGenerator);
|
|
75
|
+
exports.e2eProjectSchematic = (0, devkit_1.convertNxGenerator)(e2eProjectGenerator);
|
|
76
76
|
//# sourceMappingURL=e2e.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"e2e.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/e2e-project/e2e.ts"],"names":[],"mappings":";;;;AAAA,yCAUsB;AAGtB,6BAA6B;AAC7B,qCAAkD;AASlD,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;IACnD,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,2BAAkB,
|
|
1
|
+
{"version":3,"file":"e2e.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/e2e-project/e2e.ts"],"names":[],"mappings":";;;;AAAA,yCAUsB;AAGtB,6BAA6B;AAC7B,qCAAkD;AASlD,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;IACnD,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAEvD,MAAM,WAAW,GAAG,GAAG,OAAO,CAAC,UAAU,MAAM,CAAC;IAChD,MAAM,WAAW,GAAG,OAAO,CAAC,gBAAgB;QAC1C,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,gBAAgB,MAAM,CAAC;QACvD,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACpC,MAAM,kBAAkB,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC,YAAY,CAAC;IAElE,uCACK,OAAO,KACV,WAAW;QACX,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,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,IACnD,CAAC;AACL,CAAC;AAED,SAAS,4BAA4B,CAAC,IAAU,EAAE,OAAyB;IACzE,IAAA,gCAAuB,EACrB,IAAI,EACJ,OAAO,CAAC,WAAW,EACnB;QACE,IAAI,EAAE,OAAO,CAAC,WAAW;QACzB,WAAW,EAAE,aAAa;QAC1B,UAAU,EAAE,GAAG,OAAO,CAAC,WAAW,MAAM;QACxC,OAAO,EAAE;YACP,GAAG,EAAE;gBACH,QAAQ,EAAE,qBAAqB;gBAC/B,OAAO,EAAE,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,QAAQ,EAAE;aACnD;SACF;QACD,IAAI,EAAE,EAAE;QACR,oBAAoB,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC;KAC3C,EACD,OAAO,CAAC,gBAAgB,CACzB,CAAC;AACJ,CAAC;AAED,SAAe,OAAO,CAAC,IAAU,EAAE,OAAyB;;QAC1D,MAAM,IAAA,2BAAoB,EAAC,IAAI,EAAE;YAC/B,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,SAAS,EAAE,MAAM;YACjB,UAAU,EAAE,KAAK;YACjB,eAAe,EAAE,IAAI;SACtB,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACpE,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;QACjD,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;QAC/C,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,mCACtB,UAAU,KACb,UAAU,EAAE,WAAW,CAAC,UAAU,GACnC,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;IACjE,CAAC;CAAA;AAED,SAAsB,mBAAmB,CAAC,IAAU,EAAE,MAAc;;QAClE,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,4BAA4B,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5C,MAAM,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE7B,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AARD,kDAQC;AAED,kBAAe,mBAAmB,CAAC;AACtB,QAAA,mBAAmB,GAAG,IAAA,2BAAkB,EAAC,mBAAmB,CAAC,CAAC"}
|
|
@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const path = require("path");
|
|
7
7
|
function addFiles(host, options) {
|
|
8
|
-
devkit_1.generateFiles(host, path.join(__dirname, './files/executor'), `${options.projectSourceRoot}/executors`, Object.assign(Object.assign({}, options), { tmpl: '' }));
|
|
8
|
+
(0, devkit_1.generateFiles)(host, path.join(__dirname, './files/executor'), `${options.projectSourceRoot}/executors`, Object.assign(Object.assign({}, options), { tmpl: '' }));
|
|
9
9
|
if (options.unitTestRunner === 'none') {
|
|
10
10
|
host.delete(path.join(options.projectSourceRoot, 'executors', options.fileName, `executor.spec.ts`));
|
|
11
11
|
}
|
|
@@ -18,7 +18,7 @@ function updateExecutorJson(host, options) {
|
|
|
18
18
|
else {
|
|
19
19
|
executorPath = path.join(options.projectRoot, 'builders.json');
|
|
20
20
|
}
|
|
21
|
-
return devkit_1.updateJson(host, executorPath, (json) => {
|
|
21
|
+
return (0, devkit_1.updateJson)(host, executorPath, (json) => {
|
|
22
22
|
var _a;
|
|
23
23
|
let executors = (_a = json.executors) !== null && _a !== void 0 ? _a : json.builders;
|
|
24
24
|
executors || (executors = {});
|
|
@@ -32,9 +32,9 @@ function updateExecutorJson(host, options) {
|
|
|
32
32
|
});
|
|
33
33
|
}
|
|
34
34
|
function normalizeOptions(host, options) {
|
|
35
|
-
const { npmScope } = devkit_1.getWorkspaceLayout(host);
|
|
36
|
-
const { fileName, className } = devkit_1.names(options.name);
|
|
37
|
-
const { root: projectRoot, sourceRoot: projectSourceRoot } = devkit_1.readProjectConfiguration(host, options.project);
|
|
35
|
+
const { npmScope } = (0, devkit_1.getWorkspaceLayout)(host);
|
|
36
|
+
const { fileName, className } = (0, devkit_1.names)(options.name);
|
|
37
|
+
const { root: projectRoot, sourceRoot: projectSourceRoot } = (0, devkit_1.readProjectConfiguration)(host, options.project);
|
|
38
38
|
let description;
|
|
39
39
|
if (options.description) {
|
|
40
40
|
description = options.description;
|
|
@@ -50,7 +50,7 @@ function normalizeOptions(host, options) {
|
|
|
50
50
|
npmScope });
|
|
51
51
|
}
|
|
52
52
|
function executorGenerator(host, schema) {
|
|
53
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
53
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
54
54
|
const options = normalizeOptions(host, schema);
|
|
55
55
|
addFiles(host, options);
|
|
56
56
|
updateExecutorJson(host, options);
|
|
@@ -58,5 +58,5 @@ function executorGenerator(host, schema) {
|
|
|
58
58
|
}
|
|
59
59
|
exports.executorGenerator = executorGenerator;
|
|
60
60
|
exports.default = executorGenerator;
|
|
61
|
-
exports.executorSchematic = devkit_1.convertNxGenerator(executorGenerator);
|
|
61
|
+
exports.executorSchematic = (0, devkit_1.convertNxGenerator)(executorGenerator);
|
|
62
62
|
//# sourceMappingURL=executor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/executor/executor.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AAGtB,6BAA6B;AAU7B,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,sBAAa,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/executor/executor.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AAGtB,6BAA6B;AAU7B,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC,EACxC,GAAG,OAAO,CAAC,iBAAiB,YAAY,kCAEnC,OAAO,KACV,IAAI,EAAE,EAAE,IAEX,CAAC;IAEF,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;QACrC,IAAI,CAAC,MAAM,CACT,IAAI,CAAC,IAAI,CACP,OAAO,CAAC,iBAAiB,EACzB,WAAW,EACX,OAAO,CAAC,QAAQ,EAChB,kBAAkB,CACnB,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAU,EAAE,OAAyB;IAC/D,IAAI,YAAoB,CAAC;IACzB,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC,EAAE;QACjE,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;KACjE;SAAM;QACL,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;KAChE;IAED,OAAO,IAAA,mBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;;QAC7C,IAAI,SAAS,GAAG,MAAA,IAAI,CAAC,SAAS,mCAAI,IAAI,CAAC,QAAQ,CAAC;QAChD,SAAS,KAAT,SAAS,GAAK,EAAE,EAAC;QACjB,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG;YACxB,cAAc,EAAE,mBAAmB,OAAO,CAAC,IAAI,WAAW;YAC1D,MAAM,EAAE,mBAAmB,OAAO,CAAC,IAAI,cAAc;YACrD,WAAW,EAAE,OAAO,CAAC,WAAW;SACjC,CAAC;QACF,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAE3B,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,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,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,WAAW,CAAC;KAC1C;IAED,uCACK,OAAO,KACV,QAAQ;QACR,SAAS;QACT,WAAW;QACX,WAAW;QACX,iBAAiB;QACjB,QAAQ,IACR;AACJ,CAAC;AAED,SAAsB,iBAAiB,CAAC,IAAU,EAAE,MAAc;;QAChE,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAExB,kBAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpC,CAAC;CAAA;AAND,8CAMC;AAED,kBAAe,iBAAiB,CAAC;AACpB,QAAA,iBAAiB,GAAG,IAAA,2BAAkB,EAAC,iBAAiB,CAAC,CAAC"}
|
|
@@ -5,9 +5,9 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const path = require("path");
|
|
7
7
|
function normalizeOptions(host, options) {
|
|
8
|
-
const { npmScope } = devkit_1.getWorkspaceLayout(host);
|
|
9
|
-
const { fileName, className } = devkit_1.names(options.name);
|
|
10
|
-
const { root: projectRoot, sourceRoot: projectSourceRoot } = devkit_1.readProjectConfiguration(host, options.project);
|
|
8
|
+
const { npmScope } = (0, devkit_1.getWorkspaceLayout)(host);
|
|
9
|
+
const { fileName, className } = (0, devkit_1.names)(options.name);
|
|
10
|
+
const { root: projectRoot, sourceRoot: projectSourceRoot } = (0, devkit_1.readProjectConfiguration)(host, options.project);
|
|
11
11
|
const npmPackageName = `@${npmScope}/${options.project}`;
|
|
12
12
|
let description;
|
|
13
13
|
if (options.description) {
|
|
@@ -29,7 +29,7 @@ function addFiles(host, options) {
|
|
|
29
29
|
if (!host.exists(indexPath)) {
|
|
30
30
|
host.write(indexPath, 'const variable = "<%= projectName %>";');
|
|
31
31
|
}
|
|
32
|
-
devkit_1.generateFiles(host, path.join(__dirname, './files/generator'), `${options.projectSourceRoot}/generators`, Object.assign(Object.assign({}, options), { tmpl: '' }));
|
|
32
|
+
(0, devkit_1.generateFiles)(host, path.join(__dirname, './files/generator'), `${options.projectSourceRoot}/generators`, Object.assign(Object.assign({}, options), { tmpl: '' }));
|
|
33
33
|
if (options.unitTestRunner === 'none') {
|
|
34
34
|
host.delete(path.join(options.projectSourceRoot, 'generators', options.fileName, `generator.spec.ts`));
|
|
35
35
|
}
|
|
@@ -42,7 +42,7 @@ function updateGeneratorJson(host, options) {
|
|
|
42
42
|
else {
|
|
43
43
|
generatorPath = path.join(options.projectRoot, 'collection.json');
|
|
44
44
|
}
|
|
45
|
-
return devkit_1.updateJson(host, generatorPath, (json) => {
|
|
45
|
+
return (0, devkit_1.updateJson)(host, generatorPath, (json) => {
|
|
46
46
|
var _a;
|
|
47
47
|
let generators = (_a = json.generators) !== null && _a !== void 0 ? _a : json.schematics;
|
|
48
48
|
generators = generators || {};
|
|
@@ -56,7 +56,7 @@ function updateGeneratorJson(host, options) {
|
|
|
56
56
|
});
|
|
57
57
|
}
|
|
58
58
|
function generatorGenerator(host, schema) {
|
|
59
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
59
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
60
60
|
const options = normalizeOptions(host, schema);
|
|
61
61
|
addFiles(host, options);
|
|
62
62
|
updateGeneratorJson(host, options);
|
|
@@ -64,5 +64,5 @@ function generatorGenerator(host, schema) {
|
|
|
64
64
|
}
|
|
65
65
|
exports.generatorGenerator = generatorGenerator;
|
|
66
66
|
exports.default = generatorGenerator;
|
|
67
|
-
exports.generatorSchematic = devkit_1.convertNxGenerator(generatorGenerator);
|
|
67
|
+
exports.generatorSchematic = (0, devkit_1.convertNxGenerator)(generatorGenerator);
|
|
68
68
|
//# sourceMappingURL=generator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/generator/generator.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AAGtB,6BAA6B;AAW7B,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;IACnD,MAAM,EAAE,QAAQ,EAAE,GAAG,2BAAkB,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/generator/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,13 +8,13 @@ function normalizeOptions(host, options) {
|
|
|
8
8
|
var _a;
|
|
9
9
|
let name;
|
|
10
10
|
if (options.name) {
|
|
11
|
-
name = devkit_1.names(options.name).fileName;
|
|
11
|
+
name = (0, devkit_1.names)(options.name).fileName;
|
|
12
12
|
}
|
|
13
13
|
else {
|
|
14
|
-
name = devkit_1.names(`update-${options.version}`).fileName;
|
|
14
|
+
name = (0, devkit_1.names)(`update-${options.version}`).fileName;
|
|
15
15
|
}
|
|
16
16
|
const description = (_a = options.description) !== null && _a !== void 0 ? _a : name;
|
|
17
|
-
const { root: projectRoot, sourceRoot: projectSourceRoot } = devkit_1.readProjectConfiguration(host, options.project);
|
|
17
|
+
const { root: projectRoot, sourceRoot: projectSourceRoot } = (0, devkit_1.readProjectConfiguration)(host, options.project);
|
|
18
18
|
const normalized = Object.assign(Object.assign({}, options), { name,
|
|
19
19
|
description,
|
|
20
20
|
projectRoot,
|
|
@@ -22,13 +22,13 @@ function normalizeOptions(host, options) {
|
|
|
22
22
|
return normalized;
|
|
23
23
|
}
|
|
24
24
|
function addFiles(host, options) {
|
|
25
|
-
devkit_1.generateFiles(host, path.join(__dirname, 'files/migration'), `${options.projectSourceRoot}/migrations`, Object.assign(Object.assign({}, options), { tmpl: '' }));
|
|
25
|
+
(0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/migration'), `${options.projectSourceRoot}/migrations`, Object.assign(Object.assign({}, options), { tmpl: '' }));
|
|
26
26
|
}
|
|
27
27
|
function updateMigrationsJson(host, options) {
|
|
28
28
|
var _a, _b;
|
|
29
29
|
const migrationsPath = path.join(options.projectRoot, 'migrations.json');
|
|
30
30
|
const migrations = host.exists(migrationsPath)
|
|
31
|
-
? devkit_1.readJson(host, migrationsPath)
|
|
31
|
+
? (0, devkit_1.readJson)(host, migrationsPath)
|
|
32
32
|
: {};
|
|
33
33
|
if (migrations.schematics) {
|
|
34
34
|
migrations.generators = migrations.schematics;
|
|
@@ -52,10 +52,10 @@ function updateMigrationsJson(host, options) {
|
|
|
52
52
|
}
|
|
53
53
|
migrations.packageJsonUpdates = packageJsonUpdatesObj;
|
|
54
54
|
}
|
|
55
|
-
devkit_1.writeJson(host, migrationsPath, migrations);
|
|
55
|
+
(0, devkit_1.writeJson)(host, migrationsPath, migrations);
|
|
56
56
|
}
|
|
57
57
|
function updatePackageJson(host, options) {
|
|
58
|
-
devkit_1.updateJson(host, path.join(options.projectRoot, 'package.json'), (json) => {
|
|
58
|
+
(0, devkit_1.updateJson)(host, path.join(options.projectRoot, 'package.json'), (json) => {
|
|
59
59
|
if (!json['nx-migrations'] || !json['nx-migrations'].migrations) {
|
|
60
60
|
if (json['nx-migrations']) {
|
|
61
61
|
json['nx-migrations'].migrations = './migrations.json';
|
|
@@ -71,7 +71,7 @@ function updatePackageJson(host, options) {
|
|
|
71
71
|
}
|
|
72
72
|
function updateWorkspaceJson(host, options) {
|
|
73
73
|
var _a, _b;
|
|
74
|
-
const project = devkit_1.readProjectConfiguration(host, options.project);
|
|
74
|
+
const project = (0, devkit_1.readProjectConfiguration)(host, options.project);
|
|
75
75
|
const assets = (_b = (_a = project.targets.build) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.assets;
|
|
76
76
|
if (assets &&
|
|
77
77
|
assets.filter((a) => a.glob === 'migrations.json').length === 0) {
|
|
@@ -83,11 +83,11 @@ function updateWorkspaceJson(host, options) {
|
|
|
83
83
|
output: '.',
|
|
84
84
|
},
|
|
85
85
|
];
|
|
86
|
-
devkit_1.updateProjectConfiguration(host, options.project, project);
|
|
86
|
+
(0, devkit_1.updateProjectConfiguration)(host, options.project, project);
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
89
|
function migrationGenerator(host, schema) {
|
|
90
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
90
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
91
91
|
const options = normalizeOptions(host, schema);
|
|
92
92
|
addFiles(host, options);
|
|
93
93
|
updateMigrationsJson(host, options);
|
|
@@ -98,5 +98,5 @@ function migrationGenerator(host, schema) {
|
|
|
98
98
|
}
|
|
99
99
|
exports.migrationGenerator = migrationGenerator;
|
|
100
100
|
exports.default = migrationGenerator;
|
|
101
|
-
exports.migrationSchematic = devkit_1.convertNxGenerator(migrationGenerator);
|
|
101
|
+
exports.migrationSchematic = (0, devkit_1.convertNxGenerator)(migrationGenerator);
|
|
102
102
|
//# sourceMappingURL=migration.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migration.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/migration/migration.ts"],"names":[],"mappings":";;;;AAAA,yCASsB;AAGtB,6BAA6B;AAO7B,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IACnD,IAAI,IAAY,CAAC;IACjB,IAAI,OAAO,CAAC,IAAI,EAAE;QAChB,IAAI,GAAG,cAAK,
|
|
1
|
+
{"version":3,"file":"migration.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/migration/migration.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,14 +11,14 @@ const generator_1 = require("../generator/generator");
|
|
|
11
11
|
const executor_1 = require("../executor/executor");
|
|
12
12
|
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
13
13
|
function normalizeOptions(host, options) {
|
|
14
|
-
const { npmScope, libsDir } = devkit_1.getWorkspaceLayout(host);
|
|
15
|
-
const name = devkit_1.names(options.name).fileName;
|
|
14
|
+
const { npmScope, libsDir } = (0, devkit_1.getWorkspaceLayout)(host);
|
|
15
|
+
const name = (0, devkit_1.names)(options.name).fileName;
|
|
16
16
|
const projectDirectory = options.directory
|
|
17
|
-
? `${devkit_1.names(options.directory).fileName}/${name}`
|
|
17
|
+
? `${(0, devkit_1.names)(options.directory).fileName}/${name}`
|
|
18
18
|
: name;
|
|
19
19
|
const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');
|
|
20
20
|
const fileName = projectName;
|
|
21
|
-
const projectRoot = devkit_1.joinPathFragments(libsDir, projectDirectory);
|
|
21
|
+
const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, projectDirectory);
|
|
22
22
|
const parsedTags = options.tags
|
|
23
23
|
? options.tags.split(',').map((s) => s.trim())
|
|
24
24
|
: [];
|
|
@@ -31,15 +31,15 @@ function normalizeOptions(host, options) {
|
|
|
31
31
|
npmPackageName });
|
|
32
32
|
}
|
|
33
33
|
function addFiles(host, options) {
|
|
34
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
35
|
-
host.delete(devkit_1.normalizePath(`${options.projectRoot}/src/lib`));
|
|
36
|
-
devkit_1.generateFiles(host, path.join(__dirname, './files/plugin'), options.projectRoot, Object.assign(Object.assign({}, options), { tmpl: '' }));
|
|
37
|
-
yield generator_1.generatorGenerator(host, {
|
|
34
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
35
|
+
host.delete((0, devkit_1.normalizePath)(`${options.projectRoot}/src/lib`));
|
|
36
|
+
(0, devkit_1.generateFiles)(host, path.join(__dirname, './files/plugin'), options.projectRoot, Object.assign(Object.assign({}, options), { tmpl: '' }));
|
|
37
|
+
yield (0, generator_1.generatorGenerator)(host, {
|
|
38
38
|
project: options.name,
|
|
39
39
|
name: options.name,
|
|
40
40
|
unitTestRunner: options.unitTestRunner,
|
|
41
41
|
});
|
|
42
|
-
yield executor_1.executorGenerator(host, {
|
|
42
|
+
yield (0, executor_1.executorGenerator)(host, {
|
|
43
43
|
project: options.name,
|
|
44
44
|
name: 'build',
|
|
45
45
|
unitTestRunner: options.unitTestRunner,
|
|
@@ -49,7 +49,7 @@ function addFiles(host, options) {
|
|
|
49
49
|
function updateWorkspaceJson(host, options) {
|
|
50
50
|
var _a;
|
|
51
51
|
var _b;
|
|
52
|
-
const project = devkit_1.readProjectConfiguration(host, options.name);
|
|
52
|
+
const project = (0, devkit_1.readProjectConfiguration)(host, options.name);
|
|
53
53
|
if (project.targets.build) {
|
|
54
54
|
(_a = (_b = project.targets.build.options).assets) !== null && _a !== void 0 ? _a : (_b.assets = []);
|
|
55
55
|
project.targets.build.options.assets = [
|
|
@@ -75,17 +75,17 @@ function updateWorkspaceJson(host, options) {
|
|
|
75
75
|
output: '.',
|
|
76
76
|
},
|
|
77
77
|
];
|
|
78
|
-
devkit_1.updateProjectConfiguration(host, options.name, project);
|
|
78
|
+
(0, devkit_1.updateProjectConfiguration)(host, options.name, project);
|
|
79
79
|
}
|
|
80
80
|
}
|
|
81
81
|
function pluginGenerator(host, schema) {
|
|
82
82
|
var _a;
|
|
83
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
83
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
84
84
|
const options = normalizeOptions(host, schema);
|
|
85
85
|
const tasks = [];
|
|
86
|
-
const libraryTask = yield node_1.libraryGenerator(host, Object.assign(Object.assign({}, schema), { publishable: true, importPath: (_a = schema.importPath) !== null && _a !== void 0 ? _a : options.npmPackageName }));
|
|
86
|
+
const libraryTask = yield (0, node_1.libraryGenerator)(host, Object.assign(Object.assign({}, schema), { publishable: true, importPath: (_a = schema.importPath) !== null && _a !== void 0 ? _a : options.npmPackageName }));
|
|
87
87
|
tasks.push(libraryTask);
|
|
88
|
-
const installTask = devkit_1.addDependenciesToPackageJson(host, {}, {
|
|
88
|
+
const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
89
89
|
'@nrwl/devkit': versions_1.nxVersion,
|
|
90
90
|
'@nrwl/jest': versions_1.nxVersion,
|
|
91
91
|
'@nrwl/node': versions_1.nxVersion,
|
|
@@ -94,18 +94,18 @@ function pluginGenerator(host, schema) {
|
|
|
94
94
|
tasks.push(installTask);
|
|
95
95
|
yield addFiles(host, options);
|
|
96
96
|
updateWorkspaceJson(host, options);
|
|
97
|
-
yield e2e_1.e2eProjectGenerator(host, {
|
|
97
|
+
yield (0, e2e_1.e2eProjectGenerator)(host, {
|
|
98
98
|
pluginName: options.name,
|
|
99
99
|
projectDirectory: options.projectDirectory,
|
|
100
100
|
pluginOutputPath: `dist/${options.libsDir}/${options.projectDirectory}`,
|
|
101
101
|
npmPackageName: options.npmPackageName,
|
|
102
102
|
standaloneConfig: options.standaloneConfig,
|
|
103
103
|
});
|
|
104
|
-
yield devkit_1.formatFiles(host);
|
|
105
|
-
return run_tasks_in_serial_1.runTasksInSerial(...tasks);
|
|
104
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
105
|
+
return (0, run_tasks_in_serial_1.runTasksInSerial)(...tasks);
|
|
106
106
|
});
|
|
107
107
|
}
|
|
108
108
|
exports.pluginGenerator = pluginGenerator;
|
|
109
109
|
exports.default = pluginGenerator;
|
|
110
|
-
exports.pluginSchematic = devkit_1.convertNxGenerator(pluginGenerator);
|
|
110
|
+
exports.pluginSchematic = (0, devkit_1.convertNxGenerator)(pluginGenerator);
|
|
111
111
|
//# sourceMappingURL=plugin.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/plugin/plugin.ts"],"names":[],"mappings":";;;;AACA,yCAYsB;AAEtB,mDAAiD;AACjD,6BAA6B;AAC7B,qCAA8C;AAC9C,4CAAyD;AACzD,sDAA4D;AAC5D,mDAAyD;AACzD,2FAAqF;AAarF,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;IACnD,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,2BAAkB,
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/plugin/plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,8 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
5
|
const workspace_1 = require("@nrwl/workspace");
|
|
6
6
|
function removeDeprecatedJestBuilderOptions() {
|
|
7
|
-
return (host) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
-
const workspace = yield workspace_1.getWorkspace(host, workspace_1.getWorkspacePath(host));
|
|
7
|
+
return (host) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
8
|
+
const workspace = yield (0, workspace_1.getWorkspace)(host, (0, workspace_1.getWorkspacePath)(host));
|
|
9
9
|
for (const [, projectDefinition] of workspace.projects) {
|
|
10
10
|
for (const [, testTarget] of projectDefinition.targets) {
|
|
11
11
|
if (testTarget.builder !== '@nrwl/nx-plugin:e2e') {
|
|
@@ -16,11 +16,11 @@ function removeDeprecatedJestBuilderOptions() {
|
|
|
16
16
|
testTarget.options = updatedOptions;
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
|
-
return workspace_1.updateWorkspace(workspace);
|
|
19
|
+
return (0, workspace_1.updateWorkspace)(workspace);
|
|
20
20
|
});
|
|
21
21
|
}
|
|
22
22
|
function update() {
|
|
23
|
-
return schematics_1.chain([removeDeprecatedJestBuilderOptions(), workspace_1.formatFiles()]);
|
|
23
|
+
return (0, schematics_1.chain)([removeDeprecatedJestBuilderOptions(), (0, workspace_1.formatFiles)()]);
|
|
24
24
|
}
|
|
25
25
|
exports.default = update;
|
|
26
26
|
//# sourceMappingURL=update-10-2-0.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-10-2-0.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/migrations/update-10-2-0/update-10-2-0.ts"],"names":[],"mappings":";;;AAAA,2DAA+D;AAC/D,+CAKyB;AAEzB,SAAS,kCAAkC;IACzC,OAAO,CAAO,IAAU,EAAE,EAAE;QAC1B,MAAM,SAAS,GAAG,MAAM,wBAAY,
|
|
1
|
+
{"version":3,"file":"update-10-2-0.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/migrations/update-10-2-0/update-10-2-0.ts"],"names":[],"mappings":";;;AAAA,2DAA+D;AAC/D,+CAKyB;AAEzB,SAAS,kCAAkC;IACzC,OAAO,CAAO,IAAU,EAAE,EAAE;QAC1B,MAAM,SAAS,GAAG,MAAM,IAAA,wBAAY,EAAC,IAAI,EAAE,IAAA,4BAAgB,EAAC,IAAI,CAAC,CAAC,CAAC;QAEnE,KAAK,MAAM,CAAC,EAAE,iBAAiB,CAAC,IAAI,SAAS,CAAC,QAAQ,EAAE;YACtD,KAAK,MAAM,CAAC,EAAE,UAAU,CAAC,IAAI,iBAAiB,CAAC,OAAO,EAAE;gBACtD,IAAI,UAAU,CAAC,OAAO,KAAK,qBAAqB,EAAE;oBAChD,SAAS;iBACV;gBAED,MAAM,cAAc,qBAAQ,UAAU,CAAC,OAAO,CAAE,CAAC;gBACjD,OAAO,cAAc,CAAC,YAAY,CAAC;gBAEnC,UAAU,CAAC,OAAO,GAAG,cAAc,CAAC;aACrC;SACF;QAED,OAAO,IAAA,2BAAe,EAAC,SAAS,CAAC,CAAC;IACpC,CAAC,CAAA,CAAC;AACJ,CAAC;AAED,SAAwB,MAAM;IAC5B,OAAO,IAAA,kBAAK,EAAC,CAAC,kCAAkC,EAAE,EAAE,IAAA,uBAAW,GAAE,CAAC,CAAC,CAAC;AACtE,CAAC;AAFD,yBAEC"}
|
|
@@ -4,12 +4,12 @@ const workspace_1 = require("@nrwl/workspace");
|
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
function default_1() {
|
|
6
6
|
return (host) => {
|
|
7
|
-
const p = workspace_1.readJsonInTree(host, 'package.json');
|
|
7
|
+
const p = (0, workspace_1.readJsonInTree)(host, 'package.json');
|
|
8
8
|
if (p['ng-update']) {
|
|
9
9
|
p['nx-migrations'] = p['ng-update'];
|
|
10
10
|
delete p['ng-update'];
|
|
11
11
|
}
|
|
12
|
-
host.overwrite('package.json', devkit_1.serializeJson(p));
|
|
12
|
+
host.overwrite('package.json', (0, devkit_1.serializeJson)(p));
|
|
13
13
|
};
|
|
14
14
|
}
|
|
15
15
|
exports.default = default_1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rename-ng-update-into-nx-migrate.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/migrations/update-11-0-0/rename-ng-update-into-nx-migrate.ts"],"names":[],"mappings":";;AAAA,+CAAiD;AACjD,yCAA6C;AAE7C;IACE,OAAO,CAAC,IAAS,EAAE,EAAE;QACnB,MAAM,CAAC,GAAG,0BAAc,
|
|
1
|
+
{"version":3,"file":"rename-ng-update-into-nx-migrate.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/migrations/update-11-0-0/rename-ng-update-into-nx-migrate.ts"],"names":[],"mappings":";;AAAA,+CAAiD;AACjD,yCAA6C;AAE7C;IACE,OAAO,CAAC,IAAS,EAAE,EAAE;QACnB,MAAM,CAAC,GAAG,IAAA,0BAAc,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAC/C,IAAI,CAAC,CAAC,WAAW,CAAC,EAAE;YAClB,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC;YACpC,OAAO,CAAC,CAAC,WAAW,CAAC,CAAC;SACvB;QACD,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAA,sBAAa,EAAC,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC,CAAC;AACJ,CAAC;AATD,4BASC"}
|
|
@@ -4,15 +4,15 @@ const path_1 = require("path");
|
|
|
4
4
|
const workspace_1 = require("@nrwl/workspace");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
function default_1() {
|
|
7
|
-
return workspace_1.visitNotIgnoredFiles((file, host) => {
|
|
8
|
-
if (path_1.basename(file) === 'schema.json') {
|
|
9
|
-
const p = workspace_1.readJsonInTree(host, file);
|
|
7
|
+
return (0, workspace_1.visitNotIgnoredFiles)((file, host) => {
|
|
8
|
+
if ((0, path_1.basename)(file) === 'schema.json') {
|
|
9
|
+
const p = (0, workspace_1.readJsonInTree)(host, file);
|
|
10
10
|
if (p.$schema === 'https://json-schema.org/draft-07/schema' ||
|
|
11
11
|
p.$schema === 'http://json-schema.org/draft-07/schema') {
|
|
12
12
|
p.$schema = 'http://json-schema.org/schema';
|
|
13
13
|
delete p.$id;
|
|
14
14
|
}
|
|
15
|
-
host.overwrite(file, devkit_1.serializeJson(p));
|
|
15
|
+
host.overwrite(file, (0, devkit_1.serializeJson)(p));
|
|
16
16
|
}
|
|
17
17
|
});
|
|
18
18
|
}
|
package/src/migrations/update-11-0-0/update-schema-version-for-executors-and-generators.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-schema-version-for-executors-and-generators.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/migrations/update-11-0-0/update-schema-version-for-executors-and-generators.ts"],"names":[],"mappings":";;AAAA,+BAAgC;AAChC,+CAAuE;AACvE,yCAA6C;AAE7C;IACE,OAAO,gCAAoB,
|
|
1
|
+
{"version":3,"file":"update-schema-version-for-executors-and-generators.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/migrations/update-11-0-0/update-schema-version-for-executors-and-generators.ts"],"names":[],"mappings":";;AAAA,+BAAgC;AAChC,+CAAuE;AACvE,yCAA6C;AAE7C;IACE,OAAO,IAAA,gCAAoB,EAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;QACzC,IAAI,IAAA,eAAQ,EAAC,IAAI,CAAC,KAAK,aAAa,EAAE;YACpC,MAAM,CAAC,GAAG,IAAA,0BAAc,EAAC,IAAW,EAAE,IAAI,CAAC,CAAC;YAC5C,IACE,CAAC,CAAC,OAAO,KAAK,yCAAyC;gBACvD,CAAC,CAAC,OAAO,KAAK,wCAAwC,EACtD;gBACA,CAAC,CAAC,OAAO,GAAG,+BAA+B,CAAC;gBAC5C,OAAO,CAAC,CAAC,GAAG,CAAC;aACd;YACD,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAA,sBAAa,EAAC,CAAC,CAAC,CAAC,CAAC;SACxC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAdD,4BAcC"}
|
|
@@ -14,8 +14,8 @@ function runCommandAsync(command, opts = {
|
|
|
14
14
|
silenceError: false,
|
|
15
15
|
}) {
|
|
16
16
|
return new Promise((resolve, reject) => {
|
|
17
|
-
child_process_1.exec(command, {
|
|
18
|
-
cwd: paths_1.tmpProjPath(),
|
|
17
|
+
(0, child_process_1.exec)(command, {
|
|
18
|
+
cwd: (0, paths_1.tmpProjPath)(),
|
|
19
19
|
}, (err, stdout, stderr) => {
|
|
20
20
|
if (!opts.silenceError && err) {
|
|
21
21
|
reject(err);
|
|
@@ -33,7 +33,7 @@ exports.runCommandAsync = runCommandAsync;
|
|
|
33
33
|
function runNxCommandAsync(command, opts = {
|
|
34
34
|
silenceError: false,
|
|
35
35
|
}) {
|
|
36
|
-
const pmc = package_manager_1.getPackageManagerCommand();
|
|
36
|
+
const pmc = (0, package_manager_1.getPackageManagerCommand)();
|
|
37
37
|
return runCommandAsync(`${pmc.exec} nx ${command}`, opts);
|
|
38
38
|
}
|
|
39
39
|
exports.runNxCommandAsync = runNxCommandAsync;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"async-commands.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/testing-utils/async-commands.ts"],"names":[],"mappings":";;;AAAA,iDAAqC;AACrC,mCAAsC;AACtC,0EAAgF;AAEhF;;;;;GAKG;AACH,SAAgB,eAAe,CAC7B,OAAe,EACf,IAAI,GAAG;IACL,YAAY,EAAE,KAAK;CACpB;IAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,oBAAI,
|
|
1
|
+
{"version":3,"file":"async-commands.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/testing-utils/async-commands.ts"],"names":[],"mappings":";;;AAAA,iDAAqC;AACrC,mCAAsC;AACtC,0EAAgF;AAEhF;;;;;GAKG;AACH,SAAgB,eAAe,CAC7B,OAAe,EACf,IAAI,GAAG;IACL,YAAY,EAAE,KAAK;CACpB;IAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAA,oBAAI,EACF,OAAO,EACP;YACE,GAAG,EAAE,IAAA,mBAAW,GAAE;SACnB,EACD,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YACtB,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,GAAG,EAAE;gBAC7B,MAAM,CAAC,GAAG,CAAC,CAAC;aACb;YACD,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAC9B,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AApBD,0CAoBC;AAED;;;;GAIG;AACH,SAAgB,iBAAiB,CAC/B,OAAe,EACf,IAAI,GAAG;IACL,YAAY,EAAE,KAAK;CACpB;IAED,MAAM,GAAG,GAAG,IAAA,0CAAwB,GAAE,CAAC;IACvC,OAAO,eAAe,CAAC,GAAG,GAAG,CAAC,IAAI,OAAO,OAAO,EAAE,EAAE,IAAI,CAAC,CAAC;AAC5D,CAAC;AARD,8CAQC"}
|
|
@@ -15,9 +15,9 @@ function runNxCommand(command, opts = {
|
|
|
15
15
|
silenceError: false,
|
|
16
16
|
}) {
|
|
17
17
|
try {
|
|
18
|
-
const pmc = package_manager_1.getPackageManagerCommand();
|
|
19
|
-
return child_process_1.execSync(`${pmc.exec} nx ${command}`, {
|
|
20
|
-
cwd: paths_1.tmpProjPath(),
|
|
18
|
+
const pmc = (0, package_manager_1.getPackageManagerCommand)();
|
|
19
|
+
return (0, child_process_1.execSync)(`${pmc.exec} nx ${command}`, {
|
|
20
|
+
cwd: (0, paths_1.tmpProjPath)(),
|
|
21
21
|
})
|
|
22
22
|
.toString()
|
|
23
23
|
.replace(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, '');
|
|
@@ -35,8 +35,8 @@ function runNxCommand(command, opts = {
|
|
|
35
35
|
exports.runNxCommand = runNxCommand;
|
|
36
36
|
function runCommand(command) {
|
|
37
37
|
try {
|
|
38
|
-
return child_process_1.execSync(command, {
|
|
39
|
-
cwd: paths_1.tmpProjPath(),
|
|
38
|
+
return (0, child_process_1.execSync)(command, {
|
|
39
|
+
cwd: (0, paths_1.tmpProjPath)(),
|
|
40
40
|
stdio: ['pipe', 'pipe', 'pipe'],
|
|
41
41
|
}).toString();
|
|
42
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/testing-utils/commands.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,mCAAsC;AACtC,0EAAgF;AAEhF;;;;;;GAMG;AACH,SAAgB,YAAY,CAC1B,OAAgB,EAChB,IAAI,GAAG;IACL,YAAY,EAAE,KAAK;CACpB;IAED,IAAI;QACF,MAAM,GAAG,GAAG,0CAAwB,
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/testing-utils/commands.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,mCAAsC;AACtC,0EAAgF;AAEhF;;;;;;GAMG;AACH,SAAgB,YAAY,CAC1B,OAAgB,EAChB,IAAI,GAAG;IACL,YAAY,EAAE,KAAK;CACpB;IAED,IAAI;QACF,MAAM,GAAG,GAAG,IAAA,0CAAwB,GAAE,CAAC;QACvC,OAAO,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,IAAI,OAAO,OAAO,EAAE,EAAE;YAC3C,GAAG,EAAE,IAAA,mBAAW,GAAE;SACnB,CAAC;aACC,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;AAxBD,oCAwBC;AAED,SAAgB,UAAU,CAAC,OAAe;IACxC,IAAI;QACF,OAAO,IAAA,wBAAQ,EAAC,OAAO,EAAE;YACvB,GAAG,EAAE,IAAA,mBAAW,GAAE;YAClB,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;SAChC,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;AATD,gCASC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
tslib_1.__exportStar(require("./async-commands"), exports);
|
|
5
|
-
tslib_1.__exportStar(require("./commands"), exports);
|
|
6
|
-
tslib_1.__exportStar(require("./paths"), exports);
|
|
7
|
-
tslib_1.__exportStar(require("./nx-project"), exports);
|
|
8
|
-
tslib_1.__exportStar(require("./utils"), exports);
|
|
4
|
+
(0, tslib_1.__exportStar)(require("./async-commands"), exports);
|
|
5
|
+
(0, tslib_1.__exportStar)(require("./commands"), exports);
|
|
6
|
+
(0, tslib_1.__exportStar)(require("./paths"), exports);
|
|
7
|
+
(0, tslib_1.__exportStar)(require("./nx-project"), exports);
|
|
8
|
+
(0, tslib_1.__exportStar)(require("./utils"), exports);
|
|
9
9
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/testing-utils/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/testing-utils/index.ts"],"names":[],"mappings":";;;AAAA,gEAAiC;AACjC,0DAA2B;AAC3B,uDAAwB;AACxB,4DAA6B;AAC7B,uDAAwB"}
|
|
@@ -9,14 +9,14 @@ const fs_extra_1 = require("fs-extra");
|
|
|
9
9
|
const paths_1 = require("./paths");
|
|
10
10
|
const utils_1 = require("./utils");
|
|
11
11
|
function runNxNewCommand(args, silent) {
|
|
12
|
-
const localTmpDir = path_1.dirname(paths_1.tmpProjPath());
|
|
13
|
-
return child_process_1.execSync(`node ${require.resolve('@nrwl/tao')} new proj --nx-workspace-root=${localTmpDir} --no-interactive --skip-install --collection=@nrwl/workspace --npmScope=proj --preset=empty ${args || ''}`, Object.assign({ cwd: localTmpDir }, (silent && false ? { stdio: ['ignore', 'ignore', 'ignore'] } : {})));
|
|
12
|
+
const localTmpDir = (0, path_1.dirname)((0, paths_1.tmpProjPath)());
|
|
13
|
+
return (0, child_process_1.execSync)(`node ${require.resolve('@nrwl/tao')} new proj --nx-workspace-root=${localTmpDir} --no-interactive --skip-install --collection=@nrwl/workspace --npmScope=proj --preset=empty ${args || ''}`, Object.assign({ cwd: localTmpDir }, (silent && false ? { stdio: ['ignore', 'ignore', 'ignore'] } : {})));
|
|
14
14
|
}
|
|
15
15
|
function patchPackageJsonForPlugin(npmPackageName, distPath) {
|
|
16
|
-
const path = paths_1.tmpProjPath('package.json');
|
|
17
|
-
const json = devkit_1.readJsonFile(path);
|
|
16
|
+
const path = (0, paths_1.tmpProjPath)('package.json');
|
|
17
|
+
const json = (0, devkit_1.readJsonFile)(path);
|
|
18
18
|
json.devDependencies[npmPackageName] = `file:${app_root_1.appRootPath}/${distPath}`;
|
|
19
|
-
devkit_1.writeJsonFile(path, json);
|
|
19
|
+
(0, devkit_1.writeJsonFile)(path, json);
|
|
20
20
|
}
|
|
21
21
|
exports.patchPackageJsonForPlugin = patchPackageJsonForPlugin;
|
|
22
22
|
/**
|
|
@@ -34,8 +34,8 @@ exports.uniq = uniq;
|
|
|
34
34
|
* @param silent silent output from the install
|
|
35
35
|
*/
|
|
36
36
|
function runPackageManagerInstall(silent = true) {
|
|
37
|
-
const pmc = devkit_1.getPackageManagerCommand();
|
|
38
|
-
const install = child_process_1.execSync(pmc.install, Object.assign({ cwd: paths_1.tmpProjPath() }, (silent ? { stdio: ['ignore', 'ignore', 'ignore'] } : {})));
|
|
37
|
+
const pmc = (0, devkit_1.getPackageManagerCommand)();
|
|
38
|
+
const install = (0, child_process_1.execSync)(pmc.install, Object.assign({ cwd: (0, paths_1.tmpProjPath)() }, (silent ? { stdio: ['ignore', 'ignore', 'ignore'] } : {})));
|
|
39
39
|
return install ? install.toString() : '';
|
|
40
40
|
}
|
|
41
41
|
exports.runPackageManagerInstall = runPackageManagerInstall;
|
|
@@ -46,7 +46,7 @@ exports.runPackageManagerInstall = runPackageManagerInstall;
|
|
|
46
46
|
* @param pluginDistPath dist path where the plugin was outputted to
|
|
47
47
|
*/
|
|
48
48
|
function newNxProject(npmPackageName, pluginDistPath) {
|
|
49
|
-
utils_1.cleanup();
|
|
49
|
+
(0, utils_1.cleanup)();
|
|
50
50
|
runNxNewCommand('', true);
|
|
51
51
|
patchPackageJsonForPlugin(npmPackageName, pluginDistPath);
|
|
52
52
|
runPackageManagerInstall();
|
|
@@ -57,7 +57,7 @@ exports.newNxProject = newNxProject;
|
|
|
57
57
|
* It will also copy `@nrwl` packages to the e2e directory
|
|
58
58
|
*/
|
|
59
59
|
function ensureNxProject(npmPackageName, pluginDistPath) {
|
|
60
|
-
fs_extra_1.ensureDirSync(paths_1.tmpProjPath());
|
|
60
|
+
(0, fs_extra_1.ensureDirSync)((0, paths_1.tmpProjPath)());
|
|
61
61
|
newNxProject(npmPackageName, pluginDistPath);
|
|
62
62
|
}
|
|
63
63
|
exports.ensureNxProject = ensureNxProject;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx-project.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/testing-utils/nx-project.ts"],"names":[],"mappings":";;;AAAA,2DAA2D;AAC3D,yCAIsB;AACtB,iDAAyC;AACzC,+BAA+B;AAC/B,uCAAyC;AACzC,mCAAsC;AACtC,mCAAkC;AAElC,SAAS,eAAe,CAAC,IAAa,EAAE,MAAgB;IACtD,MAAM,WAAW,GAAG,cAAO,
|
|
1
|
+
{"version":3,"file":"nx-project.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/testing-utils/nx-project.ts"],"names":[],"mappings":";;;AAAA,2DAA2D;AAC3D,yCAIsB;AACtB,iDAAyC;AACzC,+BAA+B;AAC/B,uCAAyC;AACzC,mCAAsC;AACtC,mCAAkC;AAElC,SAAS,eAAe,CAAC,IAAa,EAAE,MAAgB;IACtD,MAAM,WAAW,GAAG,IAAA,cAAO,EAAC,IAAA,mBAAW,GAAE,CAAC,CAAC;IAC3C,OAAO,IAAA,wBAAQ,EACb,QAAQ,OAAO,CAAC,OAAO,CACrB,WAAW,CACZ,iCAAiC,WAAW,gGAC3C,IAAI,IAAI,EACV,EAAE,kBAEA,GAAG,EAAE,WAAW,IACb,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAExE,CAAC;AACJ,CAAC;AAED,SAAgB,yBAAyB,CACvC,cAAsB,EACtB,QAAgB;IAEhB,MAAM,IAAI,GAAG,IAAA,mBAAW,EAAC,cAAc,CAAC,CAAC;IACzC,MAAM,IAAI,GAAG,IAAA,qBAAY,EAAC,IAAI,CAAC,CAAC;IAChC,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,GAAG,QAAQ,sBAAW,IAAI,QAAQ,EAAE,CAAC;IACzE,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAC5B,CAAC;AARD,8DAQC;AAED;;;;;GAKG;AACH,SAAgB,IAAI,CAAC,MAAc;IACjC,OAAO,GAAG,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;AAC5D,CAAC;AAFD,oBAEC;AAED;;;GAGG;AACH,SAAgB,wBAAwB,CAAC,SAAkB,IAAI;IAC7D,MAAM,GAAG,GAAG,IAAA,iCAAwB,GAAE,CAAC;IACvC,MAAM,OAAO,GAAG,IAAA,wBAAQ,EAAC,GAAG,CAAC,OAAO,kBAClC,GAAG,EAAE,IAAA,mBAAW,GAAE,IACf,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAC5D,CAAC;IACH,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AAC3C,CAAC;AAPD,4DAOC;AAED;;;;;GAKG;AACH,SAAgB,YAAY,CAC1B,cAAsB,EACtB,cAAsB;IAEtB,IAAA,eAAO,GAAE,CAAC;IACV,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAC1B,yBAAyB,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;IAC1D,wBAAwB,EAAE,CAAC;AAC7B,CAAC;AARD,oCAQC;AAED;;;GAGG;AACH,SAAgB,eAAe,CAC7B,cAAuB,EACvB,cAAuB;IAEvB,IAAA,wBAAa,EAAC,IAAA,mBAAW,GAAE,CAAC,CAAC;IAC7B,YAAY,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;AAC/C,CAAC;AAND,0CAMC"}
|
|
@@ -11,8 +11,8 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
11
11
|
*/
|
|
12
12
|
function copyNodeModules(modules) {
|
|
13
13
|
modules.forEach((module) => {
|
|
14
|
-
fs_extra_1.removeSync(`${paths_1.tmpProjPath()}/node_modules/${module}`);
|
|
15
|
-
fs_extra_1.copySync(`./node_modules/${module}`, `${paths_1.tmpProjPath()}/node_modules/${module}`);
|
|
14
|
+
(0, fs_extra_1.removeSync)(`${(0, paths_1.tmpProjPath)()}/node_modules/${module}`);
|
|
15
|
+
(0, fs_extra_1.copySync)(`./node_modules/${module}`, `${(0, paths_1.tmpProjPath)()}/node_modules/${module}`);
|
|
16
16
|
});
|
|
17
17
|
}
|
|
18
18
|
exports.copyNodeModules = copyNodeModules;
|
|
@@ -36,12 +36,12 @@ exports.expectTestsPass = expectTestsPass;
|
|
|
36
36
|
* @param content Content to replace the original content with
|
|
37
37
|
*/
|
|
38
38
|
function updateFile(file, content) {
|
|
39
|
-
fs_extra_1.ensureDirSync(path_1.dirname(paths_1.tmpProjPath(file)));
|
|
39
|
+
(0, fs_extra_1.ensureDirSync)((0, path_1.dirname)((0, paths_1.tmpProjPath)(file)));
|
|
40
40
|
if (typeof content === 'string') {
|
|
41
|
-
fs_extra_1.writeFileSync(paths_1.tmpProjPath(file), content);
|
|
41
|
+
(0, fs_extra_1.writeFileSync)((0, paths_1.tmpProjPath)(file), content);
|
|
42
42
|
}
|
|
43
43
|
else {
|
|
44
|
-
fs_extra_1.writeFileSync(paths_1.tmpProjPath(file), content(fs_extra_1.readFileSync(paths_1.tmpProjPath(file)).toString()));
|
|
44
|
+
(0, fs_extra_1.writeFileSync)((0, paths_1.tmpProjPath)(file), content((0, fs_extra_1.readFileSync)((0, paths_1.tmpProjPath)(file)).toString()));
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
47
|
exports.updateFile = updateFile;
|
|
@@ -51,8 +51,8 @@ exports.updateFile = updateFile;
|
|
|
51
51
|
* @param newPath New path
|
|
52
52
|
*/
|
|
53
53
|
function renameFile(path, newPath) {
|
|
54
|
-
fs_extra_1.ensureDirSync(path_1.dirname(paths_1.tmpProjPath(newPath)));
|
|
55
|
-
fs_extra_1.renameSync(paths_1.tmpProjPath(path), paths_1.tmpProjPath(newPath));
|
|
54
|
+
(0, fs_extra_1.ensureDirSync)((0, path_1.dirname)((0, paths_1.tmpProjPath)(newPath)));
|
|
55
|
+
(0, fs_extra_1.renameSync)((0, paths_1.tmpProjPath)(path), (0, paths_1.tmpProjPath)(newPath));
|
|
56
56
|
}
|
|
57
57
|
exports.renameFile = renameFile;
|
|
58
58
|
/**
|
|
@@ -65,7 +65,7 @@ exports.renameFile = renameFile;
|
|
|
65
65
|
*/
|
|
66
66
|
function checkFilesExist(...expectedPaths) {
|
|
67
67
|
expectedPaths.forEach((path) => {
|
|
68
|
-
const filePath = path_1.isAbsolute(path) ? path : paths_1.tmpProjPath(path);
|
|
68
|
+
const filePath = (0, path_1.isAbsolute)(path) ? path : (0, paths_1.tmpProjPath)(path);
|
|
69
69
|
if (!exists(filePath)) {
|
|
70
70
|
throw new Error(`'${filePath}' does not exist`);
|
|
71
71
|
}
|
|
@@ -77,7 +77,7 @@ exports.checkFilesExist = checkFilesExist;
|
|
|
77
77
|
* @param dirName Directory name within the e2e directory.
|
|
78
78
|
*/
|
|
79
79
|
function listFiles(dirName) {
|
|
80
|
-
return fs_extra_1.readdirSync(paths_1.tmpProjPath(dirName));
|
|
80
|
+
return (0, fs_extra_1.readdirSync)((0, paths_1.tmpProjPath)(dirName));
|
|
81
81
|
}
|
|
82
82
|
exports.listFiles = listFiles;
|
|
83
83
|
/**
|
|
@@ -86,7 +86,7 @@ exports.listFiles = listFiles;
|
|
|
86
86
|
* @param options JSON parse options
|
|
87
87
|
*/
|
|
88
88
|
function readJson(path, options) {
|
|
89
|
-
return devkit_1.parseJson(readFile(path), options);
|
|
89
|
+
return (0, devkit_1.parseJson)(readFile(path), options);
|
|
90
90
|
}
|
|
91
91
|
exports.readJson = readJson;
|
|
92
92
|
/**
|
|
@@ -94,22 +94,22 @@ exports.readJson = readJson;
|
|
|
94
94
|
* @param path Path to the file. Absolute or relative to the e2e directory.
|
|
95
95
|
*/
|
|
96
96
|
function readFile(path) {
|
|
97
|
-
const filePath = path_1.isAbsolute(path) ? path : paths_1.tmpProjPath(path);
|
|
98
|
-
return fs_extra_1.readFileSync(filePath, 'utf-8');
|
|
97
|
+
const filePath = (0, path_1.isAbsolute)(path) ? path : (0, paths_1.tmpProjPath)(path);
|
|
98
|
+
return (0, fs_extra_1.readFileSync)(filePath, 'utf-8');
|
|
99
99
|
}
|
|
100
100
|
exports.readFile = readFile;
|
|
101
101
|
/**
|
|
102
102
|
* Deletes the e2e directory
|
|
103
103
|
*/
|
|
104
104
|
function cleanup() {
|
|
105
|
-
fs_extra_1.removeSync(paths_1.tmpProjPath());
|
|
105
|
+
(0, fs_extra_1.removeSync)((0, paths_1.tmpProjPath)());
|
|
106
106
|
}
|
|
107
107
|
exports.cleanup = cleanup;
|
|
108
108
|
/**
|
|
109
109
|
* Remove the dist folder from the e2e directory
|
|
110
110
|
*/
|
|
111
111
|
function rmDist() {
|
|
112
|
-
fs_extra_1.removeSync(`${paths_1.tmpProjPath()}/dist`);
|
|
112
|
+
(0, fs_extra_1.removeSync)(`${(0, paths_1.tmpProjPath)()}/dist`);
|
|
113
113
|
}
|
|
114
114
|
exports.rmDist = rmDist;
|
|
115
115
|
/**
|
|
@@ -125,7 +125,7 @@ exports.getCwd = getCwd;
|
|
|
125
125
|
*/
|
|
126
126
|
function directoryExists(directoryPath) {
|
|
127
127
|
try {
|
|
128
|
-
return fs_extra_1.statSync(directoryPath).isDirectory();
|
|
128
|
+
return (0, fs_extra_1.statSync)(directoryPath).isDirectory();
|
|
129
129
|
}
|
|
130
130
|
catch (_a) {
|
|
131
131
|
return false;
|
|
@@ -138,7 +138,7 @@ exports.directoryExists = directoryExists;
|
|
|
138
138
|
*/
|
|
139
139
|
function fileExists(filePath) {
|
|
140
140
|
try {
|
|
141
|
-
return fs_extra_1.statSync(filePath).isFile();
|
|
141
|
+
return (0, fs_extra_1.statSync)(filePath).isFile();
|
|
142
142
|
}
|
|
143
143
|
catch (_a) {
|
|
144
144
|
return false;
|
|
@@ -158,7 +158,7 @@ exports.exists = exists;
|
|
|
158
158
|
* @param filePath Path to the file
|
|
159
159
|
*/
|
|
160
160
|
function getSize(filePath) {
|
|
161
|
-
return fs_extra_1.statSync(filePath).size;
|
|
161
|
+
return (0, fs_extra_1.statSync)(filePath).size;
|
|
162
162
|
}
|
|
163
163
|
exports.getSize = getSize;
|
|
164
164
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/testing-utils/utils.ts"],"names":[],"mappings":";;;AAAA,uCASkB;AAClB,+BAA2C;AAC3C,mCAAsC;AACtC,yCAAyC;AAGzC;;;GAGG;AACH,SAAgB,eAAe,CAAC,OAAiB;IAC/C,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QACzB,qBAAU,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/testing-utils/utils.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.js
CHANGED
package/testing.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
tslib_1.__exportStar(require("./src/utils/testing-utils"), exports);
|
|
4
|
+
(0, tslib_1.__exportStar)(require("./src/utils/testing-utils"), exports);
|
|
5
5
|
//# sourceMappingURL=testing.js.map
|
package/testing.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../packages/nx-plugin/testing.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../packages/nx-plugin/testing.ts"],"names":[],"mappings":";;;AAAA,yEAA0C"}
|