@nrwl/nx-plugin 14.2.1 → 14.2.4
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/CHANGELOG.md +1 -1
- package/package.json +6 -6
- package/src/generators/executor/executor.js +21 -6
- package/src/generators/executor/executor.js.map +1 -1
- package/src/generators/generator/generator.d.ts +1 -1
- package/src/generators/generator/generator.js +28 -12
- package/src/generators/generator/generator.js.map +1 -1
- package/src/generators/migration/migration.js +3 -1
- package/src/generators/migration/migration.js.map +1 -1
- package/src/utils/testing-utils/utils.d.ts +2 -10
- package/src/utils/testing-utils/utils.js +5 -28
- package/src/utils/testing-utils/utils.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
## [14.2.
|
|
6
|
+
## [14.2.4](https://github.com/nrwl/nx/compare/14.2.2...14.2.4) (2022-06-09)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/nx-plugin
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/nx-plugin",
|
|
3
|
-
"version": "14.2.
|
|
3
|
+
"version": "14.2.4",
|
|
4
4
|
"description": "Plugin for creating plugins for Nx :)",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -27,15 +27,15 @@
|
|
|
27
27
|
"migrations": "./migrations.json"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@nrwl/devkit": "14.2.
|
|
31
|
-
"@nrwl/jest": "14.2.
|
|
32
|
-
"@nrwl/js": "14.2.
|
|
33
|
-
"@nrwl/linter": "14.2.
|
|
30
|
+
"@nrwl/devkit": "14.2.4",
|
|
31
|
+
"@nrwl/jest": "14.2.4",
|
|
32
|
+
"@nrwl/js": "14.2.4",
|
|
33
|
+
"@nrwl/linter": "14.2.4",
|
|
34
34
|
"fs-extra": "^10.1.0",
|
|
35
35
|
"rxjs": "^6.5.4",
|
|
36
36
|
"semver": "7.3.4",
|
|
37
37
|
"tslib": "^2.3.0"
|
|
38
38
|
},
|
|
39
39
|
"typings": "./index.d.ts",
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "3e3ab094cf1a7cc7c126919622cc7dac011ddd97"
|
|
41
41
|
}
|
|
@@ -16,15 +16,30 @@ function addHasherFiles(host, options) {
|
|
|
16
16
|
host.delete((0, devkit_1.joinPathFragments)(options.projectSourceRoot, 'executors', options.fileName, 'hasher.spec.ts'));
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
|
+
function createExecutorsJson(host, options) {
|
|
20
|
+
(0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), (json) => {
|
|
21
|
+
var _a;
|
|
22
|
+
(_a = json.executors) !== null && _a !== void 0 ? _a : (json.executors = 'executors.json');
|
|
23
|
+
return json;
|
|
24
|
+
});
|
|
25
|
+
(0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'executors.json'), {
|
|
26
|
+
executors: {},
|
|
27
|
+
});
|
|
28
|
+
}
|
|
19
29
|
function updateExecutorJson(host, options) {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
30
|
+
var _a;
|
|
31
|
+
const packageJson = (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'));
|
|
32
|
+
const packageJsonExecutors = (_a = packageJson.executors) !== null && _a !== void 0 ? _a : packageJson.builders;
|
|
33
|
+
let executorsPath = packageJsonExecutors
|
|
34
|
+
? (0, devkit_1.joinPathFragments)(options.projectRoot, packageJsonExecutors)
|
|
35
|
+
: null;
|
|
36
|
+
if (!executorsPath) {
|
|
37
|
+
executorsPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'executors.json');
|
|
23
38
|
}
|
|
24
|
-
|
|
25
|
-
|
|
39
|
+
if (!host.exists(executorsPath)) {
|
|
40
|
+
createExecutorsJson(host, options);
|
|
26
41
|
}
|
|
27
|
-
return (0, devkit_1.updateJson)(host,
|
|
42
|
+
return (0, devkit_1.updateJson)(host, executorsPath, (json) => {
|
|
28
43
|
var _a;
|
|
29
44
|
let executors = (_a = json.executors) !== null && _a !== void 0 ? _a : json.builders;
|
|
30
45
|
executors || (executors = {});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/executor/executor.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/executor/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.generatorSchematic = exports.generatorGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const devkit_2 = require("@nrwl/devkit");
|
|
6
7
|
const path = require("path");
|
|
7
8
|
function normalizeOptions(host, options) {
|
|
8
|
-
const { npmScope } = (0,
|
|
9
|
-
const { fileName, className } = (0,
|
|
10
|
-
const { root: projectRoot, sourceRoot: projectSourceRoot } = (0,
|
|
11
|
-
const npmPackageName = (0,
|
|
9
|
+
const { npmScope } = (0, devkit_2.getWorkspaceLayout)(host);
|
|
10
|
+
const { fileName, className } = (0, devkit_2.names)(options.name);
|
|
11
|
+
const { root: projectRoot, sourceRoot: projectSourceRoot } = (0, devkit_2.readProjectConfiguration)(host, options.project);
|
|
12
|
+
const npmPackageName = (0, devkit_2.readJson)(host, path.join(projectRoot, 'package.json')).name;
|
|
12
13
|
let description;
|
|
13
14
|
if (options.description) {
|
|
14
15
|
description = options.description;
|
|
@@ -29,20 +30,35 @@ function addFiles(host, options) {
|
|
|
29
30
|
if (!host.exists(indexPath)) {
|
|
30
31
|
host.write(indexPath, 'const variable = "<%= projectName %>";');
|
|
31
32
|
}
|
|
32
|
-
(0,
|
|
33
|
+
(0, devkit_2.generateFiles)(host, path.join(__dirname, './files/generator'), `${options.projectSourceRoot}/generators`, Object.assign(Object.assign({}, options), { tmpl: '' }));
|
|
33
34
|
if (options.unitTestRunner === 'none') {
|
|
34
35
|
host.delete(path.join(options.projectSourceRoot, 'generators', options.fileName, `generator.spec.ts`));
|
|
35
36
|
}
|
|
36
37
|
}
|
|
38
|
+
function createGeneratorsJson(host, options) {
|
|
39
|
+
(0, devkit_2.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), (json) => {
|
|
40
|
+
var _a;
|
|
41
|
+
(_a = json.generators) !== null && _a !== void 0 ? _a : (json.generators = 'generators.json');
|
|
42
|
+
return json;
|
|
43
|
+
});
|
|
44
|
+
(0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'generators.json'), {
|
|
45
|
+
generators: {},
|
|
46
|
+
});
|
|
47
|
+
}
|
|
37
48
|
function updateGeneratorJson(host, options) {
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
49
|
+
var _a;
|
|
50
|
+
const packageJson = (0, devkit_2.readJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'));
|
|
51
|
+
const packageJsonGenerators = (_a = packageJson.generators) !== null && _a !== void 0 ? _a : packageJson.schematics;
|
|
52
|
+
let generatorsPath = packageJsonGenerators
|
|
53
|
+
? (0, devkit_1.joinPathFragments)(options.projectRoot, packageJsonGenerators)
|
|
54
|
+
: null;
|
|
55
|
+
if (!generatorsPath) {
|
|
56
|
+
generatorsPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'generators.json');
|
|
41
57
|
}
|
|
42
|
-
|
|
43
|
-
|
|
58
|
+
if (!host.exists(generatorsPath)) {
|
|
59
|
+
createGeneratorsJson(host, options);
|
|
44
60
|
}
|
|
45
|
-
return (0,
|
|
61
|
+
return (0, devkit_2.updateJson)(host, generatorsPath, (json) => {
|
|
46
62
|
var _a;
|
|
47
63
|
let generators = (_a = json.generators) !== null && _a !== void 0 ? _a : json.schematics;
|
|
48
64
|
generators = generators || {};
|
|
@@ -64,5 +80,5 @@ function generatorGenerator(host, schema) {
|
|
|
64
80
|
}
|
|
65
81
|
exports.generatorGenerator = generatorGenerator;
|
|
66
82
|
exports.default = generatorGenerator;
|
|
67
|
-
exports.generatorSchematic = (0,
|
|
83
|
+
exports.generatorSchematic = (0, devkit_2.convertNxGenerator)(generatorGenerator);
|
|
68
84
|
//# sourceMappingURL=generator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/generator/generator.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/generator/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const path = require("path");
|
|
7
7
|
const generator_1 = require("../lint-checks/generator");
|
|
8
|
+
const package_json_1 = require("nx/src/utils/package-json");
|
|
8
9
|
function normalizeOptions(host, options) {
|
|
9
10
|
var _a;
|
|
10
11
|
let name;
|
|
@@ -27,7 +28,8 @@ function addFiles(host, options) {
|
|
|
27
28
|
}
|
|
28
29
|
function updateMigrationsJson(host, options) {
|
|
29
30
|
var _a, _b;
|
|
30
|
-
const
|
|
31
|
+
const configuredMigrationPath = (0, package_json_1.readNxMigrateConfig)((0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'))).migrations;
|
|
32
|
+
const migrationsPath = (0, devkit_1.joinPathFragments)(options.projectRoot, configuredMigrationPath !== null && configuredMigrationPath !== void 0 ? configuredMigrationPath : 'migrations.json');
|
|
31
33
|
const migrations = host.exists(migrationsPath)
|
|
32
34
|
? (0, devkit_1.readJson)(host, migrationsPath)
|
|
33
35
|
: {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migration.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/migration/migration.ts"],"names":[],"mappings":";;;;AAAA,yCAUsB;AAGtB,6BAA6B;AAC7B,wDAAkE;
|
|
1
|
+
{"version":3,"file":"migration.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/migration/migration.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import type { JsonParseOptions } from '@nrwl/devkit';
|
|
2
|
+
import { directoryExists, fileExists } from 'nx/src/utils/fileutils';
|
|
3
|
+
export { directoryExists, fileExists };
|
|
2
4
|
/**
|
|
3
5
|
* Copies module folders from the working directory to the e2e directory
|
|
4
6
|
* @param modules a list of module names or scopes to copy
|
|
@@ -65,16 +67,6 @@ export declare function rmDist(): void;
|
|
|
65
67
|
* Get the currend `cwd` in the process
|
|
66
68
|
*/
|
|
67
69
|
export declare function getCwd(): string;
|
|
68
|
-
/**
|
|
69
|
-
* Check if a directory exists
|
|
70
|
-
* @param directoryPath Path to directory
|
|
71
|
-
*/
|
|
72
|
-
export declare function directoryExists(directoryPath: string): boolean;
|
|
73
|
-
/**
|
|
74
|
-
* Check if a file exists.
|
|
75
|
-
* @param filePath Path to file
|
|
76
|
-
*/
|
|
77
|
-
export declare function fileExists(filePath: string): boolean;
|
|
78
70
|
/**
|
|
79
71
|
* Check if a file or directory exists.
|
|
80
72
|
* @param path Path to file or directory
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getSize = exports.exists = exports.
|
|
3
|
+
exports.getSize = exports.exists = exports.getCwd = exports.rmDist = exports.cleanup = exports.readFile = exports.readJson = exports.listFiles = exports.checkFilesExist = exports.renameFile = exports.updateFile = exports.expectTestsPass = exports.copyNodeModules = exports.fileExists = exports.directoryExists = void 0;
|
|
4
4
|
const fs_extra_1 = require("fs-extra");
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const paths_1 = require("./paths");
|
|
7
7
|
const devkit_1 = require("@nrwl/devkit");
|
|
8
|
+
const fileutils_1 = require("nx/src/utils/fileutils");
|
|
9
|
+
Object.defineProperty(exports, "directoryExists", { enumerable: true, get: function () { return fileutils_1.directoryExists; } });
|
|
10
|
+
Object.defineProperty(exports, "fileExists", { enumerable: true, get: function () { return fileutils_1.fileExists; } });
|
|
8
11
|
/**
|
|
9
12
|
* Copies module folders from the working directory to the e2e directory
|
|
10
13
|
* @param modules a list of module names or scopes to copy
|
|
@@ -119,38 +122,12 @@ function getCwd() {
|
|
|
119
122
|
return process.cwd();
|
|
120
123
|
}
|
|
121
124
|
exports.getCwd = getCwd;
|
|
122
|
-
/**
|
|
123
|
-
* Check if a directory exists
|
|
124
|
-
* @param directoryPath Path to directory
|
|
125
|
-
*/
|
|
126
|
-
function directoryExists(directoryPath) {
|
|
127
|
-
try {
|
|
128
|
-
return (0, fs_extra_1.statSync)(directoryPath).isDirectory();
|
|
129
|
-
}
|
|
130
|
-
catch (_a) {
|
|
131
|
-
return false;
|
|
132
|
-
}
|
|
133
|
-
}
|
|
134
|
-
exports.directoryExists = directoryExists;
|
|
135
|
-
/**
|
|
136
|
-
* Check if a file exists.
|
|
137
|
-
* @param filePath Path to file
|
|
138
|
-
*/
|
|
139
|
-
function fileExists(filePath) {
|
|
140
|
-
try {
|
|
141
|
-
return (0, fs_extra_1.statSync)(filePath).isFile();
|
|
142
|
-
}
|
|
143
|
-
catch (_a) {
|
|
144
|
-
return false;
|
|
145
|
-
}
|
|
146
|
-
}
|
|
147
|
-
exports.fileExists = fileExists;
|
|
148
125
|
/**
|
|
149
126
|
* Check if a file or directory exists.
|
|
150
127
|
* @param path Path to file or directory
|
|
151
128
|
*/
|
|
152
129
|
function exists(path) {
|
|
153
|
-
return directoryExists(path) || fileExists(path);
|
|
130
|
+
return (0, fileutils_1.directoryExists)(path) || (0, fileutils_1.fileExists)(path);
|
|
154
131
|
}
|
|
155
132
|
exports.exists = exists;
|
|
156
133
|
/**
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/testing-utils/utils.ts"],"names":[],"mappings":"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"}
|