@nrwl/workspace 15.9.0-beta.0 → 15.9.0-beta.2
Sign up to get free protection for your applications and to get access to all the features.
- package/package.json +30 -30
- package/src/generators/move/lib/update-cypress-config.js +8 -2
- package/src/generators/move/lib/update-cypress-config.js.map +1 -1
- package/src/generators/new/generate-preset.js +32 -8
- package/src/generators/new/generate-preset.js.map +1 -1
- package/src/generators/new/generate-workspace-files.js +2 -1
- package/src/generators/new/generate-workspace-files.js.map +1 -1
- package/src/generators/new/new.d.ts +2 -1
- package/src/generators/new/new.js +10 -9
- package/src/generators/new/new.js.map +1 -1
- package/src/generators/remove/lib/check-project-is-safe-to-remove.js +1 -1
- package/src/generators/remove/lib/check-project-is-safe-to-remove.js.map +1 -1
- package/src/utils/versions.d.ts +2 -1
- package/src/utils/versions.js +5 -2
- package/src/utils/versions.js.map +1 -1
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@nrwl/workspace",
|
3
|
-
"version": "15.9.0-beta.
|
3
|
+
"version": "15.9.0-beta.2",
|
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,37 +33,37 @@
|
|
33
33
|
"requirements": {},
|
34
34
|
"migrations": "./migrations.json",
|
35
35
|
"packageGroup": {
|
36
|
-
"@nrwl/js": "15.9.0-beta.
|
37
|
-
"@nrwl/jest": "15.9.0-beta.
|
38
|
-
"@nrwl/linter": "15.9.0-beta.
|
39
|
-
"@nrwl/angular": "15.9.0-beta.
|
40
|
-
"@nrwl/cli": "15.9.0-beta.
|
41
|
-
"@nrwl/cypress": "15.9.0-beta.
|
42
|
-
"@nrwl/detox": "15.9.0-beta.
|
43
|
-
"@nrwl/devkit": "15.9.0-beta.
|
44
|
-
"@nrwl/esbuild": "15.9.0-beta.
|
45
|
-
"@nrwl/eslint-plugin-nx": "15.9.0-beta.
|
46
|
-
"@nrwl/expo": "15.9.0-beta.
|
47
|
-
"@nrwl/express": "15.9.0-beta.
|
48
|
-
"@nrwl/nest": "15.9.0-beta.
|
49
|
-
"@nrwl/next": "15.9.0-beta.
|
50
|
-
"@nrwl/node": "15.9.0-beta.
|
36
|
+
"@nrwl/js": "15.9.0-beta.2",
|
37
|
+
"@nrwl/jest": "15.9.0-beta.2",
|
38
|
+
"@nrwl/linter": "15.9.0-beta.2",
|
39
|
+
"@nrwl/angular": "15.9.0-beta.2",
|
40
|
+
"@nrwl/cli": "15.9.0-beta.2",
|
41
|
+
"@nrwl/cypress": "15.9.0-beta.2",
|
42
|
+
"@nrwl/detox": "15.9.0-beta.2",
|
43
|
+
"@nrwl/devkit": "15.9.0-beta.2",
|
44
|
+
"@nrwl/esbuild": "15.9.0-beta.2",
|
45
|
+
"@nrwl/eslint-plugin-nx": "15.9.0-beta.2",
|
46
|
+
"@nrwl/expo": "15.9.0-beta.2",
|
47
|
+
"@nrwl/express": "15.9.0-beta.2",
|
48
|
+
"@nrwl/nest": "15.9.0-beta.2",
|
49
|
+
"@nrwl/next": "15.9.0-beta.2",
|
50
|
+
"@nrwl/node": "15.9.0-beta.2",
|
51
51
|
"@nrwl/nx-cloud": "latest",
|
52
|
-
"@nrwl/nx-plugin": "15.9.0-beta.
|
53
|
-
"@nrwl/react-native": "15.9.0-beta.
|
54
|
-
"@nrwl/react": "15.9.0-beta.
|
55
|
-
"@nrwl/rollup": "15.9.0-beta.
|
56
|
-
"@nrwl/storybook": "15.9.0-beta.
|
57
|
-
"@nrwl/tao": "15.9.0-beta.
|
58
|
-
"@nrwl/vite": "15.9.0-beta.
|
59
|
-
"@nrwl/web": "15.9.0-beta.
|
60
|
-
"@nrwl/webpack": "15.9.0-beta.
|
61
|
-
"nx": "15.9.0-beta.
|
52
|
+
"@nrwl/nx-plugin": "15.9.0-beta.2",
|
53
|
+
"@nrwl/react-native": "15.9.0-beta.2",
|
54
|
+
"@nrwl/react": "15.9.0-beta.2",
|
55
|
+
"@nrwl/rollup": "15.9.0-beta.2",
|
56
|
+
"@nrwl/storybook": "15.9.0-beta.2",
|
57
|
+
"@nrwl/tao": "15.9.0-beta.2",
|
58
|
+
"@nrwl/vite": "15.9.0-beta.2",
|
59
|
+
"@nrwl/web": "15.9.0-beta.2",
|
60
|
+
"@nrwl/webpack": "15.9.0-beta.2",
|
61
|
+
"nx": "15.9.0-beta.2"
|
62
62
|
}
|
63
63
|
},
|
64
64
|
"dependencies": {
|
65
|
-
"@nrwl/devkit": "15.9.0-beta.
|
66
|
-
"@nrwl/linter": "15.9.0-beta.
|
65
|
+
"@nrwl/devkit": "15.9.0-beta.2",
|
66
|
+
"@nrwl/linter": "15.9.0-beta.2",
|
67
67
|
"@parcel/watcher": "2.0.4",
|
68
68
|
"chalk": "^4.1.0",
|
69
69
|
"chokidar": "^3.5.1",
|
@@ -76,7 +76,7 @@
|
|
76
76
|
"ignore": "^5.0.4",
|
77
77
|
"minimatch": "3.0.5",
|
78
78
|
"npm-run-path": "^4.0.1",
|
79
|
-
"nx": "15.9.0-beta.
|
79
|
+
"nx": "15.9.0-beta.2",
|
80
80
|
"open": "^8.4.0",
|
81
81
|
"rxjs": "^6.5.4",
|
82
82
|
"tmp": "~0.2.1",
|
@@ -88,5 +88,5 @@
|
|
88
88
|
"access": "public"
|
89
89
|
},
|
90
90
|
"types": "./index.d.ts",
|
91
|
-
"gitHead": "
|
91
|
+
"gitHead": "567024e107950016a72ec7806e02ce81eb8269b9"
|
92
92
|
}
|
@@ -13,8 +13,14 @@ function updateCypressConfig(tree, schema, project) {
|
|
13
13
|
const cypressJsonPath = path.join(schema.relativeToRootDestination, 'cypress.json');
|
14
14
|
if (tree.exists(cypressJsonPath)) {
|
15
15
|
const cypressJson = JSON.parse(tree.read(cypressJsonPath).toString('utf-8'));
|
16
|
-
|
17
|
-
|
16
|
+
// videosFolder is not required because videos can be turned off - it also has a default
|
17
|
+
if (cypressJson.videosFolder) {
|
18
|
+
cypressJson.videosFolder = cypressJson.videosFolder.replace(project.root, schema.relativeToRootDestination);
|
19
|
+
}
|
20
|
+
// screenshotsFolder is not required as it has a default
|
21
|
+
if (cypressJson.screenshotsFolder) {
|
22
|
+
cypressJson.screenshotsFolder = cypressJson.screenshotsFolder.replace(project.root, schema.relativeToRootDestination);
|
23
|
+
}
|
18
24
|
tree.write(cypressJsonPath, JSON.stringify(cypressJson));
|
19
25
|
return tree;
|
20
26
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"update-cypress-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-cypress-config.ts"],"names":[],"mappings":";;;AACA,6BAA6B;AAQ7B;;;;;;GAMG;AACH,SAAgB,mBAAmB,CACjC,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAC/B,MAAM,CAAC,yBAAyB,EAChC,cAAc,CACf,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QAChC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CACvB,CAAC;QACxB,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC,OAAO,CACzD,OAAO,CAAC,IAAI,EACZ,MAAM,CAAC,yBAAyB,CACjC,CAAC;
|
1
|
+
{"version":3,"file":"update-cypress-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-cypress-config.ts"],"names":[],"mappings":";;;AACA,6BAA6B;AAQ7B;;;;;;GAMG;AACH,SAAgB,mBAAmB,CACjC,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAC/B,MAAM,CAAC,yBAAyB,EAChC,cAAc,CACf,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QAChC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CACvB,CAAC;QACxB,wFAAwF;QACxF,IAAI,WAAW,CAAC,YAAY,EAAE;YAC5B,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC,OAAO,CACzD,OAAO,CAAC,IAAI,EACZ,MAAM,CAAC,yBAAyB,CACjC,CAAC;SACH;QACD,wDAAwD;QACxD,IAAI,WAAW,CAAC,iBAAiB,EAAE;YACjC,WAAW,CAAC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC,OAAO,CACnE,OAAO,CAAC,IAAI,EACZ,MAAM,CAAC,yBAAyB,CACjC,CAAC;SACH;QAED,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;KACb;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CACjC,MAAM,CAAC,yBAAyB,EAChC,mBAAmB,CACpB,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;QAClC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,IAAI,MAAM,CAAC,IAAI,MAAM,CAAC,WAAW,GAAG,EAAE,GAAG,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,UAAU;aAC1B,OAAO,CAAC,QAAQ,EAAE,IAAI,MAAM,CAAC,cAAc,GAAG,CAAC;aAC/C,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,yBAAyB,CAAC,CAAC;QAEtD,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;KAC3C;AACH,CAAC;AA/CD,kDA+CC"}
|
@@ -15,7 +15,7 @@ function addPresetDependencies(host, options) {
|
|
15
15
|
options.preset === presets_1.Preset.NPM) {
|
16
16
|
return;
|
17
17
|
}
|
18
|
-
const { dependencies, dev } = getPresetDependencies(options
|
18
|
+
const { dependencies, dev } = getPresetDependencies(options);
|
19
19
|
return (0, devkit_1.addDependenciesToPackageJson)(host, dependencies, dev, (0, path_1.join)(options.directory, 'package.json'));
|
20
20
|
}
|
21
21
|
exports.addPresetDependencies = addPresetDependencies;
|
@@ -71,35 +71,59 @@ function generatePreset(host, opts) {
|
|
71
71
|
}
|
72
72
|
}
|
73
73
|
exports.generatePreset = generatePreset;
|
74
|
-
function getPresetDependencies(preset,
|
74
|
+
function getPresetDependencies({ preset, presetVersion, bundler, }) {
|
75
75
|
switch (preset) {
|
76
76
|
case presets_1.Preset.TS:
|
77
77
|
return { dependencies: {}, dev: { '@nrwl/js': versions_1.nxVersion } };
|
78
78
|
case presets_1.Preset.AngularMonorepo:
|
79
79
|
case presets_1.Preset.AngularStandalone:
|
80
|
-
return {
|
80
|
+
return {
|
81
|
+
dependencies: { '@nrwl/angular': versions_1.nxVersion },
|
82
|
+
dev: {
|
83
|
+
'@angular-devkit/core': versions_1.angularCliVersion,
|
84
|
+
'@angular-devkit/schematics': versions_1.angularCliVersion,
|
85
|
+
'@schematics/angular': versions_1.angularCliVersion,
|
86
|
+
typescript: versions_1.typescriptVersion,
|
87
|
+
},
|
88
|
+
};
|
81
89
|
case presets_1.Preset.Express:
|
82
90
|
return { dependencies: {}, dev: { '@nrwl/express': versions_1.nxVersion } };
|
83
91
|
case presets_1.Preset.Nest:
|
84
|
-
return {
|
92
|
+
return {
|
93
|
+
dependencies: {},
|
94
|
+
dev: { '@nrwl/nest': versions_1.nxVersion, typescript: versions_1.typescriptVersion },
|
95
|
+
};
|
85
96
|
case presets_1.Preset.NextJs:
|
86
97
|
return { dependencies: { '@nrwl/next': versions_1.nxVersion }, dev: {} };
|
87
98
|
case presets_1.Preset.ReactMonorepo:
|
88
|
-
return { dependencies: {}, dev: { '@nrwl/react': versions_1.nxVersion } };
|
89
99
|
case presets_1.Preset.ReactStandalone:
|
90
|
-
return {
|
100
|
+
return {
|
101
|
+
dependencies: {},
|
102
|
+
dev: {
|
103
|
+
'@nrwl/react': versions_1.nxVersion,
|
104
|
+
'@nrwl/cypress': versions_1.nxVersion,
|
105
|
+
'@nrwl/jest': bundler !== 'vite' ? versions_1.nxVersion : undefined,
|
106
|
+
'@nrwl/vite': bundler === 'vite' ? versions_1.nxVersion : undefined,
|
107
|
+
'@nrwl/webpack': bundler === 'webpack' ? versions_1.nxVersion : undefined,
|
108
|
+
},
|
109
|
+
};
|
91
110
|
case presets_1.Preset.ReactNative:
|
92
111
|
return { dependencies: {}, dev: { '@nrwl/react-native': versions_1.nxVersion } };
|
93
112
|
case presets_1.Preset.Expo:
|
94
113
|
return { dependencies: {}, dev: { '@nrwl/expo': versions_1.nxVersion } };
|
95
114
|
case presets_1.Preset.WebComponents:
|
96
|
-
return {
|
115
|
+
return {
|
116
|
+
dependencies: {},
|
117
|
+
dev: { '@nrwl/web': versions_1.nxVersion, typescript: versions_1.typescriptVersion },
|
118
|
+
};
|
97
119
|
case presets_1.Preset.NodeServer:
|
98
120
|
return { dependencies: {}, dev: { '@nrwl/node': versions_1.nxVersion } };
|
99
121
|
default: {
|
100
122
|
return {
|
101
123
|
dev: {},
|
102
|
-
dependencies: {
|
124
|
+
dependencies: {
|
125
|
+
[preset]: presetVersion !== null && presetVersion !== void 0 ? presetVersion : (0, get_npm_package_version_1.getNpmPackageVersion)(preset),
|
126
|
+
},
|
103
127
|
};
|
104
128
|
}
|
105
129
|
}
|
@@ -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,
|
1
|
+
{"version":3,"file":"generate-preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-preset.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AACtB,8CAA0C;AAC1C,mDAI8B;AAC9B,8EAAwE;AAExE,+BAA4B;AAC5B,4CAA4C;AAC5C,iDAAoD;AAEpD,SAAgB,qBAAqB,CAAC,IAAU,EAAE,OAAyB;IACzE,IACE,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI;QAC9B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI;QAC9B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,KAAK;QAC/B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,GAAG,EAC7B;QACA,OAAO;KACR;IACD,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC7D,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,YAAY,EACZ,GAAG,EACH,IAAA,WAAI,EAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,CACxC,CAAC;AACJ,CAAC;AAhBD,sDAgBC;AAED,SAAgB,cAAc,CAAC,IAAU,EAAE,IAAsB;IAC/D,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE;QAC3C,OAAO,EAAE,CAAC,aAAa,CAAC;QACxB,OAAO,EAAE;YACP,WAAW,EAAE,IAAI;SAClB;KACF,CAAC,CAAC;IACH,MAAM,YAAY,GAAiB;QACjC,KAAK,EAAE,SAAS;QAChB,KAAK,EAAE,IAAI;QACX,GAAG,EAAE,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;KACrC,CAAC;IACF,MAAM,GAAG,GAAG,IAAA,iCAAwB,GAAE,CAAC;IACvC,MAAM,UAAU,GAAG,GAAG,GAAG,CAAC,IAAI,KAAK,CAAC;IACpC,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAEjC,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,IAAA,qBAAK,EAAC,UAAU,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE;YACjE,IAAI,IAAI,KAAK,CAAC,EAAE;gBACd,OAAO,EAAE,CAAC;aACX;iBAAM;gBACL,MAAM,OAAO,GAAG,uCAAuC,CAAC;gBACxD,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;aAC5B;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,SAAS,aAAa,CAAC,OAAyB;QAC9C,oBAAoB;QACpB,OAAO,cAAc,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,SAAS,cAAc,CAAC,IAAsB;QAC5C,OAAO;YACL,GAAG;YACH,wBAAwB;YACxB,UAAU,IAAI,CAAC,OAAO,EAAE;YACxB,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI;YAC3C,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI;YAC9C,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,cAAc,IAAI,CAAC,IAAI,EAAE;YACzE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI;YAC9C,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI;YACjD,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI;YACvD,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI;YAC9C,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,oBAAoB,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,IAAI;YACtE,IAAI,CAAC,aAAa,KAAK,SAAS;gBAC9B,CAAC,CAAC,mBAAmB,IAAI,CAAC,aAAa,EAAE;gBACzC,CAAC,CAAC,IAAI;YACR,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,qBAAqB;YACrE,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,aAAa,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI;SAChE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC;AACH,CAAC;AApDD,wCAoDC;AAED,SAAS,qBAAqB,CAAC,EAC7B,MAAM,EACN,aAAa,EACb,OAAO,GACU;IACjB,QAAQ,MAAM,EAAE;QACd,KAAK,gBAAM,CAAC,EAAE;YACZ,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,UAAU,EAAE,oBAAS,EAAE,EAAE,CAAC;QAE9D,KAAK,gBAAM,CAAC,eAAe,CAAC;QAC5B,KAAK,gBAAM,CAAC,iBAAiB;YAC3B,OAAO;gBACL,YAAY,EAAE,EAAE,eAAe,EAAE,oBAAS,EAAE;gBAC5C,GAAG,EAAE;oBACH,sBAAsB,EAAE,4BAAiB;oBACzC,4BAA4B,EAAE,4BAAiB;oBAC/C,qBAAqB,EAAE,4BAAiB;oBACxC,UAAU,EAAE,4BAAiB;iBAC9B;aACF,CAAC;QAEJ,KAAK,gBAAM,CAAC,OAAO;YACjB,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,eAAe,EAAE,oBAAS,EAAE,EAAE,CAAC;QAEnE,KAAK,gBAAM,CAAC,IAAI;YACd,OAAO;gBACL,YAAY,EAAE,EAAE;gBAChB,GAAG,EAAE,EAAE,YAAY,EAAE,oBAAS,EAAE,UAAU,EAAE,4BAAiB,EAAE;aAChE,CAAC;QAEJ,KAAK,gBAAM,CAAC,MAAM;YAChB,OAAO,EAAE,YAAY,EAAE,EAAE,YAAY,EAAE,oBAAS,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC;QAEhE,KAAK,gBAAM,CAAC,aAAa,CAAC;QAC1B,KAAK,gBAAM,CAAC,eAAe;YACzB,OAAO;gBACL,YAAY,EAAE,EAAE;gBAChB,GAAG,EAAE;oBACH,aAAa,EAAE,oBAAS;oBACxB,eAAe,EAAE,oBAAS;oBAC1B,YAAY,EAAE,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,oBAAS,CAAC,CAAC,CAAC,SAAS;oBACxD,YAAY,EAAE,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,oBAAS,CAAC,CAAC,CAAC,SAAS;oBACxD,eAAe,EAAE,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,oBAAS,CAAC,CAAC,CAAC,SAAS;iBAC/D;aACF,CAAC;QAEJ,KAAK,gBAAM,CAAC,WAAW;YACrB,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,oBAAoB,EAAE,oBAAS,EAAE,EAAE,CAAC;QAExE,KAAK,gBAAM,CAAC,IAAI;YACd,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,YAAY,EAAE,oBAAS,EAAE,EAAE,CAAC;QAEhE,KAAK,gBAAM,CAAC,aAAa;YACvB,OAAO;gBACL,YAAY,EAAE,EAAE;gBAChB,GAAG,EAAE,EAAE,WAAW,EAAE,oBAAS,EAAE,UAAU,EAAE,4BAAiB,EAAE;aAC/D,CAAC;QAEJ,KAAK,gBAAM,CAAC,UAAU;YACpB,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,YAAY,EAAE,oBAAS,EAAE,EAAE,CAAC;QAEhE,OAAO,CAAC,CAAC;YACP,OAAO;gBACL,GAAG,EAAE,EAAE;gBACP,YAAY,EAAE;oBACZ,CAAC,MAAM,CAAC,EAAE,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,IAAA,8CAAoB,EAAC,MAAM,CAAC;iBACxD;aACF,CAAC;SACH;KACF;AACH,CAAC"}
|
@@ -52,7 +52,8 @@ function createAppsAndLibsFolders(tree, options) {
|
|
52
52
|
}
|
53
53
|
else if (options.preset === presets_1.Preset.AngularStandalone ||
|
54
54
|
options.preset === presets_1.Preset.ReactStandalone ||
|
55
|
-
options.preset === presets_1.Preset.NodeServer
|
55
|
+
options.preset === presets_1.Preset.NodeServer ||
|
56
|
+
options.isCustomPreset) {
|
56
57
|
// don't generate any folders
|
57
58
|
}
|
58
59
|
else {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"generate-workspace-files.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-workspace-files.ts"],"names":[],"mappings":";;;;AAAA,yCAUsB;AACtB,mDAAiD;AACjD,+BAA8C;AAC9C,8CAA0C;AAC1C,+DAAiE;AAGjE,SAAsB,sBAAsB,CAC1C,IAAU,EACV,OAAyB;;QAEzB,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;SACzD;QACD,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACpC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5B,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3B,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE5B,MAAM,CAAC,YAAY,CAAC,GAAG,IAAA,iCAAwB,EAC7C,OAAO,CAAC,cAAgC,CACzC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACb,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,IAAI,CAAC,YAAY,IAAI,CAAC,EAAE;YAC3D,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC5B;aAAM,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,IAAI,CAAC,YAAY,IAAI,CAAC,EAAE;YAClE,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAChC;QACD,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7B,wBAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACxC,4BAA4B,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE5C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AA1BD,wDA0BC;AAED,SAAS,iBAAiB,CAAC,IAAU,EAAE,OAAyB;IAC9D,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QAC5D,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,GAAG,EAAE;YACnE,yBAAyB,CAAC,IAAI,EAAE,SAAS,EAAE,qBAAqB,CAAC,CAAC;YAClE,OAAO,IAAI,CAAC,oBAAoB,CAAC;YACjC,OAAO,IAAI,CAAC,cAAc,CAAC;YAC3B,OAAO,IAAI,CAAC,kBAAkB,CAAC;YAC/B,OAAO,IAAI,CAAC,eAAe,CAAC;YAC5B,OAAO,IAAI,CAAC,QAAQ,CAAC;SACtB;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,wBAAwB,CAAC,IAAU,EAAE,OAAyB;IACrE,IACE,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI;QAC9B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,EAAE;QAC5B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,GAAG,EAC7B;QACA,IAAI,CAAC,KAAK,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,SAAS,EAAE,mBAAmB,CAAC,EAAE,EAAE,CAAC,CAAC;KAC9D;SAAM,IACL,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,iBAAiB;QAC3C,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,eAAe;QACzC,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,UAAU,
|
1
|
+
{"version":3,"file":"generate-workspace-files.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-workspace-files.ts"],"names":[],"mappings":"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"}
|
@@ -20,6 +20,7 @@ interface Schema {
|
|
20
20
|
}
|
21
21
|
export interface NormalizedSchema extends Schema {
|
22
22
|
presetVersion?: string;
|
23
|
+
isCustomPreset: boolean;
|
23
24
|
}
|
24
|
-
export declare function newGenerator(host: Tree,
|
25
|
+
export declare function newGenerator(host: Tree, opts: Schema): Promise<() => Promise<void>>;
|
25
26
|
export default newGenerator;
|
@@ -7,20 +7,19 @@ const path_1 = require("path");
|
|
7
7
|
const presets_1 = require("../utils/presets");
|
8
8
|
const generate_workspace_files_1 = require("./generate-workspace-files");
|
9
9
|
const generate_preset_1 = require("./generate-preset");
|
10
|
-
function newGenerator(host,
|
10
|
+
function newGenerator(host, opts) {
|
11
11
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
12
|
-
options = normalizeOptions(
|
12
|
+
const options = normalizeOptions(opts);
|
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);
|
17
16
|
addCloudDependencies(host, options);
|
18
17
|
return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
19
18
|
(0, devkit_1.installPackagesTask)(host, false, options.directory, options.packageManager);
|
20
19
|
// TODO: move all of these into create-nx-workspace
|
21
20
|
if (options.preset !== presets_1.Preset.NPM &&
|
22
21
|
options.preset !== presets_1.Preset.Core &&
|
23
|
-
!isCustomPreset) {
|
22
|
+
!options.isCustomPreset) {
|
24
23
|
yield (0, generate_preset_1.generatePreset)(host, options);
|
25
24
|
}
|
26
25
|
});
|
@@ -50,19 +49,21 @@ function validateOptions(options, host) {
|
|
50
49
|
}
|
51
50
|
}
|
52
51
|
function normalizeOptions(options) {
|
53
|
-
|
52
|
+
const normalized = Object.assign({}, options);
|
53
|
+
normalized.name = (0, devkit_1.names)(options.name).fileName;
|
54
54
|
if (!options.directory) {
|
55
|
-
|
55
|
+
normalized.directory = options.name;
|
56
56
|
}
|
57
57
|
// If the preset already contains a version in the name
|
58
58
|
// -- my-package@2.0.1
|
59
59
|
// -- @scope/package@version
|
60
60
|
const match = options.preset.match(/^(?<package>(@.+\/)?[^@]+)(@(?<version>\d+\.\d+\.\d+))?$/);
|
61
61
|
if (match) {
|
62
|
-
|
63
|
-
|
62
|
+
normalized.preset = match.groups.package;
|
63
|
+
normalized.presetVersion = match.groups.version;
|
64
64
|
}
|
65
|
-
|
65
|
+
normalized.isCustomPreset = !Object.values(presets_1.Preset).includes(options.preset);
|
66
|
+
return normalized;
|
66
67
|
}
|
67
68
|
function addCloudDependencies(host, options) {
|
68
69
|
if (options.nxCloud) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":";;;;AAAA,
|
1
|
+
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":"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"}
|
@@ -14,7 +14,7 @@ function checkProjectIsSafeToRemove(tree, schema, project) {
|
|
14
14
|
const containedProjects = [];
|
15
15
|
for (const [_, p] of (0, devkit_1.getProjects)(tree)) {
|
16
16
|
if (project.name !== p.name &&
|
17
|
-
!(0, devkit_1.normalizePath)((0, path_1.relative)(project.root, p.root)).startsWith('
|
17
|
+
!(0, devkit_1.normalizePath)((0, path_1.relative)(project.root, p.root)).startsWith('..')) {
|
18
18
|
containedProjects.push(p.name);
|
19
19
|
}
|
20
20
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"check-project-is-safe-to-remove.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/check-project-is-safe-to-remove.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAEtB,+BAAgC;AAEhC,SAAgB,0BAA0B,CACxC,IAAU,EACV,MAAc,EACd,OAA6B;IAE7B,IAAI,OAAO,CAAC,IAAI,KAAK,GAAG,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,IAAI,MAAM,CAAC,WAAW,gFAAgF,CACvG,CAAC;KACH;IACD,IAAI,MAAM,CAAC,WAAW,EAAE;QACtB,eAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QAC7C,OAAO;KACR;IACD,MAAM,iBAAiB,GAAG,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;QACtC,IACE,OAAO,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI;YACvB,CAAC,IAAA,sBAAa,EAAC,IAAA,eAAQ,EAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,
|
1
|
+
{"version":3,"file":"check-project-is-safe-to-remove.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/check-project-is-safe-to-remove.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAEtB,+BAAgC;AAEhC,SAAgB,0BAA0B,CACxC,IAAU,EACV,MAAc,EACd,OAA6B;IAE7B,IAAI,OAAO,CAAC,IAAI,KAAK,GAAG,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,IAAI,MAAM,CAAC,WAAW,gFAAgF,CACvG,CAAC;KACH;IACD,IAAI,MAAM,CAAC,WAAW,EAAE;QACtB,eAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QAC7C,OAAO;KACR;IACD,MAAM,iBAAiB,GAAG,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;QACtC,IACE,OAAO,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI;YACvB,CAAC,IAAA,sBAAa,EAAC,IAAA,eAAQ,EAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAC/D;YACA,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SAChC;KACF;IACD,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CACb,IACE,MAAM,CAAC,WACT,6HAA6H,iBAAiB,CAAC,IAAI,CACjJ,OAAO,CACR,0DAA0D,CAC5D,CAAC;KACH;AACH,CAAC;AAhCD,gEAgCC"}
|
package/src/utils/versions.d.ts
CHANGED
@@ -1,6 +1,7 @@
|
|
1
1
|
export declare const nxVersion: any;
|
2
|
-
export declare const angularCliVersion = "~15.2.0";
|
3
2
|
export declare const typescriptVersion = "~4.9.5";
|
4
3
|
export declare const typescriptESLintVersion = "^5.36.1";
|
5
4
|
export declare const eslintVersion = "~8.15.0";
|
6
5
|
export declare const eslintConfigPrettierVersion = "8.1.0";
|
6
|
+
export declare const angularCliVersion = "~15.2.0";
|
7
|
+
export declare const prettierVersion = "^2.6.2";
|
package/src/utils/versions.js
CHANGED
@@ -1,10 +1,13 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.
|
3
|
+
exports.prettierVersion = exports.angularCliVersion = exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.typescriptESLintVersion = exports.typescriptVersion = exports.nxVersion = void 0;
|
4
4
|
exports.nxVersion = require('../../package.json').version;
|
5
|
-
exports.angularCliVersion = '~15.2.0';
|
6
5
|
exports.typescriptVersion = '~4.9.5';
|
7
6
|
exports.typescriptESLintVersion = '^5.36.1';
|
8
7
|
exports.eslintVersion = '~8.15.0';
|
9
8
|
exports.eslintConfigPrettierVersion = '8.1.0';
|
9
|
+
// TODO: remove when preset generation is reworked and
|
10
|
+
// deps are not installed from workspace
|
11
|
+
exports.angularCliVersion = '~15.2.0';
|
12
|
+
exports.prettierVersion = '^2.6.2';
|
10
13
|
//# sourceMappingURL=versions.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,iBAAiB,GAAG,
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,uBAAuB,GAAG,SAAS,CAAC;AACpC,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,2BAA2B,GAAG,OAAO,CAAC;AAEnD,sDAAsD;AACtD,wCAAwC;AAC3B,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,eAAe,GAAG,QAAQ,CAAC"}
|