@nrwl/nx-plugin 15.9.2 → 16.0.0-beta.0
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/generators.json +7 -0
- package/package.json +7 -7
- package/src/generators/e2e-project/e2e.js +5 -3
- package/src/generators/e2e-project/e2e.js.map +1 -1
- package/src/generators/e2e-project/schema.d.ts +1 -0
- package/src/generators/executor/executor.js +1 -1
- package/src/generators/executor/executor.js.map +1 -1
- package/src/generators/generator/generator.js +1 -1
- package/src/generators/generator/generator.js.map +1 -1
- package/src/generators/migration/migration.js +12 -9
- package/src/generators/migration/migration.js.map +1 -1
- package/src/generators/plugin/plugin.js +6 -4
- package/src/generators/plugin/plugin.js.map +1 -1
- package/src/generators/plugin/schema.d.ts +1 -0
- package/src/generators/plugin/utils/normalize-schema.js +6 -2
- package/src/generators/plugin/utils/normalize-schema.js.map +1 -1
- package/src/generators/preset/generator.d.ts +3 -0
- package/src/generators/preset/generator.js +39 -0
- package/src/generators/preset/generator.js.map +1 -0
- package/src/generators/preset/schema.d.ts +3 -0
- package/src/generators/preset/schema.json +16 -0
- package/src/generators/plugin/files/plugin/executors.json__tmpl__ +0 -4
- package/src/generators/plugin/files/plugin/generators.json__tmpl__ +0 -6
- package/src/generators/plugin/files/plugin/package.json__tmpl__ +0 -7
package/generators.json
CHANGED
|
@@ -33,6 +33,13 @@
|
|
|
33
33
|
"factory": "./src/generators/lint-checks/generator",
|
|
34
34
|
"schema": "./src/generators/lint-checks/schema.json",
|
|
35
35
|
"description": "Adds linting configuration to validate common json files for nx plugins."
|
|
36
|
+
},
|
|
37
|
+
"preset": {
|
|
38
|
+
"factory": "./src/generators/preset/generator",
|
|
39
|
+
"schema": "./src/generators/preset/schema.json",
|
|
40
|
+
"description": "Initializes a workspace with an nx-plugin inside of it. Use as: `create-nx-workspace --preset @nrwl/nx-plugin`.",
|
|
41
|
+
"hidden": true,
|
|
42
|
+
"x-use-standalone-layout": true
|
|
36
43
|
}
|
|
37
44
|
},
|
|
38
45
|
"schematics": {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/nx-plugin",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "16.0.0-beta.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "This plugin is used to create Nx plugins! It contains generators for generating common plugin features like generators, executors, migrations and more.",
|
|
6
6
|
"repository": {
|
|
@@ -28,11 +28,11 @@
|
|
|
28
28
|
"migrations": "./migrations.json"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@nrwl/devkit": "
|
|
32
|
-
"@nrwl/jest": "
|
|
33
|
-
"@nrwl/js": "
|
|
34
|
-
"@nrwl/linter": "
|
|
35
|
-
"@phenomnomnominal/tsquery": "
|
|
31
|
+
"@nrwl/devkit": "16.0.0-beta.0",
|
|
32
|
+
"@nrwl/jest": "16.0.0-beta.0",
|
|
33
|
+
"@nrwl/js": "16.0.0-beta.0",
|
|
34
|
+
"@nrwl/linter": "16.0.0-beta.0",
|
|
35
|
+
"@phenomnomnominal/tsquery": "~5.0.1",
|
|
36
36
|
"dotenv": "~10.0.0",
|
|
37
37
|
"fs-extra": "^11.1.0",
|
|
38
38
|
"tslib": "^2.3.0"
|
|
@@ -40,5 +40,5 @@
|
|
|
40
40
|
"publishConfig": {
|
|
41
41
|
"access": "public"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "1e31d4726f2c623ede0c515429aa842e943dba47"
|
|
44
44
|
}
|
|
@@ -12,10 +12,12 @@ function normalizeOptions(host, options) {
|
|
|
12
12
|
const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.projectDirectory);
|
|
13
13
|
const { npmScope, appsDir: defaultAppsDir } = (0, devkit_1.getWorkspaceLayout)(host);
|
|
14
14
|
const appsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : defaultAppsDir;
|
|
15
|
-
const projectName = `${options.pluginName}-e2e`;
|
|
16
|
-
const projectRoot = projectDirectory
|
|
15
|
+
const projectName = options.rootProject ? 'e2e' : `${options.pluginName}-e2e`;
|
|
16
|
+
const projectRoot = projectDirectory && !options.rootProject
|
|
17
17
|
? (0, devkit_1.joinPathFragments)(appsDir, `${projectDirectory}-e2e`)
|
|
18
|
-
:
|
|
18
|
+
: options.rootProject
|
|
19
|
+
? projectName
|
|
20
|
+
: (0, devkit_1.joinPathFragments)(appsDir, projectName);
|
|
19
21
|
const pluginPropertyName = (0, devkit_1.names)(options.pluginName).propertyName;
|
|
20
22
|
return Object.assign(Object.assign({}, options), { minimal: (_a = options.minimal) !== null && _a !== void 0 ? _a : false, projectName, linter: (_b = options.linter) !== null && _b !== void 0 ? _b : linter_1.Linter.EsLint, pluginPropertyName,
|
|
21
23
|
projectRoot,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"e2e.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/e2e-project/e2e.ts"],"names":[],"mappings":";;;;AACA,yCAasB;AACtB,qCAAkD;AAClD,iCAAyD;AACzD,6BAA6B;AAG7B,yCAA4D;AAU5D,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IACnD,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAClE,OAAO,CAAC,gBAAgB,CACzB,CAAC;IACF,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IACvE,MAAM,OAAO,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,cAAc,CAAC;IAElD,MAAM,WAAW,GAAG,GAAG,OAAO,CAAC,UAAU,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"e2e.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/e2e-project/e2e.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ function addHasherFiles(host, options) {
|
|
|
19
19
|
function createExecutorsJson(host, options) {
|
|
20
20
|
(0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), (json) => {
|
|
21
21
|
var _a;
|
|
22
|
-
(_a = json.executors) !== null && _a !== void 0 ? _a : (json.executors = 'executors.json');
|
|
22
|
+
(_a = json.executors) !== null && _a !== void 0 ? _a : (json.executors = './executors.json');
|
|
23
23
|
return json;
|
|
24
24
|
});
|
|
25
25
|
(0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'executors.json'), {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/executor/executor.ts"],"names":[],"mappings":";;;;AAAA,yCAWsB;AAGtB,6BAA6B;AAY7B,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,IAAA,0BAAiB,EACf,OAAO,CAAC,iBAAiB,EACzB,WAAW,EACX,OAAO,CAAC,QAAQ,EAChB,kBAAkB,CACnB,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAS,cAAc,CAAC,IAAU,EAAE,OAAyB;IAC3D,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,EACtC,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,IAAA,0BAAiB,EACf,OAAO,CAAC,iBAAiB,EACzB,WAAW,EACX,OAAO,CAAC,QAAQ,EAChB,gBAAgB,CACjB,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAU,EAAE,OAAyB;IAChE,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,EACtD,CAAC,IAAI,EAAE,EAAE;;QACP,MAAA,IAAI,CAAC,SAAS,oCAAd,IAAI,CAAC,SAAS,GAAK,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/executor/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,7 +38,7 @@ function addFiles(host, options) {
|
|
|
38
38
|
function createGeneratorsJson(host, options) {
|
|
39
39
|
(0, devkit_2.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), (json) => {
|
|
40
40
|
var _a;
|
|
41
|
-
(_a = json.generators) !== null && _a !== void 0 ? _a : (json.generators = 'generators.json');
|
|
41
|
+
(_a = json.generators) !== null && _a !== void 0 ? _a : (json.generators = './generators.json');
|
|
42
42
|
return json;
|
|
43
43
|
});
|
|
44
44
|
(0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'generators.json'), {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/generator/generator.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,yCAQsB;AAEtB,6BAA6B;AAY7B,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,MAAM,cAAc,GAAG,IAAA,iBAAQ,EAC7B,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CACvC,CAAC,IAAI,CAAC;IAEP,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,YAAY,CAAC;KAC3C;IAED,uCACK,OAAO,KACV,QAAQ;QACR,SAAS;QACT,WAAW;QACX,WAAW;QACX,iBAAiB;QACjB,QAAQ;QACR,cAAc,IACd;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,MAAM,SAAS,GAAG,GAAG,OAAO,CAAC,iBAAiB,eAAe,OAAO,CAAC,QAAQ,iCAAiC,CAAC;IAE/G,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC3B,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,wCAAwC,CAAC,CAAC;KACjE;IAED,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,mBAAmB,CAAC,EACzC,GAAG,OAAO,CAAC,iBAAiB,aAAa,kCAEpC,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,YAAY,EACZ,OAAO,CAAC,QAAQ,EAChB,mBAAmB,CACpB,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAU,EAAE,OAAyB;IACjE,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,EACtD,CAAC,IAAI,EAAE,EAAE;;QACP,MAAA,IAAI,CAAC,UAAU,oCAAf,IAAI,CAAC,UAAU,GAAK,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/generator/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,15 +59,18 @@ function updateMigrationsJson(host, options) {
|
|
|
59
59
|
}
|
|
60
60
|
function updatePackageJson(host, options) {
|
|
61
61
|
(0, devkit_1.updateJson)(host, path.join(options.projectRoot, 'package.json'), (json) => {
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
}
|
|
62
|
+
const migrationKey = json['ng-update'] ? 'ng-update' : 'nx-migrations';
|
|
63
|
+
const preexistingValue = json[migrationKey];
|
|
64
|
+
if (typeof preexistingValue === 'string') {
|
|
65
|
+
return json;
|
|
66
|
+
}
|
|
67
|
+
else if (!json[migrationKey]) {
|
|
68
|
+
json[migrationKey] = {
|
|
69
|
+
migrations: './migrations.json',
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
else if (preexistingValue.migrations) {
|
|
73
|
+
preexistingValue.migrations = './migrations.json';
|
|
71
74
|
}
|
|
72
75
|
return json;
|
|
73
76
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migration.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/migration/migration.ts"],"names":[],"mappings":";;;;AAAA,yCAWsB;AAGtB,6BAA6B;AAC7B,wDAAkE;AAElE,
|
|
1
|
+
{"version":3,"file":"migration.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/migration/migration.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,7 @@ function addFiles(host, options) {
|
|
|
34
34
|
});
|
|
35
35
|
});
|
|
36
36
|
}
|
|
37
|
-
function
|
|
37
|
+
function updatePluginConfig(host, options) {
|
|
38
38
|
var _a;
|
|
39
39
|
var _b;
|
|
40
40
|
const project = (0, devkit_1.readProjectConfiguration)(host, options.name);
|
|
@@ -71,18 +71,19 @@ function pluginGenerator(host, schema) {
|
|
|
71
71
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
72
72
|
const options = (0, normalize_schema_1.normalizeOptions)(host, schema);
|
|
73
73
|
yield (0, js_1.libraryGenerator)(host, Object.assign(Object.assign({}, schema), { config: 'project', bundler: options.bundler, importPath: options.npmPackageName, skipFormat: true }));
|
|
74
|
-
(0, devkit_1.addDependenciesToPackageJson)(host, {
|
|
74
|
+
(0, devkit_1.addDependenciesToPackageJson)(host, {
|
|
75
75
|
'@nrwl/devkit': versions_2.nxVersion,
|
|
76
|
+
tslib: versions_2.tsLibVersion,
|
|
77
|
+
}, {
|
|
76
78
|
'@nrwl/jest': versions_2.nxVersion,
|
|
77
79
|
'@nrwl/js': versions_2.nxVersion,
|
|
78
80
|
'@swc-node/register': versions_1.swcNodeVersion,
|
|
79
|
-
tslib: versions_2.tsLibVersion,
|
|
80
81
|
});
|
|
81
82
|
// Ensures Swc Deps are installed to handle running
|
|
82
83
|
// local plugin generators and executors
|
|
83
84
|
(0, add_swc_dependencies_1.addSwcDependencies)(host);
|
|
84
85
|
yield addFiles(host, options);
|
|
85
|
-
|
|
86
|
+
updatePluginConfig(host, options);
|
|
86
87
|
if (options.e2eTestRunner !== 'none') {
|
|
87
88
|
yield (0, e2e_1.e2eProjectGenerator)(host, {
|
|
88
89
|
pluginName: options.name,
|
|
@@ -91,6 +92,7 @@ function pluginGenerator(host, schema) {
|
|
|
91
92
|
npmPackageName: options.npmPackageName,
|
|
92
93
|
minimal: (_a = options.minimal) !== null && _a !== void 0 ? _a : false,
|
|
93
94
|
skipFormat: true,
|
|
95
|
+
rootProject: options.rootProject,
|
|
94
96
|
});
|
|
95
97
|
}
|
|
96
98
|
if (options.linter === linter_1.Linter.EsLint && !options.skipLintChecks) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/plugin/plugin.ts"],"names":[],"mappings":";;;;AAAA,yCAUsB;AACtB,iCAAkE;AAClE,sFAAiF;AACjF,yCAAsC;AACtC,oDAAuD;AACvD,6BAA6B;AAE7B,mDAA+D;AAC/D,4CAAyD;AACzD,mDAAyD;AACzD,sDAA4D;AAC5D,wDAAgE;AAChE,+DAA8E;AAI9E,SAAe,QAAQ,CAAC,IAAU,EAAE,OAAyB;;QAC3D,IAAI,CAAC,MAAM,CAAC,IAAA,sBAAa,EAAC,GAAG,OAAO,CAAC,WAAW,UAAU,CAAC,CAAC,CAAC;QAE7D,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,EACtC,OAAO,CAAC,WAAW,kCAEd,OAAO,KACV,IAAI,EAAE,EAAE,IAEX,CAAC;QAEF,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,OAAO;SACR;QACD,MAAM,IAAA,8BAAkB,EAAC,IAAI,EAAE;YAC7B,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,cAAc,EAAE,OAAO,CAAC,cAAc;SACvC,CAAC,CAAC;QACH,MAAM,IAAA,4BAAiB,EAAC,IAAI,EAAE;YAC5B,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,IAAI,EAAE,OAAO;YACb,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,aAAa,EAAE,KAAK;SACrB,CAAC,CAAC;IACL,CAAC;CAAA;AAED,SAAS,
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/plugin/plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,8 +10,12 @@ function normalizeOptions(host, options) {
|
|
|
10
10
|
const name = (0, devkit_1.names)(options.name).fileName;
|
|
11
11
|
const fullProjectDirectory = projectDirectory
|
|
12
12
|
? `${(0, devkit_1.names)(projectDirectory).fileName}/${name}`
|
|
13
|
-
:
|
|
14
|
-
|
|
13
|
+
: options.rootProject
|
|
14
|
+
? '.'
|
|
15
|
+
: name;
|
|
16
|
+
const projectName = options.rootProject
|
|
17
|
+
? name
|
|
18
|
+
: fullProjectDirectory.replace(new RegExp('/', 'g'), '-');
|
|
15
19
|
const fileName = projectName;
|
|
16
20
|
const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, fullProjectDirectory);
|
|
17
21
|
const parsedTags = options.tags
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-schema.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/generators/plugin/utils/normalize-schema.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AActB,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAClE,OAAO,CAAC,SAAS,CAClB,CAAC;IACF,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IACvE,MAAM,OAAO,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,cAAc,CAAC;IAClD,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,oBAAoB,GAAG,gBAAgB;QAC3C,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,gBAAgB,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;QAC/C,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,WAAW,GAAG,oBAAoB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"normalize-schema.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/generators/plugin/utils/normalize-schema.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AActB,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAClE,OAAO,CAAC,SAAS,CAClB,CAAC;IACF,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IACvE,MAAM,OAAO,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,cAAc,CAAC;IAClD,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,oBAAoB,GAAG,gBAAgB;QAC3C,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,gBAAgB,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;QAC/C,CAAC,CAAC,OAAO,CAAC,WAAW;YACrB,CAAC,CAAC,GAAG;YACL,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW;QACrC,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IAC5D,MAAM,QAAQ,GAAG,WAAW,CAAC;IAC7B,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;IAErE,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU,IAAI,IAAA,sBAAa,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAE3E,uCACK,OAAO,KACV,OAAO,EAAE,MAAA,OAAO,CAAC,QAAQ,mCAAI,KAAK,EAClC,QAAQ;QACR,QAAQ;QACR,OAAO,EACP,IAAI,EAAE,WAAW,EACjB,WAAW,EACX,gBAAgB,EAAE,oBAAoB,EACtC,UAAU;QACV,cAAc,IACd;AACJ,CAAC;AAxCD,4CAwCC"}
|
|
@@ -0,0 +1,39 @@
|
|
|
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 linter_1 = require("@nrwl/linter");
|
|
6
|
+
const plugin_1 = require("../plugin/plugin");
|
|
7
|
+
function default_1(tree, options) {
|
|
8
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
+
const task = yield (0, plugin_1.pluginGenerator)(tree, {
|
|
10
|
+
compiler: 'tsc',
|
|
11
|
+
linter: linter_1.Linter.EsLint,
|
|
12
|
+
name: options.pluginName.includes('/')
|
|
13
|
+
? options.pluginName.split('/')[1]
|
|
14
|
+
: options.pluginName,
|
|
15
|
+
skipFormat: false,
|
|
16
|
+
skipLintChecks: false,
|
|
17
|
+
skipTsConfig: false,
|
|
18
|
+
unitTestRunner: 'jest',
|
|
19
|
+
importPath: options.pluginName,
|
|
20
|
+
rootProject: true,
|
|
21
|
+
});
|
|
22
|
+
removeNpmScope(tree);
|
|
23
|
+
moveNxPluginToDevDeps(tree);
|
|
24
|
+
return task;
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
exports.default = default_1;
|
|
28
|
+
function removeNpmScope(tree) {
|
|
29
|
+
(0, devkit_1.updateNxJson)(tree, Object.assign(Object.assign({}, (0, devkit_1.readNxJson)(tree)), { npmScope: undefined }));
|
|
30
|
+
}
|
|
31
|
+
function moveNxPluginToDevDeps(tree) {
|
|
32
|
+
(0, devkit_1.updateJson)(tree, 'package.json', (json) => {
|
|
33
|
+
const nxPluginEntry = json.dependencies['@nrwl/nx-plugin'];
|
|
34
|
+
delete json.dependencies['@nrwl/nx-plugin'];
|
|
35
|
+
json.devDependencies['@nrwl/nx-plugin'] = nxPluginEntry;
|
|
36
|
+
return json;
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
//# sourceMappingURL=generator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/preset/generator.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AACtB,yCAAsC;AAEtC,6CAAmD;AAGnD,mBAA+B,IAAU,EAAE,OAA8B;;QACvE,MAAM,IAAI,GAAG,MAAM,IAAA,wBAAe,EAAC,IAAI,EAAE;YACvC,QAAQ,EAAE,KAAK;YACf,MAAM,EAAE,eAAM,CAAC,MAAM;YACrB,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC;gBACpC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAClC,CAAC,CAAC,OAAO,CAAC,UAAU;YACtB,UAAU,EAAE,KAAK;YACjB,cAAc,EAAE,KAAK;YACrB,YAAY,EAAE,KAAK;YACnB,cAAc,EAAE,MAAM;YACtB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QAEH,cAAc,CAAC,IAAI,CAAC,CAAC;QACrB,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAE5B,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AAnBD,4BAmBC;AAED,SAAS,cAAc,CAAC,IAAU;IAChC,IAAA,qBAAY,EAAC,IAAI,kCAAO,IAAA,mBAAU,EAAC,IAAI,CAAC,KAAE,QAAQ,EAAE,SAAS,IAAG,CAAC;AACnE,CAAC;AACD,SAAS,qBAAqB,CAAC,IAAU;IACvC,IAAA,mBAAU,EAAc,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;QACrD,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;QAC5C,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,GAAG,aAAa,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "http://json-schema.org/schema",
|
|
3
|
+
"cli": "nx",
|
|
4
|
+
"$id": "NxPluginPreset",
|
|
5
|
+
"title": "Generator ran by create-nx-plugin",
|
|
6
|
+
"description": "Initializes a workspace with an nx-plugin inside of it. Use as: `create-nx-plugin` or `create-nx-workspace --preset @nrwl/nx-plugin`.",
|
|
7
|
+
"type": "object",
|
|
8
|
+
"properties": {
|
|
9
|
+
"pluginName": {
|
|
10
|
+
"type": "string",
|
|
11
|
+
"description": "Plugin name",
|
|
12
|
+
"aliases": ["name"]
|
|
13
|
+
}
|
|
14
|
+
},
|
|
15
|
+
"required": ["pluginName"]
|
|
16
|
+
}
|