@nrwl/workspace 15.4.0-beta.1 → 15.4.0-beta.3
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +1 -1
- package/package.json +29 -29
- package/src/generators/convert-to-nx-project/convert-to-nx-project.js +4 -4
- package/src/generators/convert-to-nx-project/convert-to-nx-project.js.map +1 -1
- package/src/generators/new/generate-preset.js +3 -24
- package/src/generators/new/generate-preset.js.map +1 -1
- package/src/generators/new/new.js +5 -1
- package/src/generators/new/new.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
|
-
# [15.4.0-beta.
|
|
6
|
+
# [15.4.0-beta.3](https://github.com/nrwl/nx/compare/15.3.3...15.4.0-beta.3) (2022-12-19)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/workspace
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/workspace",
|
|
3
|
-
"version": "15.4.0-beta.
|
|
3
|
+
"version": "15.4.0-beta.3",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
|
|
6
6
|
"repository": {
|
|
@@ -33,31 +33,31 @@
|
|
|
33
33
|
"requirements": {},
|
|
34
34
|
"migrations": "./migrations.json",
|
|
35
35
|
"packageGroup": {
|
|
36
|
-
"@nrwl/angular": "15.4.0-beta.
|
|
37
|
-
"@nrwl/cli": "15.4.0-beta.
|
|
38
|
-
"@nrwl/cypress": "15.4.0-beta.
|
|
39
|
-
"@nrwl/detox": "15.4.0-beta.
|
|
40
|
-
"@nrwl/devkit": "15.4.0-beta.
|
|
41
|
-
"@nrwl/esbuild": "15.4.0-beta.
|
|
42
|
-
"@nrwl/eslint-plugin-nx": "15.4.0-beta.
|
|
43
|
-
"@nrwl/expo": "15.4.0-beta.
|
|
44
|
-
"@nrwl/express": "15.4.0-beta.
|
|
45
|
-
"@nrwl/jest": "15.4.0-beta.
|
|
46
|
-
"@nrwl/js": "15.4.0-beta.
|
|
47
|
-
"@nrwl/linter": "15.4.0-beta.
|
|
48
|
-
"@nrwl/nest": "15.4.0-beta.
|
|
49
|
-
"@nrwl/next": "15.4.0-beta.
|
|
50
|
-
"@nrwl/node": "15.4.0-beta.
|
|
36
|
+
"@nrwl/angular": "15.4.0-beta.3",
|
|
37
|
+
"@nrwl/cli": "15.4.0-beta.3",
|
|
38
|
+
"@nrwl/cypress": "15.4.0-beta.3",
|
|
39
|
+
"@nrwl/detox": "15.4.0-beta.3",
|
|
40
|
+
"@nrwl/devkit": "15.4.0-beta.3",
|
|
41
|
+
"@nrwl/esbuild": "15.4.0-beta.3",
|
|
42
|
+
"@nrwl/eslint-plugin-nx": "15.4.0-beta.3",
|
|
43
|
+
"@nrwl/expo": "15.4.0-beta.3",
|
|
44
|
+
"@nrwl/express": "15.4.0-beta.3",
|
|
45
|
+
"@nrwl/jest": "15.4.0-beta.3",
|
|
46
|
+
"@nrwl/js": "15.4.0-beta.3",
|
|
47
|
+
"@nrwl/linter": "15.4.0-beta.3",
|
|
48
|
+
"@nrwl/nest": "15.4.0-beta.3",
|
|
49
|
+
"@nrwl/next": "15.4.0-beta.3",
|
|
50
|
+
"@nrwl/node": "15.4.0-beta.3",
|
|
51
51
|
"@nrwl/nx-cloud": "latest",
|
|
52
|
-
"@nrwl/nx-plugin": "15.4.0-beta.
|
|
53
|
-
"@nrwl/react": "15.4.0-beta.
|
|
54
|
-
"@nrwl/react-native": "15.4.0-beta.
|
|
55
|
-
"@nrwl/rollup": "15.4.0-beta.
|
|
56
|
-
"@nrwl/storybook": "15.4.0-beta.
|
|
57
|
-
"@nrwl/tao": "15.4.0-beta.
|
|
58
|
-
"@nrwl/web": "15.4.0-beta.
|
|
59
|
-
"@nrwl/webpack": "15.4.0-beta.
|
|
60
|
-
"nx": "15.4.0-beta.
|
|
52
|
+
"@nrwl/nx-plugin": "15.4.0-beta.3",
|
|
53
|
+
"@nrwl/react": "15.4.0-beta.3",
|
|
54
|
+
"@nrwl/react-native": "15.4.0-beta.3",
|
|
55
|
+
"@nrwl/rollup": "15.4.0-beta.3",
|
|
56
|
+
"@nrwl/storybook": "15.4.0-beta.3",
|
|
57
|
+
"@nrwl/tao": "15.4.0-beta.3",
|
|
58
|
+
"@nrwl/web": "15.4.0-beta.3",
|
|
59
|
+
"@nrwl/webpack": "15.4.0-beta.3",
|
|
60
|
+
"nx": "15.4.0-beta.3"
|
|
61
61
|
}
|
|
62
62
|
},
|
|
63
63
|
"peerDependencies": {
|
|
@@ -69,8 +69,8 @@
|
|
|
69
69
|
}
|
|
70
70
|
},
|
|
71
71
|
"dependencies": {
|
|
72
|
-
"@nrwl/devkit": "15.4.0-beta.
|
|
73
|
-
"@nrwl/linter": "15.4.0-beta.
|
|
72
|
+
"@nrwl/devkit": "15.4.0-beta.3",
|
|
73
|
+
"@nrwl/linter": "15.4.0-beta.3",
|
|
74
74
|
"@parcel/watcher": "2.0.4",
|
|
75
75
|
"chalk": "4.1.0",
|
|
76
76
|
"chokidar": "^3.5.1",
|
|
@@ -86,7 +86,7 @@
|
|
|
86
86
|
"jsonc-parser": "3.2.0",
|
|
87
87
|
"minimatch": "3.0.5",
|
|
88
88
|
"npm-run-path": "^4.0.1",
|
|
89
|
-
"nx": "15.4.0-beta.
|
|
89
|
+
"nx": "15.4.0-beta.3",
|
|
90
90
|
"open": "^8.4.0",
|
|
91
91
|
"rxjs": "^6.5.4",
|
|
92
92
|
"semver": "7.3.4",
|
|
@@ -99,5 +99,5 @@
|
|
|
99
99
|
"access": "public"
|
|
100
100
|
},
|
|
101
101
|
"types": "./index.d.ts",
|
|
102
|
-
"gitHead": "
|
|
102
|
+
"gitHead": "37dc336a0a618ba8decdbbfe95285f477de45f7d"
|
|
103
103
|
}
|
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.validateSchema = exports.SCHEMA_OPTIONS_ARE_MUTUALLY_EXCLUSIVE = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const path_1 = require("path");
|
|
6
|
-
const enquirer_1 = require("enquirer");
|
|
7
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const enquirer_1 = require("enquirer");
|
|
7
|
+
const project_configuration_1 = require("nx/src/generators/utils/project-configuration");
|
|
8
|
+
const path_1 = require("path");
|
|
8
9
|
const get_project_configuration_path_1 = require("./utils/get-project-configuration-path");
|
|
9
10
|
exports.SCHEMA_OPTIONS_ARE_MUTUALLY_EXCLUSIVE = '--project and --all are mutually exclusive';
|
|
10
11
|
function validateSchema(schema) {
|
|
@@ -44,8 +45,7 @@ To upgrade change the version number at the top of ${(0, devkit_1.getWorkspacePa
|
|
|
44
45
|
devkit_1.logger.warn(`Skipping ${project} since ${configPath} already exists.`);
|
|
45
46
|
continue;
|
|
46
47
|
}
|
|
47
|
-
|
|
48
|
-
(0, devkit_1.writeJson)(host, configPath, configuration);
|
|
48
|
+
(0, devkit_1.writeJson)(host, configPath, Object.assign(Object.assign({ $schema: (0, project_configuration_1.getRelativeProjectJsonSchemaPath)(host, configuration) }, configuration), { root: undefined }));
|
|
49
49
|
(0, devkit_1.updateJson)(host, (0, devkit_1.getWorkspacePath)(host), (value) => {
|
|
50
50
|
value.projects[project] = (0, devkit_1.normalizePath)((0, path_1.dirname)(configPath));
|
|
51
51
|
return value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-to-nx-project.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/convert-to-nx-project/convert-to-nx-project.ts"],"names":[],"mappings":";;;;AAAA,+BAA+B;
|
|
1
|
+
{"version":3,"file":"convert-to-nx-project.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/convert-to-nx-project/convert-to-nx-project.ts"],"names":[],"mappings":";;;;AAAA,yCAasB;AACtB,uCAAkC;AAClC,yFAAiG;AACjG,+BAA+B;AAE/B,2FAAqF;AAExE,QAAA,qCAAqC,GAChD,4CAA4C,CAAC;AAE/C,SAAsB,cAAc,CAAC,MAAc;;QACjD,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE;YAChC,MAAM,6CAAqC,CAAC;SAC7C;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;YAClC,MAAM,CAAC,OAAO,GAAG,CACf,MAAM,IAAA,iBAAM,EAAsB;gBAChC;oBACE,OAAO,EAAE,mCAAmC;oBAC5C,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,SAAS;iBAChB;aACF,CAAC,CACH,CAAC,OAAO,CAAC;SACX;IACH,CAAC;CAAA;AAhBD,wCAgBC;AAED,SAAsB,2BAA2B,CAAC,IAAU,EAAE,MAAc;;QAC1E,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;QACnD,IAAI,SAAS,CAAC,OAAO,GAAG,CAAC,EAAE;YACzB,eAAM,CAAC,KAAK,CAAC;;qDAEoC,IAAA,yBAAgB,EAC/D,IAAI,CACL;CACJ,CAAC,CAAC;YACC,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;SACjC;QAED,MAAM,cAAc,CAAC,MAAM,CAAC,CAAC;QAE7B,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG;YACzB,CAAC,CAAC,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE;YAC7B,CAAC,CAAE,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAG9D,CAAC;QAET,KAAK,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,QAAQ,EAAE;YAC/C,MAAM,UAAU,GAAG,IAAA,4DAA2B,EAAC,aAAa,CAAC,CAAC;YAC9D,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;gBAC3B,eAAM,CAAC,IAAI,CAAC,YAAY,OAAO,UAAU,UAAU,kBAAkB,CAAC,CAAC;gBACvE,SAAS;aACV;YAED,IAAA,kBAAS,EAAC,IAAI,EAAE,UAAU,gCACxB,OAAO,EAAE,IAAA,wDAAgC,EAAC,IAAI,EAAE,aAAa,CAAC,IAC3D,aAAa,KAChB,IAAI,EAAE,SAAS,IACf,CAAC;YAEH,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,yBAAgB,EAAC,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE;gBACjD,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,IAAA,sBAAa,EAAC,IAAA,cAAO,EAAC,UAAU,CAAC,CAAC,CAAC;gBAC7D,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AA3CD,kEA2CC;AAED,kBAAe,2BAA2B,CAAC;AAE9B,QAAA,2BAA2B,GAAG,IAAA,2BAAkB,EAC3D,2BAA2B,CAC5B,CAAC"}
|
|
@@ -27,7 +27,7 @@ function generatePreset(host, opts) {
|
|
|
27
27
|
},
|
|
28
28
|
});
|
|
29
29
|
const spawnOptions = {
|
|
30
|
-
stdio:
|
|
30
|
+
stdio: 'inherit',
|
|
31
31
|
shell: true,
|
|
32
32
|
cwd: (0, path_1.join)(host.root, opts.directory),
|
|
33
33
|
};
|
|
@@ -46,11 +46,8 @@ function generatePreset(host, opts) {
|
|
|
46
46
|
});
|
|
47
47
|
});
|
|
48
48
|
function getPresetArgs(options) {
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
return getDefaultArgs(options);
|
|
52
|
-
}
|
|
53
|
-
return getThirdPartyPresetArgs();
|
|
49
|
+
// supported presets
|
|
50
|
+
return getDefaultArgs(options);
|
|
54
51
|
}
|
|
55
52
|
function getDefaultArgs(opts) {
|
|
56
53
|
return [
|
|
@@ -65,24 +62,6 @@ function generatePreset(host, opts) {
|
|
|
65
62
|
parsedArgs.interactive ? '--interactive=true' : '--interactive=false',
|
|
66
63
|
].filter((e) => !!e);
|
|
67
64
|
}
|
|
68
|
-
function getThirdPartyPresetArgs() {
|
|
69
|
-
const thirdPartyPkgArgs = Object.entries(opts).reduce((acc, [key, value]) => {
|
|
70
|
-
if (value === true) {
|
|
71
|
-
acc.push(`--${key}`);
|
|
72
|
-
}
|
|
73
|
-
else if (value === false) {
|
|
74
|
-
acc.push(`--no-${key}`);
|
|
75
|
-
// nxWorkspaceRoot breaks CLI if incorrectly set, so need to exclude it.
|
|
76
|
-
// TODO(jack): Should read in the preset schema and only pass the options specified.
|
|
77
|
-
}
|
|
78
|
-
else if (key !== 'nxWorkspaceRoot') {
|
|
79
|
-
// string, number (don't handle arrays or nested objects)
|
|
80
|
-
acc.push(`--${key}=${value}`);
|
|
81
|
-
}
|
|
82
|
-
return acc;
|
|
83
|
-
}, []);
|
|
84
|
-
return [`g`, `${opts.preset}:preset`, ...thirdPartyPkgArgs];
|
|
85
|
-
}
|
|
86
65
|
}
|
|
87
66
|
exports.generatePreset = generatePreset;
|
|
88
67
|
function getPresetDependencies(preset, version) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-preset.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AACtB,8CAA0C;AAC1C,mDAAiD;AACjD,8EAAwE;AAExE,+BAA4B;AAC5B,4CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"generate-preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-preset.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,11 +13,15 @@ function newGenerator(host, options) {
|
|
|
13
13
|
validateOptions(options, host);
|
|
14
14
|
yield (0, generate_workspace_files_1.generateWorkspaceFiles)(host, Object.assign(Object.assign({}, options), { nxCloud: undefined }));
|
|
15
15
|
(0, generate_preset_1.addPresetDependencies)(host, options);
|
|
16
|
+
const isCustomPreset = !Object.values(presets_1.Preset).includes(options.preset);
|
|
16
17
|
addCloudDependencies(host, options);
|
|
17
18
|
yield (0, devkit_1.formatFiles)(host);
|
|
18
19
|
return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
19
20
|
(0, devkit_1.installPackagesTask)(host, false, options.directory, options.packageManager);
|
|
20
|
-
|
|
21
|
+
// TODO: move all of these into create-nx-workspace
|
|
22
|
+
if (options.preset !== presets_1.Preset.NPM &&
|
|
23
|
+
options.preset !== presets_1.Preset.Core &&
|
|
24
|
+
!isCustomPreset) {
|
|
21
25
|
yield (0, generate_preset_1.generatePreset)(host, options);
|
|
22
26
|
}
|
|
23
27
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":";;;;AAAA,yCAQsB;AAEtB,+BAA4B;AAC5B,8CAA0C;AAE1C,yEAAoE;AACpE,uDAA0E;AAoB1E,SAAsB,YAAY,CAAC,IAAU,EAAE,OAAe;;QAC5D,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACpC,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAE/B,MAAM,IAAA,iDAAsB,EAAC,IAAI,EAAE,gCAAK,OAAO,KAAE,OAAO,EAAE,SAAS,GAAS,CAAC,CAAC;QAE9E,IAAA,uCAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACrC,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEpC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,GAAS,EAAE;YAChB,IAAA,4BAAmB,EAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;YAC5E,
|
|
1
|
+
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":"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"}
|