@nx/devkit 16.9.0-beta.3 → 16.9.0-beta.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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/devkit",
|
|
3
|
-
"version": "16.9.0-beta.
|
|
3
|
+
"version": "16.9.0-beta.4",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Nx Devkit is used to customize Nx for different technologies and use cases. It contains many utility functions for reading and writing files, updating configuration, working with Abstract Syntax Trees(ASTs), and more.",
|
|
6
6
|
"repository": {
|
|
@@ -28,13 +28,13 @@
|
|
|
28
28
|
},
|
|
29
29
|
"homepage": "https://nx.dev",
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@nrwl/devkit": "16.9.0-beta.3",
|
|
32
31
|
"ejs": "^3.1.7",
|
|
33
32
|
"enquirer": "~2.3.6",
|
|
34
33
|
"ignore": "^5.0.4",
|
|
35
|
-
"semver": "7.5.3",
|
|
36
34
|
"tmp": "~0.2.1",
|
|
37
|
-
"tslib": "^2.3.0"
|
|
35
|
+
"tslib": "^2.3.0",
|
|
36
|
+
"semver": "7.5.3",
|
|
37
|
+
"@nrwl/devkit": "*"
|
|
38
38
|
},
|
|
39
39
|
"peerDependencies": {
|
|
40
40
|
"nx": ">= 15 <= 17"
|
|
@@ -45,6 +45,5 @@
|
|
|
45
45
|
"nx-migrations": {
|
|
46
46
|
"migrations": "./migrations.json"
|
|
47
47
|
},
|
|
48
|
-
"type": "commonjs"
|
|
49
|
-
"gitHead": "d5692528c089a75c76b21d2d1235d8cc5dbb1d26"
|
|
48
|
+
"type": "commonjs"
|
|
50
49
|
}
|
|
@@ -12,12 +12,7 @@ const deprecationWarning = stripIndents `
|
|
|
12
12
|
async function determineProjectNameAndRootOptions(tree, options) {
|
|
13
13
|
validateName(options.name, options.projectNameAndRootFormat);
|
|
14
14
|
const formats = getProjectNameAndRootFormats(tree, options);
|
|
15
|
-
const configuredDefault = getDefaultProjectNameAndRootFormat(tree);
|
|
16
|
-
if (configuredDefault === 'derived') {
|
|
17
|
-
logger.warn(deprecationWarning + '\n' + getExample(options.callingGenerator, formats));
|
|
18
|
-
}
|
|
19
15
|
const format = options.projectNameAndRootFormat ??
|
|
20
|
-
configuredDefault ??
|
|
21
16
|
(await determineFormat(tree, formats, options.callingGenerator));
|
|
22
17
|
return {
|
|
23
18
|
...formats[format],
|
|
@@ -82,36 +77,12 @@ async function determineFormat(tree, formats, callingGenerator) {
|
|
|
82
77
|
],
|
|
83
78
|
initial: 'as-provided',
|
|
84
79
|
}).then(({ format }) => format === asProvidedSelectedValue ? 'as-provided' : 'derived');
|
|
85
|
-
if (result === '
|
|
86
|
-
const { saveDefault } = await (0, enquirer_1.prompt)({
|
|
87
|
-
type: 'confirm',
|
|
88
|
-
message: `Would you like to configure Nx to always take project name and root as provided for ${callingGenerator}?`,
|
|
89
|
-
name: 'saveDefault',
|
|
90
|
-
initial: true,
|
|
91
|
-
});
|
|
92
|
-
if (saveDefault) {
|
|
93
|
-
setProjectNameAndRootFormatDefault(tree);
|
|
94
|
-
}
|
|
95
|
-
else {
|
|
96
|
-
logger.warn(deprecationWarning);
|
|
97
|
-
}
|
|
98
|
-
}
|
|
99
|
-
else {
|
|
80
|
+
if (result === 'derived' && callingGenerator) {
|
|
100
81
|
const example = getExample(callingGenerator, formats);
|
|
101
82
|
logger.warn(deprecationWarning + '\n' + example);
|
|
102
83
|
}
|
|
103
84
|
return result;
|
|
104
85
|
}
|
|
105
|
-
function setProjectNameAndRootFormatDefault(tree) {
|
|
106
|
-
const nxJson = readNxJson(tree);
|
|
107
|
-
nxJson.workspaceLayout ??= {};
|
|
108
|
-
nxJson.workspaceLayout.projectNameAndRootFormat = 'as-provided';
|
|
109
|
-
updateNxJson(tree, nxJson);
|
|
110
|
-
}
|
|
111
|
-
function getDefaultProjectNameAndRootFormat(tree) {
|
|
112
|
-
const nxJson = readNxJson(tree);
|
|
113
|
-
return nxJson.workspaceLayout?.projectNameAndRootFormat;
|
|
114
|
-
}
|
|
115
86
|
function getProjectNameAndRootFormats(tree, options) {
|
|
116
87
|
const name = (0, names_1.names)(options.name).fileName;
|
|
117
88
|
const directory = options.directory
|