@nx/workspace 21.0.0-rc.2 → 21.0.0-rc.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/workspace",
|
3
|
-
"version": "21.0.0-rc.
|
3
|
+
"version": "21.0.0-rc.4",
|
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": {
|
@@ -38,14 +38,14 @@
|
|
38
38
|
}
|
39
39
|
},
|
40
40
|
"dependencies": {
|
41
|
-
"@nx/devkit": "21.0.0-rc.
|
41
|
+
"@nx/devkit": "21.0.0-rc.4",
|
42
42
|
"@zkochan/js-yaml": "0.0.7",
|
43
43
|
"chalk": "^4.1.0",
|
44
44
|
"enquirer": "~2.3.6",
|
45
45
|
"picomatch": "4.0.2",
|
46
46
|
"tslib": "^2.3.0",
|
47
47
|
"yargs-parser": "21.1.1",
|
48
|
-
"nx": "21.0.0-rc.
|
48
|
+
"nx": "21.0.0-rc.4"
|
49
49
|
},
|
50
50
|
"publishConfig": {
|
51
51
|
"access": "public"
|
@@ -46,6 +46,7 @@ function normalizeOptions(options, tree) {
|
|
46
46
|
packageManagerPrefix,
|
47
47
|
packageManagerPreInstallPrefix,
|
48
48
|
mainBranch: (0, default_base_1.deduceDefaultBase)(),
|
49
|
+
packageManagerVersion: packageJson?.packageManager?.split('@')[1],
|
49
50
|
hasCypress,
|
50
51
|
hasE2E,
|
51
52
|
hasPlaywright,
|
package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__
CHANGED
@@ -19,24 +19,26 @@ jobs:
|
|
19
19
|
filter: tree:0
|
20
20
|
fetch-depth: 0
|
21
21
|
|
22
|
-
<% if(packageManager
|
23
|
-
- uses: pnpm/action-setup@v4
|
24
|
-
with:
|
25
|
-
version: 9
|
26
|
-
<% } %>
|
27
|
-
<% if(packageManager == 'bun'){ %>
|
22
|
+
<% if(packageManager === 'bun'){ %>
|
28
23
|
- uses: oven-sh/setup-bun@v1
|
29
24
|
with:
|
30
25
|
bun-version: latest
|
26
|
+
<% } else if (packageManager === 'yarn' && packageManagerVersion) { %>
|
27
|
+
- run: corepack enable
|
28
|
+
<% } else if(packageManager ==='pnpm'){ %>
|
29
|
+
- uses: pnpm/action-setup@v4
|
30
|
+
name: Install pnpm
|
31
|
+
with:<% if (!packageManagerVersion) { %>
|
32
|
+
version: 9.8.0<% } %>
|
33
|
+
run_install: false
|
31
34
|
<% } %>
|
32
|
-
|
33
35
|
# This enables task distribution via Nx Cloud
|
34
36
|
# Run this command as early as possible, before dependencies are installed
|
35
37
|
# Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
|
36
38
|
<% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
|
37
39
|
# - run: <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
|
38
40
|
|
39
|
-
<% if(packageManager
|
41
|
+
<% if(packageManager !== 'bun'){ %>
|
40
42
|
# Cache node_modules
|
41
43
|
- uses: actions/setup-node@v4
|
42
44
|
with:
|
@@ -30,7 +30,7 @@ const presetToPluginMap = {
|
|
30
30
|
[presets_1.Preset.AngularMonorepo]: {
|
31
31
|
generateAppCmd: '@nx/angular',
|
32
32
|
generateLibCmd: '@nx/angular',
|
33
|
-
learnMoreLink: 'https://nx.dev/
|
33
|
+
learnMoreLink: 'https://nx.dev/tutorials/3-angular-monorepo/1a-introduction/1-welcome?utm_source=nx_project&utm_medium=readme&utm_campaign=nx_projects',
|
34
34
|
},
|
35
35
|
[presets_1.Preset.AngularStandalone]: {
|
36
36
|
generateAppCmd: '@nx/angular',
|
@@ -40,7 +40,7 @@ const presetToPluginMap = {
|
|
40
40
|
[presets_1.Preset.ReactMonorepo]: {
|
41
41
|
generateAppCmd: '@nx/react',
|
42
42
|
generateLibCmd: '@nx/react',
|
43
|
-
learnMoreLink: 'https://nx.dev/
|
43
|
+
learnMoreLink: 'https://nx.dev/tutorials/2-react-monorepo/1r-introduction/1-welcome?utm_source=nx_project&utm_medium=readme&utm_campaign=nx_projects',
|
44
44
|
},
|
45
45
|
[presets_1.Preset.ReactStandalone]: {
|
46
46
|
generateAppCmd: '@nx/react',
|