@nx/workspace 19.1.0-canary.20240510-1a85787 → 19.1.0-canary.20240514-cc9b7f3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "19.1.0-canary.20240510-1a85787",
+  "version": "19.1.0-canary.20240514-cc9b7f3",
   "private": false,
   "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.",
   "repository": {
@@ -61,13 +61,13 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "19.1.0-canary.20240510-1a85787",
+    "@nx/devkit": "19.1.0-canary.20240514-cc9b7f3",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "19.1.0-canary.20240510-1a85787",
-    "@nrwl/workspace": "19.1.0-canary.20240510-1a85787"
+    "nx": "19.1.0-canary.20240514-cc9b7f3",
+    "@nrwl/workspace": "19.1.0-canary.20240514-cc9b7f3"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/ci-workflow/ci-workflow.js

@@ -19,7 +19,7 @@ exports.ciWorkflowGenerator = ciWorkflowGenerator;
 function normalizeOptions(options, tree) {
     const { name: workflowName, fileName: workflowFileName } = (0, devkit_1.names)(options.name);
     const packageManager = (0, devkit_1.detectPackageManager)();
-    const { exec: packageManagerPrefix, ciInstall: packageManagerInstall } = (0, devkit_1.getPackageManagerCommand)(packageManager);
+    const { exec: packageManagerPrefix, ciInstall: packageManagerInstall, dlx: packageManagerPreInstallPrefix, } = (0, devkit_1.getPackageManagerCommand)(packageManager);
     let nxCloudHost = 'nx.app';
     try {
         const nxCloudUrl = (0, nx_cloud_utils_1.getNxCloudUrl)((0, devkit_1.readJson)(tree, 'nx.json'));
@@ -38,6 +38,7 @@ function normalizeOptions(options, tree) {
         packageManager,
         packageManagerInstall,
         packageManagerPrefix,
+        packageManagerPreInstallPrefix,
         mainBranch: (0, default_base_1.deduceDefaultBase)(),
         hasE2E,
         nxCloudHost,

package/src/generators/ci-workflow/files/azure/azure-pipelines.yml__tmpl__

@@ -48,7 +48,7 @@ jobs:
       <% } %>
       # Connect your workspace on <%= nxCloudHost %> and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>" targets have been requested
-      # - script: <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+      # - script: <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
 
       - script: <%= packageManagerInstall %>
       - script: git branch --track <%= mainBranch %> origin/<%= mainBranch %>
@@ -56,4 +56,5 @@ jobs:
 
       # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
       # - script: <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
-      - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>
+      - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) lint test build<% if(hasE2E){ %>
+      - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) --parallel 1 e2e-ci<% } %>

package/src/generators/ci-workflow/files/bitbucket-pipelines/bitbucket-pipelines.yml__tmpl__

@@ -17,12 +17,13 @@ pipelines:
             <% } %>
             # Connect your workspace on <%= nxCloudHost %> and uncomment this to enable task distribution.
             # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>" targets have been requested
-            # - <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+            # - <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
 
             - <%= packageManagerInstall %>
 
             - <%= packageManagerPrefix %> nx-cloud record -- nx format:check
-            - <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %> e2e-ci<% } %> --base=origin/<%= mainBranch %>
+            - <%= packageManagerPrefix %> nx affected --base=origin/<%= mainBranch %> -t lint test build<% if(hasE2E){ %>
+            - <%= packageManagerPrefix %> nx affected --base=origin/<%= mainBranch %> --parallel 1 -t e2e-ci<% } %>
 
   branches:
     main:
@@ -32,7 +33,7 @@ pipelines:
             - export NX_BRANCH=$BITBUCKET_BRANCH
             # Connect your workspace on <%= nxCloudHost %> and uncomment this to enable task distribution.
             # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>" targets have been requested
-            # - <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+            # - <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
 
             <% if(packageManager == 'pnpm'){ %>
             - npm install --prefix=$HOME/.local -g pnpm@8

package/src/generators/ci-workflow/files/circleci/.circleci/config.yml__tmpl__

@@ -17,7 +17,7 @@ jobs:
 
       # Connect your workspace on <%= nxCloudHost %> and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>" targets have been requested
-      # - run: <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+      # - run: <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
 
       - run: <%= packageManagerInstall %>
       - nx/set-shas:
@@ -25,7 +25,8 @@ jobs:
 
       # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
       # - run: <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
-      - run: <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>
+      - run: <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD -t lint test build<% if(hasE2E){ %>
+      - run: <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD --parallel 1 -t e2e-ci<% } %>
 
 workflows:
   version: 2

package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__

@@ -25,7 +25,7 @@ jobs:
 
       # Connect your workspace on <%= nxCloudHost %> and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>" targets have been requested
-      # - run: <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+      # - run: <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
 
       # Cache node_modules
       - uses: actions/setup-node@v3
@@ -37,4 +37,5 @@ jobs:
 
       # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
       # - run: <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
-      - run: <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>
+      - run: <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %>
+      - run: <%= packageManagerPrefix %> nx affected --parallel 1 -t e2e-ci<% } %>

package/src/generators/ci-workflow/files/gitlab/.gitlab-ci.yml__tmpl__

@@ -14,7 +14,7 @@ variables:
     <% } %>
     # Connect your workspace on <%= nxCloudHost %> and uncomment this to enable task distribution.
     # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>" targets have been requested
-    # - <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+    # - <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
 
     - <%= packageManagerInstall %>
     - NX_HEAD=$CI_COMMIT_SHA
@@ -22,4 +22,5 @@ variables:
 
     # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
     # - <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
-    - <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>
+    - <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD -t lint test build<% if(hasE2E){ %>
+    - <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD --parallel 1 -t e2e-ci<% } %>

package/src/generators/move/lib/update-imports.js

@@ -25,12 +25,18 @@ function updateImports(tree, schema, project) {
     let tsConfig;
     let mainEntryPointImportPath;
     let secondaryEntryPointImportPaths;
+    let serverEntryPointImportPath;
     if (tree.exists(tsConfigPath)) {
         tsConfig = (0, devkit_1.readJson)(tree, tsConfigPath);
         const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
         mainEntryPointImportPath = Object.keys(tsConfig.compilerOptions?.paths ?? {}).find((path) => tsConfig.compilerOptions.paths[path].some((x) => x.startsWith(ensureTrailingSlash(sourceRoot))));
         secondaryEntryPointImportPaths = Object.keys(tsConfig.compilerOptions?.paths ?? {}).filter((path) => tsConfig.compilerOptions.paths[path].some((x) => x.startsWith(ensureTrailingSlash(project.root)) &&
             !x.startsWith(ensureTrailingSlash(sourceRoot))));
+        // Next.js libs have a custom path for the server we need to update that as well
+        // example "paths": { @acme/lib/server : ['libs/lib/src/server.ts'] }
+        serverEntryPointImportPath = Object.keys(tsConfig.compilerOptions?.paths ?? {}).find((path) => tsConfig.compilerOptions.paths[path].some((x) => x.startsWith(ensureTrailingSlash(sourceRoot)) &&
+            x.includes('server') &&
+            path.endsWith('server')));
     }
     mainEntryPointImportPath ??= (0, utils_1.normalizePathSlashes)((0, get_import_path_1.getImportPath)(tree, project.root.slice(libsDir.length).replace(/^\/|\\/, '')));
     const projectRefs = [
@@ -48,6 +54,14 @@ function updateImports(tree, schema, project) {
                 : null,
         })),
     ];
+    if (serverEntryPointImportPath &&
+        schema.importPath &&
+        serverEntryPointImportPath.startsWith(mainEntryPointImportPath)) {
+        projectRefs.push({
+            from: serverEntryPointImportPath,
+            to: serverEntryPointImportPath.replace(mainEntryPointImportPath, schema.importPath),
+        });
+    }
     for (const projectRef of projectRefs) {
         if (schema.updateImportPath && projectRef.to) {
             const replaceProjectRef = new RegExp(projectRef.from, 'g');

package/src/generators/remove/lib/update-jest-config.js

@@ -38,7 +38,8 @@ function updateJestConfig(tree, schema, projectConfig) {
     const { createSourceFile, ScriptTarget, isPropertyAssignment, isArrayLiteralExpression, isStringLiteral, } = tsModule;
     const projectToRemove = schema.projectName;
     const rootConfigPath = (0, jest_config_1.findRootJestConfig)(tree);
-    if (!tree.exists(rootConfigPath) ||
+    if (!rootConfigPath ||
+        !tree.exists(rootConfigPath) ||
         !tree.exists((0, path_1.join)(projectConfig.root, 'jest.config.ts')) ||
         isUsingUtilityFunction(tree) ||
         !isMonorepoConfig(tree)) {