@nrwl/nx-plugin 14.1.9 → 14.2.0-beta.2
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/migrations.json +6 -0
- package/package.json +6 -6
- package/src/generators/plugin/plugin.d.ts +2 -3
- package/src/generators/plugin/plugin.js +23 -13
- package/src/generators/plugin/plugin.js.map +1 -1
- package/src/migrations/update-14-1-9/add-swc-deps-if-needed.d.ts +2 -0
- package/src/migrations/update-14-1-9/add-swc-deps-if-needed.js +14 -0
- package/src/migrations/update-14-1-9/add-swc-deps-if-needed.js.map +1 -0
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
|
-
|
|
6
|
+
# [14.2.0-beta.2](https://github.com/nrwl/nx/compare/14.1.9...14.2.0-beta.2) (2022-05-31)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/nx-plugin
|
package/migrations.json
CHANGED
|
@@ -14,6 +14,12 @@
|
|
|
14
14
|
"version": "11.0.17",
|
|
15
15
|
"description": "Update schema versions for executors and generators",
|
|
16
16
|
"factory": "./src/migrations/update-11-0-0/update-schema-version-for-executors-and-generators"
|
|
17
|
+
},
|
|
18
|
+
"add-swc-deps": {
|
|
19
|
+
"cli": "nx",
|
|
20
|
+
"version": "14-1-9-beta.0",
|
|
21
|
+
"description": "Adds @swc/core and @swc-node as a dev dep if you are using them",
|
|
22
|
+
"factory": "./src/migrations/update-14-1-9/add-swc-deps-if-needed"
|
|
17
23
|
}
|
|
18
24
|
}
|
|
19
25
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/nx-plugin",
|
|
3
|
-
"version": "14.
|
|
3
|
+
"version": "14.2.0-beta.2",
|
|
4
4
|
"description": "Plugin for creating plugins for Nx :)",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -27,14 +27,14 @@
|
|
|
27
27
|
"migrations": "./migrations.json"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@nrwl/devkit": "14.
|
|
31
|
-
"@nrwl/jest": "14.
|
|
32
|
-
"@nrwl/js": "14.
|
|
33
|
-
"@nrwl/linter": "14.
|
|
30
|
+
"@nrwl/devkit": "14.2.0-beta.2",
|
|
31
|
+
"@nrwl/jest": "14.2.0-beta.2",
|
|
32
|
+
"@nrwl/js": "14.2.0-beta.2",
|
|
33
|
+
"@nrwl/linter": "14.2.0-beta.2",
|
|
34
34
|
"fs-extra": "^10.1.0",
|
|
35
35
|
"rxjs": "^6.5.4",
|
|
36
36
|
"tslib": "^2.3.0"
|
|
37
37
|
},
|
|
38
38
|
"typings": "./index.d.ts",
|
|
39
|
-
"gitHead": "
|
|
39
|
+
"gitHead": "e491c6f7382064fb1f17c0dcd2e642428ca822e4"
|
|
40
40
|
}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import
|
|
2
|
-
import { GeneratorCallback } from '@nrwl/devkit';
|
|
1
|
+
import { Tree } from '@nrwl/devkit';
|
|
3
2
|
import type { Schema } from './schema';
|
|
4
|
-
export declare function pluginGenerator(host: Tree, schema: Schema): Promise<
|
|
3
|
+
export declare function pluginGenerator(host: Tree, schema: Schema): Promise<() => void>;
|
|
5
4
|
export default pluginGenerator;
|
|
6
5
|
export declare const pluginSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;
|
|
@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.pluginSchematic = exports.pluginGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const versions_1 = require("../../utils/versions");
|
|
7
|
-
const path = require("path");
|
|
8
6
|
const js_1 = require("@nrwl/js");
|
|
7
|
+
const add_swc_dependencies_1 = require("@nrwl/js/src/utils/swc/add-swc-dependencies");
|
|
8
|
+
const versions_1 = require("nx/src/utils/versions");
|
|
9
|
+
const path = require("path");
|
|
10
|
+
const versions_2 = require("../../utils/versions");
|
|
9
11
|
const e2e_1 = require("../e2e-project/e2e");
|
|
10
|
-
const generator_1 = require("../generator/generator");
|
|
11
12
|
const executor_1 = require("../executor/executor");
|
|
12
|
-
const
|
|
13
|
+
const generator_1 = require("../generator/generator");
|
|
13
14
|
function normalizeOptions(host, options) {
|
|
14
15
|
const { npmScope, libsDir } = (0, devkit_1.getWorkspaceLayout)(host);
|
|
15
16
|
const name = (0, devkit_1.names)(options.name).fileName;
|
|
@@ -22,7 +23,7 @@ function normalizeOptions(host, options) {
|
|
|
22
23
|
const parsedTags = options.tags
|
|
23
24
|
? options.tags.split(',').map((s) => s.trim())
|
|
24
25
|
: [];
|
|
25
|
-
const npmPackageName = options.importPath ||
|
|
26
|
+
const npmPackageName = options.importPath || resolvePackageName(npmScope, name);
|
|
26
27
|
return Object.assign(Object.assign({}, options), { fileName,
|
|
27
28
|
npmScope,
|
|
28
29
|
libsDir, name: projectName, projectRoot,
|
|
@@ -83,16 +84,17 @@ function pluginGenerator(host, schema) {
|
|
|
83
84
|
var _a;
|
|
84
85
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
85
86
|
const options = normalizeOptions(host, schema);
|
|
86
|
-
const tasks = [];
|
|
87
87
|
const libraryTask = yield (0, js_1.libraryGenerator)(host, Object.assign(Object.assign({}, schema), { config: options.standaloneConfig !== false ? 'project' : 'workspace', buildable: true, importPath: options.npmPackageName }));
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
'@nrwl/
|
|
91
|
-
'@nrwl/
|
|
92
|
-
'@
|
|
88
|
+
(0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
89
|
+
'@nrwl/devkit': versions_2.nxVersion,
|
|
90
|
+
'@nrwl/jest': versions_2.nxVersion,
|
|
91
|
+
'@nrwl/js': versions_2.nxVersion,
|
|
92
|
+
'@swc-node/register': versions_1.swcNodeVersion,
|
|
93
93
|
tslib: '^2.0.0',
|
|
94
94
|
});
|
|
95
|
-
|
|
95
|
+
// Ensures Swc Deps are installed to handle running
|
|
96
|
+
// local plugin generators and executors
|
|
97
|
+
(0, add_swc_dependencies_1.addSwcDependencies)(host);
|
|
96
98
|
yield addFiles(host, options);
|
|
97
99
|
updateWorkspaceJson(host, options);
|
|
98
100
|
yield (0, e2e_1.e2eProjectGenerator)(host, {
|
|
@@ -103,10 +105,18 @@ function pluginGenerator(host, schema) {
|
|
|
103
105
|
standaloneConfig: (_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : true,
|
|
104
106
|
});
|
|
105
107
|
yield (0, devkit_1.formatFiles)(host);
|
|
106
|
-
return (0,
|
|
108
|
+
return () => (0, devkit_1.installPackagesTask)(host);
|
|
107
109
|
});
|
|
108
110
|
}
|
|
109
111
|
exports.pluginGenerator = pluginGenerator;
|
|
112
|
+
function resolvePackageName(npmScope, name) {
|
|
113
|
+
if (npmScope && npmScope !== '') {
|
|
114
|
+
return `@${npmScope}/${name}`;
|
|
115
|
+
}
|
|
116
|
+
else {
|
|
117
|
+
return name;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
110
120
|
exports.default = pluginGenerator;
|
|
111
121
|
exports.pluginSchematic = (0, devkit_1.convertNxGenerator)(pluginGenerator);
|
|
112
122
|
//# sourceMappingURL=plugin.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/plugin/plugin.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/plugin/plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const versions_1 = require("nx/src/utils/versions");
|
|
6
|
+
function addSwcNodeIfNeeded(tree) {
|
|
7
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
+
(0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@swc-node/register': versions_1.swcNodeVersion, '@swc/core': versions_1.swcCoreVersion });
|
|
9
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
10
|
+
return (0, devkit_1.installPackagesTask)(tree);
|
|
11
|
+
});
|
|
12
|
+
}
|
|
13
|
+
exports.default = addSwcNodeIfNeeded;
|
|
14
|
+
//# sourceMappingURL=add-swc-deps-if-needed.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-swc-deps-if-needed.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/migrations/update-14-1-9/add-swc-deps-if-needed.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,oDAAuE;AAEvE,SAA8B,kBAAkB,CAAC,IAAU;;QACzD,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF,EAAE,oBAAoB,EAAE,yBAAc,EAAE,WAAW,EAAE,yBAAc,EAAE,CACtE,CAAC;QACF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACxB,OAAO,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;IACnC,CAAC;CAAA;AARD,qCAQC"}
|