@nx/workspace 21.3.0-beta.3 → 21.3.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.
Files changed (14) hide show
  1. package/package.json +3 -3
  2. package/src/generators/ci-workflow/ci-workflow.d.ts +1 -0
  3. package/src/generators/ci-workflow/ci-workflow.js +28 -18
  4. package/src/generators/ci-workflow/files/azure/azure-pipelines.yml__tmpl__ +3 -2
  5. package/src/generators/ci-workflow/files/bitbucket-pipelines/bitbucket-pipelines.yml__tmpl__ +19 -5
  6. package/src/generators/ci-workflow/files/circleci/.circleci/config.yml__tmpl__ +4 -2
  7. package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__ +3 -2
  8. package/src/generators/ci-workflow/files/gitlab/.gitlab-ci.yml__tmpl__ +9 -2
  9. package/src/generators/move/lib/create-project-configuration-in-new-destination.js +4 -2
  10. package/src/generators/move/lib/update-imports.js +2 -1
  11. package/src/generators/utils/project-config.d.ts +2 -0
  12. package/src/generators/utils/project-config.js +18 -0
  13. package/src/utils/versions.d.ts +1 -1
  14. package/src/utils/versions.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx/workspace",
3
- "version": "21.3.0-beta.3",
3
+ "version": "21.3.0-beta.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.3.0-beta.3",
41
+ "@nx/devkit": "21.3.0-beta.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.3.0-beta.3"
48
+ "nx": "21.3.0-beta.4"
49
49
  },
50
50
  "publishConfig": {
51
51
  "access": "public"
package/src/generators/ci-workflow/ci-workflow.d.ts CHANGED
@@ -2,6 +2,7 @@ import { Tree } from '@nx/devkit';
2
2
  export type Command = {
3
3
  command?: string;
4
4
  comments?: string[];
5
+ alwaysRun?: boolean;
5
6
  };
6
7
  export interface Schema {
7
8
  name: string;
package/src/generators/ci-workflow/ci-workflow.js CHANGED
@@ -6,19 +6,19 @@ const default_base_1 = require("../../utilities/default-base");
6
6
  const path_1 = require("path");
7
7
  const nx_cloud_utils_1 = require("nx/src/utils/nx-cloud-utils");
8
8
  const ts_solution_setup_1 = require("../../utilities/typescript/ts-solution-setup");
9
- function getCiCommands(ci, packageManagerPrefix, mainBranch, hasTypecheck, hasE2E, useRunMany = false) {
10
- // Build task list
11
- const tasks = `lint test build${hasTypecheck ? ' typecheck' : ''}${hasE2E ? ' e2e' : ''}`;
12
- // Create nx-cloud record example comment with CI-specific prefix
9
+ function getNxCloudRecordCommand(ci, packageManagerPrefix) {
13
10
  const baseCommand = `${packageManagerPrefix} nx-cloud record -- echo Hello World`;
14
11
  const prefix = getCiPrefix(ci);
15
12
  const exampleComment = `${prefix}${baseCommand}`;
16
- // Build nx-cloud record comments
17
- const nxCloudComments = [
18
- `Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud`,
19
- exampleComment,
20
- ];
21
- // Build nx command comments and command
13
+ return {
14
+ comments: [
15
+ `Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud`,
16
+ exampleComment,
17
+ ],
18
+ };
19
+ }
20
+ function getNxTasksCommand(ci, packageManagerPrefix, mainBranch, hasTypecheck, hasE2E, useRunMany = false) {
21
+ const tasks = `lint test build${hasTypecheck ? ' typecheck' : ''}${hasE2E ? ' e2e' : ''}`;
22
22
  const commandType = useRunMany ? 'run-many' : 'affected';
23
23
  const nxCommandComments = useRunMany
24
24
  ? [
@@ -30,17 +30,27 @@ function getCiCommands(ci, packageManagerPrefix, mainBranch, hasTypecheck, hasE2
30
30
  if (hasE2E) {
31
31
  nxCommandComments.push(`When you enable task distribution, run the e2e-ci task instead of e2e`);
32
32
  }
33
- // Build nx command with CI-specific args
34
33
  const args = getCiArgs(ci, mainBranch, useRunMany);
35
34
  const nxCommand = `${packageManagerPrefix} nx ${commandType} ${args}-t ${tasks}`;
35
+ return {
36
+ comments: nxCommandComments,
37
+ command: nxCommand,
38
+ };
39
+ }
40
+ function getNxCloudFixCiCommand(packageManagerPrefix) {
41
+ return {
42
+ comments: [
43
+ `Nx Cloud recommends fixes for failures to help you get CI green faster. Learn more: https://nx.dev/ci/features/self-healing-ci`,
44
+ ],
45
+ command: `${packageManagerPrefix} nx fix-ci`,
46
+ alwaysRun: true,
47
+ };
48
+ }
49
+ function getCiCommands(ci, packageManagerPrefix, mainBranch, hasTypecheck, hasE2E, useRunMany = false) {
36
50
  return [
37
- {
38
- comments: nxCloudComments,
39
- },
40
- {
41
- comments: nxCommandComments,
42
- command: nxCommand,
43
- },
51
+ getNxCloudRecordCommand(ci, packageManagerPrefix),
52
+ getNxTasksCommand(ci, packageManagerPrefix, mainBranch, hasTypecheck, hasE2E, useRunMany),
53
+ getNxCloudFixCiCommand(packageManagerPrefix),
44
54
  ];
45
55
  }
46
56
  function getCiPrefix(ci) {
package/src/generators/ci-workflow/files/azure/azure-pipelines.yml__tmpl__ CHANGED
@@ -57,7 +57,7 @@ jobs:
57
57
  # Run this command as early as possible, before dependencies are installed
58
58
  # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
59
59
  <% 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<% } %>
60
- # - script: <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
60
+ # - script: <%= packageManagerPreInstallPrefix %> nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
61
61
 
62
62
  - script: <%= packageManagerInstall %><% if(hasCypress){ %>
63
63
  - script: <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>
@@ -67,4 +67,5 @@ jobs:
67
67
 
68
68
  <% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
69
69
  # <%- comment %><% } %><% } %><% if (command.command) { %>
70
- - script: <%= command.command %><% } %><% } %>
70
+ - script: <%= command.command %><% if (command.alwaysRun) { %>
71
+ condition: always()<% } %><% } %><% } %>
package/src/generators/ci-workflow/files/bitbucket-pipelines/bitbucket-pipelines.yml__tmpl__ CHANGED
@@ -23,15 +23,22 @@ pipelines:
23
23
  # Run this command as early as possible, before dependencies are installed
24
24
  # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
25
25
  <% 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<% } %>
26
- # - <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
26
+ # - <%= packageManagerPreInstallPrefix %> nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
27
27
 
28
28
  - <%= packageManagerInstall %><% if(hasCypress){ %>
29
29
  - <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>
30
30
  - <%= packageManagerPrefix %> playwright install --with-deps<% } %>
31
31
 
32
32
  <% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
33
- # <%- comment %><% } %><% } %><% if (command.command) { %>
33
+ # <%- comment %><% } %><% } %><% if (command.command && !command.alwaysRun) { %>
34
34
  - <%= command.command %><% } %><% } %>
35
+ <% const alwaysRunCommands = commands.filter(c => c.alwaysRun && c.command) %>
36
+ <% if (alwaysRunCommands.length > 0) { %>
37
+ after-script:
38
+ <% for (const command of alwaysRunCommands) { %>
39
+ - <%= command.command %>
40
+ <% } %>
41
+ <% } %>
35
42
 
36
43
  branches:
37
44
  main:
@@ -42,9 +49,9 @@ pipelines:
42
49
  # This enables task distribution via Nx Cloud
43
50
  # Run this command as early as possible, before dependencies are installed
44
51
  # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
45
- <% if (connectedToCloud) { %>- <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
52
+ <% if (connectedToCloud) { %>- <%= packageManagerPreInstallPrefix %> nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
46
53
  <% } else { %># Connect your workspace by running "nx connect" and uncomment this
47
- # - <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
54
+ # - <%= packageManagerPreInstallPrefix %> nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
48
55
  <% } %>
49
56
  <% if(packageManager == 'pnpm'){ %>
50
57
  - npm install --prefix=$HOME/.local -g pnpm@8
@@ -55,5 +62,12 @@ pipelines:
55
62
  - <%= packageManagerInstall %>
56
63
 
57
64
  <% for (const command of branchCommands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
58
- # <%- comment %><% } %><% } %><% if (command.command) { %>
65
+ # <%- comment %><% } %><% } %><% if (command.command && !command.alwaysRun) { %>
59
66
  - <%= command.command %><% } %><% } %>
67
+ <% const alwaysRunBranchCommands = branchCommands.filter(c => c.alwaysRun && c.command) %>
68
+ <% if (alwaysRunBranchCommands.length > 0) { %>
69
+ after-script:
70
+ <% for (const command of alwaysRunBranchCommands) { %>
71
+ - <%= command.command %>
72
+ <% } %>
73
+ <% } %>
package/src/generators/ci-workflow/files/circleci/.circleci/config.yml__tmpl__ CHANGED
@@ -25,7 +25,7 @@ jobs:
25
25
  # Run this command as early as possible, before dependencies are installed
26
26
  # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
27
27
  <% 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<% } %>
28
- # - run: <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
28
+ # - run: <%= packageManagerPreInstallPrefix %> nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
29
29
 
30
30
  - run: <%= packageManagerInstall %><% if(hasCypress){ %>
31
31
  - run: <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>
@@ -35,7 +35,9 @@ jobs:
35
35
 
36
36
  <% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
37
37
  # <%- comment %><% } %><% } %><% if (command.command) { %>
38
- - run: <%= command.command %><% } %><% } %>
38
+ - run:
39
+ command: <%= command.command %><% if (command.alwaysRun) { %>
40
+ when: always<% } %><% } %><% } %>
39
41
 
40
42
  workflows:
41
43
  version: 2
package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__ CHANGED
@@ -36,7 +36,7 @@ jobs:
36
36
  # Run this command as early as possible, before dependencies are installed
37
37
  # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
38
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<% } %>
39
- # - run: <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
39
+ # - run: <%= packageManagerPreInstallPrefix %> nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
40
40
 
41
41
  <% if(packageManager !== 'bun'){ %>
42
42
  # Cache node_modules
@@ -52,4 +52,5 @@ jobs:
52
52
 
53
53
  <% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
54
54
  # <%- comment %><% } %><% } %><% if (command.command) { %>
55
- - run: <%= command.command %><% } %><% } %>
55
+ - run: <%= command.command %><% if (command.alwaysRun) { %>
56
+ if: always()<% } %><% } %><% } %>
package/src/generators/ci-workflow/files/gitlab/.gitlab-ci.yml__tmpl__ CHANGED
@@ -19,7 +19,7 @@ variables:
19
19
  # Run this command as early as possible, before dependencies are installed
20
20
  # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
21
21
  <% 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<% } %>
22
- # - <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
22
+ # - <%= packageManagerPreInstallPrefix %> nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
23
23
 
24
24
  - <%= packageManagerInstall %><% if(hasCypress){ %>
25
25
  - <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>
@@ -28,5 +28,12 @@ variables:
28
28
  - NX_BASE=${CI_MERGE_REQUEST_DIFF_BASE_SHA:-$CI_COMMIT_BEFORE_SHA}<% } %>
29
29
 
30
30
  <% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
31
- # <%- comment %><% } %><% } %><% if (command.command) { %>
31
+ # <%- comment %><% } %><% } %><% if (command.command && !command.alwaysRun) { %>
32
32
  - <%= command.command %><% } %><% } %>
33
+ <% const alwaysRunCommands = commands.filter(c => c.alwaysRun && c.command) %>
34
+ <% if (alwaysRunCommands.length > 0) { %>
35
+ after_script:
36
+ <% for (const command of alwaysRunCommands) { %>
37
+ - <%= command.command %>
38
+ <% } %>
39
+ <% } %>
package/src/generators/move/lib/create-project-configuration-in-new-destination.js CHANGED
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.createProjectConfigurationInNewDestination = createProjectConfigurationInNewDestination;
4
4
  const devkit_1 = require("@nx/devkit");
5
+ const project_config_1 = require("../../utils/project-config");
5
6
  function createProjectConfigurationInNewDestination(tree, schema, projectConfig) {
6
7
  projectConfig.name = schema.newProjectName;
7
8
  const isRootProject = projectConfig.root === '.';
@@ -45,8 +46,9 @@ function createProjectConfigurationInNewDestination(tree, schema, projectConfig)
45
46
  }
46
47
  // Original sourceRoot is typically 'src' or 'app', but it could be any folder.
47
48
  // Make sure it is updated to be under the new destination.
48
- if (isRootProject && projectConfig.sourceRoot) {
49
- newProject.sourceRoot = (0, devkit_1.joinPathFragments)(schema.relativeToRootDestination, projectConfig.sourceRoot);
49
+ const sourceRoot = (0, project_config_1.getProjectSourceRoot)(projectConfig, tree);
50
+ if (isRootProject && sourceRoot) {
51
+ newProject.sourceRoot = (0, devkit_1.joinPathFragments)(schema.relativeToRootDestination, sourceRoot);
50
52
  }
51
53
  if (schema.isNxConfiguredInPackageJson) {
52
54
  // Update the existing project configuration in the package.json
package/src/generators/move/lib/update-imports.js CHANGED
@@ -8,6 +8,7 @@ const ts_config_1 = require("../../../utilities/ts-config");
8
8
  const typescript_1 = require("../../../utilities/typescript");
9
9
  const utils_1 = require("./utils");
10
10
  const ts_solution_setup_1 = require("../../../utilities/typescript/ts-solution-setup");
11
+ const project_config_1 = require("../../utils/project-config");
11
12
  let tsModule;
12
13
  /**
13
14
  * Updates all the imports in the workspace and modifies the tsconfig appropriately.
@@ -33,7 +34,7 @@ function updateImports(tree, schema, project) {
33
34
  let serverEntryPointImportPath;
34
35
  if (tree.exists(tsConfigPath)) {
35
36
  tsConfig = (0, devkit_1.readJson)(tree, tsConfigPath);
36
- const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
37
+ const sourceRoot = (0, project_config_1.getProjectSourceRoot)(project, tree);
37
38
  mainEntryPointImportPath = Object.keys(tsConfig.compilerOptions?.paths ?? {}).find((path) => tsConfig.compilerOptions.paths[path].some((x) => x.startsWith(ensureTrailingSlash(sourceRoot))));
38
39
  secondaryEntryPointImportPaths = Object.keys(tsConfig.compilerOptions?.paths ?? {}).filter((path) => tsConfig.compilerOptions.paths[path].some((x) => x.startsWith(ensureTrailingSlash(project.root)) &&
39
40
  !x.startsWith(ensureTrailingSlash(sourceRoot))));
package/src/generators/utils/project-config.d.ts ADDED
@@ -0,0 +1,2 @@
1
+ import { type ProjectConfiguration, type Tree } from '@nx/devkit';
2
+ export declare function getProjectSourceRoot(project: ProjectConfiguration, tree?: Tree): string;
package/src/generators/utils/project-config.js ADDED
@@ -0,0 +1,18 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getProjectSourceRoot = getProjectSourceRoot;
4
+ const devkit_1 = require("@nx/devkit");
5
+ const node_fs_1 = require("node:fs");
6
+ const node_path_1 = require("node:path");
7
+ function getProjectSourceRoot(project, tree) {
8
+ if (tree) {
9
+ return (project.sourceRoot ??
10
+ (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'src'))
11
+ ? (0, devkit_1.joinPathFragments)(project.root, 'src')
12
+ : project.root));
13
+ }
14
+ return (project.sourceRoot ??
15
+ ((0, node_fs_1.existsSync)((0, node_path_1.join)(devkit_1.workspaceRoot, project.root, 'src'))
16
+ ? (0, devkit_1.joinPathFragments)(project.root, 'src')
17
+ : project.root));
18
+ }
package/src/utils/versions.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  export declare const nxVersion: any;
2
2
  export declare const typescriptVersion = "~5.8.2";
3
- export declare const angularCliVersion = "~20.0.0";
3
+ export declare const angularCliVersion = "~20.1.0";
4
4
  export declare const angularRspackVersion = "^21.1.0";
package/src/utils/versions.js CHANGED
@@ -5,5 +5,5 @@ exports.nxVersion = require('../../package.json').version;
5
5
  exports.typescriptVersion = '~5.8.2';
6
6
  // TODO: remove when preset generation is reworked and
7
7
  // deps are not installed from workspace
8
- exports.angularCliVersion = '~20.0.0';
8
+ exports.angularCliVersion = '~20.1.0';
9
9
  exports.angularRspackVersion = '^21.1.0';