@nx/plugin 16.0.0-beta.8 → 16.0.0-rc.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/package.json +7 -7
- package/src/generators/create-package/create-package.js +0 -3
- package/src/generators/create-package/create-package.js.map +1 -1
- package/src/generators/create-package/files/create-framework-package/bin/index.ts__tmpl__ +7 -6
- package/src/generators/create-package/files/e2e/__name__.spec.ts__tmpl__ +1 -2
- package/src/generators/create-package/schema.json +1 -0
- package/src/generators/e2e-project/files/tests/__pluginName__.spec.ts__tmpl__ +3 -4
- package/src/utils/testing-utils/commands.js +2 -1
- package/src/utils/testing-utils/commands.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/plugin",
|
|
3
|
-
"version": "16.0.0-
|
|
3
|
+
"version": "16.0.0-rc.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/nx-plugin": "16.0.0-
|
|
32
|
-
"@nx/devkit": "16.0.0-
|
|
33
|
-
"@nx/jest": "16.0.0-
|
|
34
|
-
"@nx/js": "16.0.0-
|
|
35
|
-
"@nx/linter": "16.0.0-
|
|
31
|
+
"@nrwl/nx-plugin": "16.0.0-rc.0",
|
|
32
|
+
"@nx/devkit": "16.0.0-rc.0",
|
|
33
|
+
"@nx/jest": "16.0.0-rc.0",
|
|
34
|
+
"@nx/js": "16.0.0-rc.0",
|
|
35
|
+
"@nx/linter": "16.0.0-rc.0",
|
|
36
36
|
"@phenomnomnominal/tsquery": "~5.0.1",
|
|
37
37
|
"dotenv": "~10.0.0",
|
|
38
38
|
"fs-extra": "^11.1.0",
|
|
@@ -41,5 +41,5 @@
|
|
|
41
41
|
"publishConfig": {
|
|
42
42
|
"access": "public"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "19e34df1cd3e286cacc9e73781cbb8fbbcd6fc69"
|
|
45
45
|
}
|
|
@@ -19,9 +19,6 @@ function createPackageGenerator(host, schema) {
|
|
|
19
19
|
}, {});
|
|
20
20
|
tasks.push(installTask);
|
|
21
21
|
yield createCliPackage(host, options, pluginPackageName);
|
|
22
|
-
if (options.e2eTestRunner !== 'none') {
|
|
23
|
-
tasks.push(yield addE2eProject(host, options));
|
|
24
|
-
}
|
|
25
22
|
if (!options.skipFormat) {
|
|
26
23
|
yield (0, devkit_1.formatFiles)(host);
|
|
27
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-package.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/create-package/create-package.ts"],"names":[],"mappings":";;;;AAAA,uCAaoB;AACpB,+BAAgE;AAChE,oDAAkD;AAClD,sDAAwD;AAExD,+DAA6E;AAC7E,4CAAqD;AACrD,6DAAyD;AAEzD,SAAsB,sBAAsB,CAC1C,IAAU,EACV,MAA2B;;QAE3B,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,MAAM,OAAO,GAAG,IAAA,kCAAe,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC9C,MAAM,iBAAiB,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAElE,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ;YACE,qBAAqB,EAAE,oBAAS;SACjC,EACD,EAAE,CACH,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAExB,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"create-package.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/create-package/create-package.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,17 +10,18 @@ async function main() {
|
|
|
10
10
|
|
|
11
11
|
console.log(`Creating the workspace: ${name}`);
|
|
12
12
|
|
|
13
|
+
// This assumes "<%= preset %>" and "<%= projectName %>" are at the same version
|
|
14
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
15
|
+
const presetVersion = require('../package.json').version,
|
|
16
|
+
|
|
13
17
|
// TODO: update below to customize the workspace
|
|
14
|
-
const { directory } = await createWorkspace(
|
|
15
|
-
name,
|
|
18
|
+
const { directory } = await createWorkspace(`<%= preset %>@${presetVersion}`, {
|
|
19
|
+
name,
|
|
16
20
|
nxCloud: false,
|
|
17
21
|
packageManager: 'npm',
|
|
18
|
-
// This assumes "<%= preset %>" and "<%= projectName %>" are at the same version
|
|
19
|
-
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
20
|
-
presetVersion: require('../package.json').version,
|
|
21
22
|
});
|
|
22
23
|
|
|
23
24
|
console.log(`Successfully created the workspace: ${directory}.`);
|
|
24
25
|
}
|
|
25
26
|
|
|
26
|
-
main();
|
|
27
|
+
main();
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import {
|
|
2
|
-
uniq,
|
|
3
2
|
runCreatePackageCli,
|
|
4
3
|
removeTmpProject,
|
|
5
4
|
} from '@nx/plugin/testing';
|
|
6
5
|
|
|
7
6
|
describe('<%= name %> e2e', () => {
|
|
8
|
-
const project =
|
|
7
|
+
const project = '<%= name %>';
|
|
9
8
|
let createPackageResult;
|
|
10
9
|
|
|
11
10
|
beforeAll(async () => {
|
|
@@ -4,7 +4,6 @@ import {
|
|
|
4
4
|
readJson,
|
|
5
5
|
runNxCommandAsync,
|
|
6
6
|
runNxCommand,
|
|
7
|
-
uniq,
|
|
8
7
|
} from '@nx/plugin/testing';
|
|
9
8
|
|
|
10
9
|
describe('<%= pluginName %> e2e', () => {
|
|
@@ -18,17 +17,17 @@ describe('<%= pluginName %> e2e', () => {
|
|
|
18
17
|
ensureNxProject('<%= npmPackageName %>', '<%= pluginOutputPath %>');
|
|
19
18
|
});
|
|
20
19
|
|
|
21
|
-
afterAll(() => {
|
|
20
|
+
afterAll(async () => {
|
|
22
21
|
// `nx reset` kills the daemon, and performs
|
|
23
22
|
// some work which can help clean up e2e leftovers
|
|
24
|
-
runNxCommandAsync('reset');
|
|
23
|
+
await runNxCommandAsync('reset');
|
|
25
24
|
});
|
|
26
25
|
|
|
27
26
|
|
|
28
27
|
// Add some tests here to check that your plugin functionality works as expected.
|
|
29
28
|
// A sample test is included below to give you some ideas.
|
|
30
29
|
xit('should be able to build generated projects', async () => {
|
|
31
|
-
const name =
|
|
30
|
+
const name = 'proj';
|
|
32
31
|
const generator = 'PLACEHOLDER';
|
|
33
32
|
await runNxCommandAsync(`generate <%= npmPackageName %>:${generator} --name ${name}`);
|
|
34
33
|
expect(() => runNxCommand('build ${proj}')).not.toThrow();
|
|
@@ -16,8 +16,9 @@ function runNxCommand(command, opts = {
|
|
|
16
16
|
silenceError: false,
|
|
17
17
|
}) {
|
|
18
18
|
function _runNxCommand(c) {
|
|
19
|
+
var _a;
|
|
19
20
|
const execSyncOptions = {
|
|
20
|
-
cwd: opts.cwd,
|
|
21
|
+
cwd: (_a = opts.cwd) !== null && _a !== void 0 ? _a : (0, paths_1.tmpProjPath)(),
|
|
21
22
|
env: Object.assign(Object.assign({}, process.env), opts.env),
|
|
22
23
|
};
|
|
23
24
|
if ((0, utils_1.fileExists)((0, paths_1.tmpProjPath)('package.json'))) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/utils/testing-utils/commands.ts"],"names":[],"mappings":";;;AAAA,iDAAsD;AACtD,mCAAsC;AACtC,uCAAsD;AACtD,mCAAqC;AAErC;;;;;;GAMG;AACH,SAAgB,YAAY,CAC1B,OAAgB,EAChB,OAA0E;IACxE,YAAY,EAAE,KAAK;CACpB;IAED,SAAS,aAAa,CAAC,CAAC
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/utils/testing-utils/commands.ts"],"names":[],"mappings":";;;AAAA,iDAAsD;AACtD,mCAAsC;AACtC,uCAAsD;AACtD,mCAAqC;AAErC;;;;;;GAMG;AACH,SAAgB,YAAY,CAC1B,OAAgB,EAChB,OAA0E;IACxE,YAAY,EAAE,KAAK;CACpB;IAED,SAAS,aAAa,CAAC,CAAC;;QACtB,MAAM,eAAe,GAAgB;YACnC,GAAG,EAAE,MAAA,IAAI,CAAC,GAAG,mCAAI,IAAA,mBAAW,GAAE;YAC9B,GAAG,kCAAO,OAAO,CAAC,GAAG,GAAK,IAAI,CAAC,GAAG,CAAE;SACrC,CAAC;QACF,IAAI,IAAA,kBAAU,EAAC,IAAA,mBAAW,EAAC,cAAc,CAAC,CAAC,EAAE;YAC3C,MAAM,GAAG,GAAG,IAAA,iCAAwB,GAAE,CAAC;YACvC,OAAO,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,IAAI,OAAO,OAAO,EAAE,EAAE,eAAe,CAAC,CAAC;SAC/D;aAAM,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;YACvC,OAAO,IAAA,wBAAQ,EAAC,aAAa,OAAO,EAAE,EAAE,eAAe,CAAC,CAAC;SAC1D;aAAM;YACL,OAAO,IAAA,wBAAQ,EAAC,SAAS,OAAO,EAAE,EAAE,eAAe,CAAC,CAAC;SACtD;IACH,CAAC;IAED,IAAI;QACF,OAAO,aAAa,CAAC,OAAO,CAAC;aAC1B,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;AApCD,oCAoCC;AAED,SAAgB,UAAU,CACxB,OAAe,EACf,IAA+C;;IAE/C,IAAI;QACF,OAAO,IAAA,wBAAQ,EAAC,OAAO,EAAE;YACvB,GAAG,EAAE,MAAA,IAAI,CAAC,GAAG,mCAAI,IAAA,mBAAW,GAAE;YAC9B,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;YAC/B,GAAG,kCAAO,OAAO,CAAC,GAAG,GAAK,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG,CAAE;SACtC,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;AAbD,gCAaC"}
|