@nrwl/nx-plugin 13.9.4 → 13.10.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/package.json +5 -5
- package/src/executors/e2e/e2e.impl.js +10 -10
- package/src/executors/e2e/e2e.impl.js.map +1 -1
- package/src/generators/e2e-project/e2e.js +2 -2
- package/src/generators/executor/executor.js +1 -1
- package/src/generators/generator/generator.js +1 -1
- package/src/generators/migration/migration.js +6 -6
- package/src/generators/migration/migration.js.map +1 -1
- package/src/generators/migration/schema.d.ts +1 -1
- package/src/generators/migration/schema.json +2 -2
- package/src/generators/plugin/plugin.js +2 -2
- package/src/migrations/update-10-2-0/update-10-2-0.js +1 -1
- package/src/utils/testing-utils/async-commands.js +2 -2
- package/src/utils/testing-utils/async-commands.js.map +1 -1
- package/src/utils/testing-utils/commands.js +2 -2
- 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 +5 -5
- package/src/utils/testing-utils/nx-project.js.map +1 -1
- package/src/utils/versions.js +1 -1
- package/testing.js +1 -1
- package/testing.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/nx-plugin",
|
|
3
|
-
"version": "13.
|
|
3
|
+
"version": "13.10.0-beta.3",
|
|
4
4
|
"description": "Plugin for creating plugins for Nx :)",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -27,10 +27,10 @@
|
|
|
27
27
|
"migrations": "./migrations.json"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@nrwl/devkit": "13.
|
|
31
|
-
"@nrwl/jest": "13.
|
|
32
|
-
"@nrwl/linter": "13.
|
|
33
|
-
"@nrwl/js": "13.
|
|
30
|
+
"@nrwl/devkit": "13.10.0-beta.3",
|
|
31
|
+
"@nrwl/jest": "13.10.0-beta.3",
|
|
32
|
+
"@nrwl/linter": "13.10.0-beta.3",
|
|
33
|
+
"@nrwl/js": "13.10.0-beta.3",
|
|
34
34
|
"fs-extra": "^9.1.0",
|
|
35
35
|
"rxjs": "^6.5.4",
|
|
36
36
|
"tslib": "^2.3.0"
|
|
@@ -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
|
|
9
|
+
return 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 =
|
|
13
|
+
for (var _b = tslib_1.__asyncValues(runBuildTarget(options.target, context)), _c; _c = yield tslib_1.__await(_b.next()), !_c.done;) {
|
|
14
14
|
const _ = _c.value;
|
|
15
15
|
try {
|
|
16
|
-
success = yield
|
|
16
|
+
success = yield tslib_1.__await(runTests(options.jestConfig, context));
|
|
17
17
|
}
|
|
18
18
|
catch (e) {
|
|
19
19
|
devkit_1.logger.error(e.message);
|
|
@@ -24,39 +24,39 @@ 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
|
|
27
|
+
if (_c && !_c.done && (_a = _b.return)) yield tslib_1.__await(_a.call(_b));
|
|
28
28
|
}
|
|
29
29
|
finally { if (e_1) throw e_1.error; }
|
|
30
30
|
}
|
|
31
|
-
return yield
|
|
31
|
+
return yield tslib_1.__await({ success });
|
|
32
32
|
});
|
|
33
33
|
}
|
|
34
34
|
exports.nxPluginE2EExecutor = nxPluginE2EExecutor;
|
|
35
35
|
function runBuildTarget(buildTarget, context) {
|
|
36
|
-
return
|
|
36
|
+
return tslib_1.__asyncGenerator(this, arguments, function* runBuildTarget_1() {
|
|
37
37
|
var e_2, _a;
|
|
38
38
|
const { project, target, configuration } = (0, devkit_1.parseTargetString)(buildTarget);
|
|
39
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 =
|
|
42
|
+
for (var _b = tslib_1.__asyncValues(yield tslib_1.__await((0, devkit_1.runExecutor)({ project, target, configuration }, targetSupportsWatch ? { watch: false } : {}, context))), _c; _c = yield 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
|
|
46
|
+
yield yield 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
|
|
52
|
+
if (_c && !_c.done && (_a = _b.return)) yield 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
|
|
59
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
60
60
|
const { success } = yield (0, jest_impl_1.jestExecutor)({ jestConfig, watch: false }, context);
|
|
61
61
|
return success;
|
|
62
62
|
});
|
|
@@ -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,sBAAA,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA,IAAA;gBAAlD,MAAM,CAAC,WAAA,CAAA;gBAChB,IAAI;oBACF,OAAO,GAAG,sBAAM,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,6BAAO,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,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;gBAJU,MAAM,MAAM,WAAA,CAAA;gBAKrB,IAAI,CAAC,MAAM,CAAC,OAAO;oBACjB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;gBAC1D,4BAAM,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"}
|
|
@@ -45,7 +45,7 @@ function updateWorkspaceConfiguration(host, options) {
|
|
|
45
45
|
}, options.standaloneConfig);
|
|
46
46
|
}
|
|
47
47
|
function addJest(host, options) {
|
|
48
|
-
return
|
|
48
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
49
49
|
yield (0, jest_1.jestProjectGenerator)(host, {
|
|
50
50
|
project: options.projectName,
|
|
51
51
|
setupFile: 'none',
|
|
@@ -62,7 +62,7 @@ function addJest(host, options) {
|
|
|
62
62
|
});
|
|
63
63
|
}
|
|
64
64
|
function e2eProjectGenerator(host, schema) {
|
|
65
|
-
return
|
|
65
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
66
66
|
validatePlugin(host, schema.pluginName);
|
|
67
67
|
const options = normalizeOptions(host, schema);
|
|
68
68
|
addFiles(host, options);
|
|
@@ -50,7 +50,7 @@ function normalizeOptions(host, options) {
|
|
|
50
50
|
npmScope });
|
|
51
51
|
}
|
|
52
52
|
function executorGenerator(host, schema) {
|
|
53
|
-
return
|
|
53
|
+
return 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);
|
|
@@ -56,7 +56,7 @@ function updateGeneratorJson(host, options) {
|
|
|
56
56
|
});
|
|
57
57
|
}
|
|
58
58
|
function generatorGenerator(host, schema) {
|
|
59
|
-
return
|
|
59
|
+
return 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);
|
|
@@ -11,7 +11,7 @@ function normalizeOptions(host, options) {
|
|
|
11
11
|
name = (0, devkit_1.names)(options.name).fileName;
|
|
12
12
|
}
|
|
13
13
|
else {
|
|
14
|
-
name = (0, devkit_1.names)(`update-${options.
|
|
14
|
+
name = (0, devkit_1.names)(`update-${options.packageVersion}`).fileName;
|
|
15
15
|
}
|
|
16
16
|
const description = (_a = options.description) !== null && _a !== void 0 ? _a : name;
|
|
17
17
|
const { root: projectRoot, sourceRoot: projectSourceRoot } = (0, devkit_1.readProjectConfiguration)(host, options.project);
|
|
@@ -36,7 +36,7 @@ function updateMigrationsJson(host, options) {
|
|
|
36
36
|
}
|
|
37
37
|
const generators = (_a = migrations.generators) !== null && _a !== void 0 ? _a : {};
|
|
38
38
|
generators[options.name] = {
|
|
39
|
-
version: options.
|
|
39
|
+
version: options.packageVersion,
|
|
40
40
|
description: options.description,
|
|
41
41
|
cli: 'nx',
|
|
42
42
|
implementation: `./src/migrations/${options.name}/${options.name}`,
|
|
@@ -44,9 +44,9 @@ function updateMigrationsJson(host, options) {
|
|
|
44
44
|
migrations.generators = generators;
|
|
45
45
|
if (options.packageJsonUpdates) {
|
|
46
46
|
const packageJsonUpdatesObj = (_b = migrations.packageJsonUpdates) !== null && _b !== void 0 ? _b : {};
|
|
47
|
-
if (!packageJsonUpdatesObj[options.
|
|
48
|
-
packageJsonUpdatesObj[options.
|
|
49
|
-
version: options.
|
|
47
|
+
if (!packageJsonUpdatesObj[options.packageVersion]) {
|
|
48
|
+
packageJsonUpdatesObj[options.packageVersion] = {
|
|
49
|
+
version: options.packageVersion,
|
|
50
50
|
packages: {},
|
|
51
51
|
};
|
|
52
52
|
}
|
|
@@ -87,7 +87,7 @@ function updateWorkspaceJson(host, options) {
|
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
89
|
function migrationGenerator(host, schema) {
|
|
90
|
-
return
|
|
90
|
+
return 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);
|
|
@@ -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,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;KACrC;SAAM;QACL,IAAI,GAAG,IAAA,cAAK,EAAC,UAAU,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"migration.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/migration/migration.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"description": "Migration description",
|
|
34
34
|
"alias": "d"
|
|
35
35
|
},
|
|
36
|
-
"
|
|
36
|
+
"packageVersion": {
|
|
37
37
|
"type": "string",
|
|
38
38
|
"description": "Version to use for the migration",
|
|
39
39
|
"alias": "v",
|
|
@@ -46,6 +46,6 @@
|
|
|
46
46
|
"default": false
|
|
47
47
|
}
|
|
48
48
|
},
|
|
49
|
-
"required": ["project", "
|
|
49
|
+
"required": ["project", "packageVersion"],
|
|
50
50
|
"additionalProperties": false
|
|
51
51
|
}
|
|
@@ -31,7 +31,7 @@ function normalizeOptions(host, options) {
|
|
|
31
31
|
npmPackageName });
|
|
32
32
|
}
|
|
33
33
|
function addFiles(host, options) {
|
|
34
|
-
return
|
|
34
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
35
35
|
host.delete((0, devkit_1.normalizePath)(`${options.projectRoot}/src/lib`));
|
|
36
36
|
(0, devkit_1.generateFiles)(host, path.join(__dirname, './files/plugin'), options.projectRoot, Object.assign(Object.assign({}, options), { tmpl: '' }));
|
|
37
37
|
yield (0, generator_1.generatorGenerator)(host, {
|
|
@@ -80,7 +80,7 @@ function updateWorkspaceJson(host, options) {
|
|
|
80
80
|
}
|
|
81
81
|
function pluginGenerator(host, schema) {
|
|
82
82
|
var _a;
|
|
83
|
-
return
|
|
83
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
84
84
|
const options = normalizeOptions(host, schema);
|
|
85
85
|
const tasks = [];
|
|
86
86
|
const libraryTask = yield (0, js_1.libraryGenerator)(host, Object.assign(Object.assign({}, schema), { config: options.standaloneConfig !== false ? 'project' : 'workspace', buildable: true, importPath: options.npmPackageName }));
|
|
@@ -4,7 +4,7 @@ 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) =>
|
|
7
|
+
return (host) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
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) {
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.runNxCommandAsync = exports.runCommandAsync = void 0;
|
|
4
4
|
const child_process_1 = require("child_process");
|
|
5
5
|
const paths_1 = require("./paths");
|
|
6
|
-
const
|
|
6
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
7
7
|
/**
|
|
8
8
|
* Run a command asynchronously inside the e2e directory.
|
|
9
9
|
*
|
|
@@ -33,7 +33,7 @@ exports.runCommandAsync = runCommandAsync;
|
|
|
33
33
|
function runNxCommandAsync(command, opts = {
|
|
34
34
|
silenceError: false,
|
|
35
35
|
}) {
|
|
36
|
-
const pmc = (0,
|
|
36
|
+
const pmc = (0, devkit_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,
|
|
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,yCAAwD;AAExD;;;;;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,iCAAwB,GAAE,CAAC;IACvC,OAAO,eAAe,CAAC,GAAG,GAAG,CAAC,IAAI,OAAO,OAAO,EAAE,EAAE,IAAI,CAAC,CAAC;AAC5D,CAAC;AARD,8CAQC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.runCommand = exports.runNxCommand = void 0;
|
|
4
4
|
const child_process_1 = require("child_process");
|
|
5
5
|
const paths_1 = require("./paths");
|
|
6
|
-
const
|
|
6
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
7
7
|
/**
|
|
8
8
|
* Run a nx command inside the e2e directory
|
|
9
9
|
* @param command
|
|
@@ -15,7 +15,7 @@ function runNxCommand(command, opts = {
|
|
|
15
15
|
silenceError: false,
|
|
16
16
|
}) {
|
|
17
17
|
try {
|
|
18
|
-
const pmc = (0,
|
|
18
|
+
const pmc = (0, devkit_1.getPackageManagerCommand)();
|
|
19
19
|
return (0, child_process_1.execSync)(`${pmc.exec} nx ${command}`, {
|
|
20
20
|
cwd: (0, paths_1.tmpProjPath)(),
|
|
21
21
|
})
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/testing-utils/commands.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,mCAAsC;AACtC,yCAAwD;AAExD;;;;;;GAMG;AACH,SAAgB,YAAY,CAC1B,OAAgB,EAChB,IAAI,GAAG;IACL,YAAY,EAAE,KAAK;CACpB;IAED,IAAI;QACF,MAAM,GAAG,GAAG,IAAA,iCAAwB,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
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
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);
|
|
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,2DAAiC;AACjC,qDAA2B;AAC3B,kDAAwB;AACxB,uDAA6B;AAC7B,kDAAwB"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ensureNxProject = exports.newNxProject = exports.runPackageManagerInstall = exports.uniq = exports.patchPackageJsonForPlugin = void 0;
|
|
4
|
-
const app_root_1 = require("nx/src/utils/app-root");
|
|
5
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const devkit_2 = require("@nrwl/devkit");
|
|
6
6
|
const child_process_1 = require("child_process");
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
const fs_extra_1 = require("fs-extra");
|
|
@@ -14,9 +14,9 @@ function runNxNewCommand(args, silent) {
|
|
|
14
14
|
}
|
|
15
15
|
function patchPackageJsonForPlugin(npmPackageName, distPath) {
|
|
16
16
|
const path = (0, paths_1.tmpProjPath)('package.json');
|
|
17
|
-
const json = (0,
|
|
18
|
-
json.devDependencies[npmPackageName] = `file:${
|
|
19
|
-
(0,
|
|
17
|
+
const json = (0, devkit_2.readJsonFile)(path);
|
|
18
|
+
json.devDependencies[npmPackageName] = `file:${devkit_1.appRootPath}/${distPath}`;
|
|
19
|
+
(0, devkit_2.writeJsonFile)(path, json);
|
|
20
20
|
}
|
|
21
21
|
exports.patchPackageJsonForPlugin = patchPackageJsonForPlugin;
|
|
22
22
|
/**
|
|
@@ -34,7 +34,7 @@ exports.uniq = uniq;
|
|
|
34
34
|
* @param silent silent output from the install
|
|
35
35
|
*/
|
|
36
36
|
function runPackageManagerInstall(silent = true) {
|
|
37
|
-
const pmc = (0,
|
|
37
|
+
const pmc = (0, devkit_2.getPackageManagerCommand)();
|
|
38
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
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx-project.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/testing-utils/nx-project.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"nx-project.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/testing-utils/nx-project.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAC3C,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,IAAI,CACL,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,oBAAW,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"}
|
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
|
-
|
|
4
|
+
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,oEAA0C"}
|