@nx/workspace 0.0.0-pr-22179-271588f → 0.0.0-pr-26482-ebe2dba

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2023 Narwhal Technologies Inc.
+Copyright (c) 2017-2024 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/migrations.json

@@ -1,11 +1,5 @@
 {
   "generators": {
-    "15-7-0-split-configuration-into-project-json-files": {
-      "version": "15.7.0-beta.0",
-      "description": "Split global configuration files (e.g., workspace.json) into individual project.json files.",
-      "cli": "nx",
-      "implementation": "./src/migrations/update-15-7-0/split-configuration-into-project-json-files"
-    },
     "update-16-0-0-add-nx-packages": {
       "cli": "nx",
       "version": "16.0.0-beta.1",
@@ -26,18 +20,6 @@
     }
   },
   "packageJsonUpdates": {
-    "15.8.0": {
-      "version": "15.8.0-beta.2",
-      "x-prompt": "Do you want to update to TypeScript v4.9?",
-      "requires": {
-        "typescript": ">=4.8.2 <4.9.0"
-      },
-      "packages": {
-        "typescript": {
-          "version": "~4.9.5"
-        }
-      }
-    },
     "16.1.0": {
       "version": "16.1.0-beta.0",
       "x-prompt": "Do you want to update to TypeScript v5.0?",
@@ -85,6 +67,19 @@
           "version": "~5.3.2"
         }
       }
+    },
+    "18.2.0": {
+      "version": "18.2.0-beta.0",
+      "x-prompt": "Do you want to update to TypeScript v5.4?",
+      "requires": {
+        "typescript": ">=5.3.0 <5.4.0"
+      },
+      "packages": {
+        "typescript": {
+          "version": "~5.4.2",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "0.0.0-pr-22179-271588f",
+  "version": "0.0.0-pr-26482-ebe2dba",
   "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": {
@@ -19,7 +19,7 @@
     "Cypress",
     "CLI"
   ],
-  "main": "./index.js",
+  "main": "./index",
   "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
@@ -61,13 +61,13 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "0.0.0-pr-22179-271588f",
+    "@nx/devkit": "0.0.0-pr-26482-ebe2dba",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "0.0.0-pr-22179-271588f",
-    "@nrwl/workspace": "0.0.0-pr-22179-271588f"
+    "nx": "0.0.0-pr-26482-ebe2dba",
+    "@nrwl/workspace": "0.0.0-pr-26482-ebe2dba"
   },
   "publishConfig": {
     "access": "public"

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

@@ -8,11 +8,6 @@ const nx_cloud_utils_1 = require("nx/src/utils/nx-cloud-utils");
 async function ciWorkflowGenerator(tree, schema) {
     const ci = schema.ci;
     const nxJson = (0, devkit_1.readJson)(tree, 'nx.json');
-    const nxCloudUsed = nxJson.nxCloudAccessToken ??
-        Object.values(nxJson.tasksRunnerOptions ?? {}).find((r) => r.runner == '@nrwl/nx-cloud' || r.runner == 'nx-cloud');
-    if (!nxCloudUsed) {
-        throw new Error('This workspace is not connected to Nx Cloud.');
-    }
     if (ci === 'bitbucket-pipelines' && defaultBranchNeedsOriginPrefix(nxJson)) {
         (0, devkit_1.writeJson)(tree, 'nx.json', appendOriginPrefix(nxJson));
     }
@@ -24,9 +19,13 @@ 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 nxCloudUrl = (0, nx_cloud_utils_1.getNxCloudUrl)((0, devkit_1.readJson)(tree, 'nx.json'));
-    const nxCloudHost = new URL(nxCloudUrl).host;
+    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'));
+        nxCloudHost = new URL(nxCloudUrl).host;
+    }
+    catch { }
     const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
     const allDependencies = {
         ...packageJson.dependencies,
@@ -39,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__

@@ -27,11 +27,7 @@ jobs:
       - bash: az devops configure --defaults organization=$(System.TeamFoundationCollectionUri) project=$(System.TeamProject)
         displayName: 'Set default Azure DevOps organization and project'
       # Get last successfull commit from Azure Devops CLI
-      - displayName: 'Get last successful commit SHA'
-        condition: ne(variables['Build.Reason'], 'PullRequest')
-        env:
-          AZURE_DEVOPS_EXT_PAT: $(System.AccessToken)
-        bash: |
+      - bash: |
           LAST_SHA=$(az pipelines build list --branch $(Build.SourceBranchName) --definition-ids $(System.DefinitionId) --result succeeded --top 1 --query "[0].triggerInfo.\"ci.sourceSha\"")
           if [ -z "$LAST_SHA" ]
           then
@@ -40,15 +36,30 @@ jobs:
             echo "Last successful commit SHA: $LAST_SHA"
             echo "##vso[task.setvariable variable=BASE_SHA]$LAST_SHA"
           fi
-
-      # 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<% } %>"
+        displayName: 'Get last successful commit SHA'
+        condition: ne(variables['Build.Reason'], 'PullRequest')
+        env:
+          AZURE_DEVOPS_EXT_PAT: $(System.AccessToken)
 
       <% if(packageManager == 'pnpm'){ %>
       - script: npm install --prefix=$HOME/.local -g pnpm@8
         displayName: Install PNPM
-      <% } %>- script: <%= packageManagerInstall %>
 
-      - script: <%= packageManagerPrefix %> nx-cloud record -- nx format:check --base=$(BASE_SHA) --head=$(HEAD_SHA)
-      - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>
+      <% } %>
+      <% if(packageManager == 'bun'){ %>
+      - script: npm install --prefix=$HOME/.local -g Bun
+        displayName: Install Bun
+
+      <% } %>
+      # 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: <%= 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 %>
+        condition: eq(variables['Build.Reason'], 'PullRequest')
+
+      # 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) 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__

@@ -11,31 +11,42 @@ pipelines:
           script:
             - export NX_BRANCH=$BITBUCKET_PR_ID
 
-            # 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<% } %>"
-
             <% if(packageManager == 'pnpm'){ %>
             - npm install --prefix=$HOME/.local -g pnpm@8
+
+            <% } %>
+            <% if(packageManager == 'bun'){ %>
+            - npm install --prefix=$HOME/.local -g bun
+
             <% } %>
+            # 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
+            # - <%= 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:
       - step:
           name: 'Build and test affected apps on "<%= mainBranch %>" branch changes'
           script:
+            - 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
             <% } %>
+            <% if(packageManager == 'bun'){ %>
+            - npm install --prefix=$HOME/.local -g bun
+            <% } %>
             - <%= packageManagerInstall %>
 
-            - <%= packageManagerPrefix %> nx-cloud record -- nx format:check
+            # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+            # - <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
             - <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %> e2e-ci<% } %> --base=HEAD~1

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

@@ -9,21 +9,30 @@ jobs:
       - image: cimg/node:lts-browsers
     steps:
       - checkout
-
-      # 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<% } %>"
-
       <% if(packageManager == 'pnpm'){ %>
       - run:
           name: Install PNPM
           command: npm install --prefix=$HOME/.local -g pnpm@8
-      <% } %>- run: <%= packageManagerInstall %>
+      <% } %>
+      <% if(packageManager == 'bun'){ %>
+      - run:
+          name: Install Bun
+          command: npm install --prefix=$HOME/.local -g bun
+      <% } %>
+
+
+      # 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: <%= 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:
           main-branch-name: '<%= mainBranch %>'
 
-      - run: <%= packageManagerPrefix %> nx-cloud record -- nx format:check --base=$NX_BASE --head=$NX_HEAD
-      - run: <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>
+      # 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){ %>
+      - 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__

@@ -17,22 +17,32 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-
-      # 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<% } %>"
-
       <% if(packageManager == 'pnpm'){ %>
       - uses: pnpm/action-setup@v2
         with:
           version: 8
-      <% } %># Cache node_modules
+      <% } %>
+      <% if(packageManager == 'bun'){ %>
+      - uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: latest
+      <% } %>
+
+      # 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: <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+
+      <% if(packageManager != 'bun'){ %>
+      # Cache node_modules
       - uses: actions/setup-node@v3
         with:
           node-version: 20
           cache: '<%= packageManager %>'
+       <% } %>
       - run: <%= packageManagerInstall %>
       - uses: nrwl/nx-set-shas@v4
 
-      - run: <%= packageManagerPrefix %> nx-cloud record -- nx format:check
-      - run: <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>
+      # 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){ %>
+      - run: <%= packageManagerPrefix %> nx affected --parallel 1 -t e2e-ci<% } %>

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

@@ -9,16 +9,21 @@ variables:
     - main
     - merge_requests
   script:
-    # 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<% } %>"
-
     <% if(packageManager == 'pnpm'){ %>
     - npm install --prefix=$HOME/.local -g pnpm@8
     <% } %>
+    <% if(packageManager == 'bun'){ %>
+    - npm install --prefix=$HOME/.local -g bun
+    <% } %>
+    # 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
+    # - <%= 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
     - NX_BASE=${CI_MERGE_REQUEST_DIFF_BASE_SHA:-$CI_COMMIT_BEFORE_SHA}
 
-    - <%= packageManagerPrefix %> nx-cloud record -- nx format:check --base=$NX_BASE --head=$NX_HEAD
-    - <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>
+    # 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){ %>
+    - <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD --parallel 1 -t e2e-ci<% } %>

package/src/generators/convert-to-monorepo/convert-to-monorepo.js

@@ -25,6 +25,18 @@ async function monorepoGenerator(tree, options) {
     const isRootProjectApp = rootProject.projectType === 'application';
     const appsDir = isRootProjectApp ? 'apps' : 'packages';
     const libsDir = isRootProjectApp ? 'libs' : 'packages';
+    if (rootProject) {
+        // If project was created using `nx init` then it might not have project.json.
+        // Need to create one to avoid name conflicts with root package.json.
+        if (!tree.exists('project.json')) {
+            (0, devkit_1.writeJson)(tree, 'project.json', { name: rootProject.name });
+        }
+        (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+            // Avoid name conflicts once we move root project into its own folder.
+            json.name = `@${rootProject.name}/source`;
+            return json;
+        });
+    }
     for (const project of projectsToMove) {
         await (0, move_1.moveGenerator)(tree, {
             projectName: project.name,

package/src/generators/move/lib/move-project-files.js

@@ -15,10 +15,7 @@ function moveProjectFiles(tree, schema, project) {
     const knownRootProjectFiles = [
         // Config files
         'project.json',
-        'tsconfig.json',
-        'tsconfig.app.json',
-        'tsconfig.lib.json',
-        'tsconfig.spec.json',
+        /^tsconfig(?!\.base\.json$)((\..+)?\.json$|json$)/,
         '.babelrc',
         '.eslintrc.json',
         'eslint.config.js',

package/src/generators/move/lib/normalize-schema.js

@@ -133,7 +133,7 @@ function logDeprecationMessage(formats, options) {
         ? '@nx/angular:move'
         : '@nx/workspace:move';
     devkit_1.logger.warn((0, devkit_1.stripIndents) `
-    In Nx 19, the project name and destination will no longer be derived.
+    In Nx 20, the project name and destination will no longer be derived.
     Please provide the exact new project name and destination in the future.
     Example: nx g ${callingGenerator} --projectName ${options.projectName} --destination ${formats['derived'].destination}` +
         (options.projectName !== formats['derived'].newProjectName

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');
@@ -124,7 +138,7 @@ function updateImportDeclarations(sourceFile, from, to) {
     ]);
     const changes = [];
     for (const { moduleSpecifier } of importDecls) {
-        if (tsModule.isStringLiteral(moduleSpecifier)) {
+        if (moduleSpecifier && tsModule.isStringLiteral(moduleSpecifier)) {
             changes.push(...updateModuleSpecifier(moduleSpecifier, from, to));
         }
     }

package/src/generators/new/files-integrated-repo/__dot__gitignore

@@ -38,4 +38,5 @@ testem.log
 .DS_Store
 Thumbs.db
 
-.nx/cache
+.nx/cache
+.nx/workspace-data

package/src/generators/new/files-package-based-repo/__dot__gitignore

@@ -39,3 +39,4 @@ testem.log
 Thumbs.db
 
 .nx/cache
+.nx/workspace-data

package/src/generators/new/files-root-app/__dot__gitignore

@@ -38,4 +38,5 @@ testem.log
 .DS_Store
 Thumbs.db
 
-.nx/cache
+.nx/cache
+.nx/workspace-data

package/src/generators/new/generate-preset.js

@@ -98,6 +98,9 @@ function getPresetDependencies({ preset, presetVersion, bundler, e2eTestRunner,
         case presets_1.Preset.NextJs:
         case presets_1.Preset.NextJsStandalone:
             return { dependencies: { '@nx/next': versions_1.nxVersion }, dev: {} };
+        case presets_1.Preset.RemixStandalone:
+        case presets_1.Preset.RemixMonorepo:
+            return { dependencies: { '@nx/remix': versions_1.nxVersion }, dev: {} };
         case presets_1.Preset.VueMonorepo:
         case presets_1.Preset.VueStandalone:
             return {

package/src/generators/new/generate-workspace-files.js

@@ -82,6 +82,7 @@ function createFiles(tree, options) {
         options.preset === presets_1.Preset.NuxtStandalone ||
         options.preset === presets_1.Preset.NodeStandalone ||
         options.preset === presets_1.Preset.NextJsStandalone ||
+        options.preset === presets_1.Preset.RemixStandalone ||
         options.preset === presets_1.Preset.TsStandalone
         ? './files-root-app'
         : options.preset === presets_1.Preset.NPM

package/src/generators/new/new.js

@@ -71,7 +71,6 @@ function normalizeOptions(options) {
     const normalized = {
         ...options,
     };
-    normalized.name = (0, devkit_1.names)(options.name).fileName;
     if (!options.directory) {
         normalized.directory = normalized.name;
     }

package/src/generators/new/schema.json

@@ -56,7 +56,7 @@
     "packageManager": {
       "description": "The package manager used to install dependencies.",
       "type": "string",
-      "enum": ["npm", "yarn", "pnpm"]
+      "enum": ["npm", "yarn", "pnpm", "bun"]
     },
     "framework": {
       "description": "The framework which the application is using",
@@ -76,7 +76,7 @@
     "e2eTestRunner": {
       "description": "The tool to use for running e2e tests.",
       "type": "string",
-      "enum": ["cypress", "playwright", "jest", "detox", "none"]
+      "enum": ["playwright", "cypress", "jest", "detox", "none"]
     },
     "ssr": {
       "description": "Enable Server-Side Rendering (SSR) and Static Site Generation (SSG/Prerendering) for the Angular application.",

package/src/generators/preset/preset.js

@@ -5,7 +5,6 @@ const devkit_1 = require("@nx/devkit");
 const presets_1 = require("../utils/presets");
 const path_1 = require("path");
 async function presetGenerator(tree, options) {
-    options = normalizeOptions(options);
     const presetTask = await createPreset(tree, options);
     return async () => {
         (0, devkit_1.installPackagesTask)(tree);
@@ -16,12 +15,9 @@ async function presetGenerator(tree, options) {
 exports.presetGenerator = presetGenerator;
 exports.default = presetGenerator;
 async function createPreset(tree, options) {
-    console.log('Crate preset');
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
-    console.log('Add plugin', addPlugin);
-    console.log(options.preset, presets_1.Preset.ReactNative);
     if (options.preset === presets_1.Preset.Apps) {
         return;
     }
@@ -35,7 +31,7 @@ async function createPreset(tree, options) {
             linter: options.linter,
             standalone: options.standaloneApi,
             routing: options.routing,
-            e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             bundler: options.bundler,
             ssr: options.ssr,
             prefix: options.prefix,
@@ -52,7 +48,7 @@ async function createPreset(tree, options) {
             routing: options.routing,
             rootProject: true,
             standalone: options.standaloneApi,
-            e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             bundler: options.bundler,
             ssr: options.ssr,
             prefix: options.prefix,
@@ -68,7 +64,7 @@ async function createPreset(tree, options) {
             style: options.style,
             linter: options.linter,
             bundler: options.bundler ?? 'webpack',
-            e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             addPlugin,
         });
     }
@@ -83,11 +79,38 @@ async function createPreset(tree, options) {
             linter: options.linter,
             rootProject: true,
             bundler: options.bundler ?? 'vite',
-            e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             unitTestRunner: options.bundler === 'vite' ? 'vitest' : 'jest',
             addPlugin,
         });
     }
+    else if (options.preset === presets_1.Preset.RemixMonorepo) {
+        const { applicationGenerator: remixApplicationGenerator } = require('@nx' +
+            '/remix/generators');
+        return remixApplicationGenerator(tree, {
+            name: options.name,
+            directory: (0, path_1.join)('apps', options.name),
+            projectNameAndRootFormat: 'as-provided',
+            linter: options.linter,
+            e2eTestRunner: options.e2eTestRunner ?? 'playwright',
+            unitTestRunner: 'vitest',
+            addPlugin,
+        });
+    }
+    else if (options.preset === presets_1.Preset.RemixStandalone) {
+        const { applicationGenerator: remixApplicationGenerator } = require('@nx' +
+            '/remix/generators');
+        return remixApplicationGenerator(tree, {
+            name: options.name,
+            directory: '.',
+            projectNameAndRootFormat: 'as-provided',
+            linter: options.linter,
+            e2eTestRunner: options.e2eTestRunner ?? 'playwright',
+            rootProject: true,
+            unitTestRunner: 'vitest',
+            addPlugin,
+        });
+    }
     else if (options.preset === presets_1.Preset.VueMonorepo) {
         const { applicationGenerator: vueApplicationGenerator } = require('@nx' +
             '/vue');
@@ -97,7 +120,7 @@ async function createPreset(tree, options) {
             projectNameAndRootFormat: 'as-provided',
             style: options.style,
             linter: options.linter,
-            e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             addPlugin,
         });
     }
@@ -111,7 +134,7 @@ async function createPreset(tree, options) {
             style: options.style,
             linter: options.linter,
             rootProject: true,
-            e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             unitTestRunner: 'vitest',
             addPlugin,
         });
@@ -125,7 +148,7 @@ async function createPreset(tree, options) {
             projectNameAndRootFormat: 'as-provided',
             style: options.style,
             linter: options.linter,
-            e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             addPlugin,
         });
     }
@@ -139,7 +162,7 @@ async function createPreset(tree, options) {
             style: options.style,
             linter: options.linter,
             rootProject: true,
-            e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             unitTestRunner: 'vitest',
             addPlugin,
         });
@@ -155,7 +178,7 @@ async function createPreset(tree, options) {
             linter: options.linter,
             appDir: options.nextAppDir,
             src: options.nextSrcDir,
-            e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             addPlugin,
         });
     }
@@ -170,7 +193,7 @@ async function createPreset(tree, options) {
             linter: options.linter,
             appDir: options.nextAppDir,
             src: options.nextSrcDir,
-            e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             rootProject: true,
             addPlugin,
         });
@@ -185,7 +208,7 @@ async function createPreset(tree, options) {
             style: options.style,
             linter: options.linter,
             bundler: 'vite',
-            e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             addPlugin,
         });
     }
@@ -213,11 +236,8 @@ async function createPreset(tree, options) {
         });
     }
     else if (options.preset === presets_1.Preset.ReactNative) {
-        console.log('Before require');
         const { reactNativeApplicationGenerator } = require('@nx' +
             '/react-native');
-        console.log('Hello', reactNativeApplicationGenerator);
-        console.log('Active require');
         return reactNativeApplicationGenerator(tree, {
             name: options.name,
             directory: (0, path_1.join)('apps', options.name),
@@ -295,7 +315,3 @@ async function createPreset(tree, options) {
         throw new Error(`Invalid preset ${options.preset}`);
     }
 }
-function normalizeOptions(options) {
-    options.name = (0, devkit_1.names)(options.name).fileName;
-    return options;
-}

package/src/generators/preset/schema.json

@@ -62,7 +62,7 @@
     "packageManager": {
       "description": "The package manager used to install dependencies.",
       "type": "string",
-      "enum": ["npm", "yarn", "pnpm"]
+      "enum": ["npm", "yarn", "pnpm", "bun"]
     },
     "framework": {
       "description": "The framework which the application is using",
@@ -93,7 +93,7 @@
     "e2eTestRunner": {
       "description": "The tool to use for running e2e tests.",
       "type": "string",
-      "enum": ["cypress", "playwright", "jest", "detox", "none"]
+      "enum": ["playwright", "cypress", "jest", "detox", "none"]
     },
     "ssr": {
       "description": "Enable Server-Side Rendering (SSR) and Static Site Generation (SSG/Prerendering) for the Angular application.",

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)) {

package/src/generators/utils/presets.d.ts

@@ -1,11 +1,5 @@
 export declare enum Preset {
     Apps = "apps",
-    /** @deprecated Use Apps instead
-     */
-    Empty = "empty",
-    /** @deprecated Use NPM instead
-     */
-    Core = "core",
     NPM = "npm",
     TS = "ts",
     WebComponents = "web-components",
@@ -14,6 +8,8 @@ export declare enum Preset {
     ReactMonorepo = "react-monorepo",
     ReactStandalone = "react-standalone",
     NextJsStandalone = "nextjs-standalone",
+    RemixMonorepo = "remix-monorepo",
+    RemixStandalone = "remix-standalone",
     ReactNative = "react-native",
     VueMonorepo = "vue-monorepo",
     VueStandalone = "vue-standalone",

package/src/generators/utils/presets.js

@@ -4,13 +4,6 @@ exports.Preset = void 0;
 var Preset;
 (function (Preset) {
     Preset["Apps"] = "apps";
-    // TODO(v19): Remove Empty and Core presets
-    /** @deprecated Use Apps instead
-     */
-    Preset["Empty"] = "empty";
-    /** @deprecated Use NPM instead
-     */
-    Preset["Core"] = "core";
     Preset["NPM"] = "npm";
     Preset["TS"] = "ts";
     Preset["WebComponents"] = "web-components";
@@ -19,6 +12,8 @@ var Preset;
     Preset["ReactMonorepo"] = "react-monorepo";
     Preset["ReactStandalone"] = "react-standalone";
     Preset["NextJsStandalone"] = "nextjs-standalone";
+    Preset["RemixMonorepo"] = "remix-monorepo";
+    Preset["RemixStandalone"] = "remix-standalone";
     Preset["ReactNative"] = "react-native";
     Preset["VueMonorepo"] = "vue-monorepo";
     Preset["VueStandalone"] = "vue-standalone";

package/src/utils/versions.d.ts

@@ -1,3 +1,3 @@
 export declare const nxVersion: any;
-export declare const typescriptVersion = "~5.3.2";
-export declare const angularCliVersion = "~17.2.0";
+export declare const typescriptVersion = "~5.4.2";
+export declare const angularCliVersion = "~18.0.0";

package/src/utils/versions.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularCliVersion = exports.typescriptVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.typescriptVersion = '~5.3.2';
+exports.typescriptVersion = '~5.4.2';
 // TODO: remove when preset generation is reworked and
 // deps are not installed from workspace
-exports.angularCliVersion = '~17.2.0';
+exports.angularCliVersion = '~18.0.0';

package/src/migrations/update-15-7-0/split-configuration-into-project-json-files.d.ts

@@ -1,3 +0,0 @@
-import { Tree } from '@nx/devkit';
-export declare function splitConfigurationIntoProjectJsonFiles(tree: Tree): Promise<void>;
-export default splitConfigurationIntoProjectJsonFiles;

package/src/migrations/update-15-7-0/split-configuration-into-project-json-files.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.splitConfigurationIntoProjectJsonFiles = void 0;
-const devkit_1 = require("@nx/devkit");
-const convert_to_nx_project_1 = require("../../generators/convert-to-nx-project/convert-to-nx-project");
-async function splitConfigurationIntoProjectJsonFiles(tree) {
-    await (0, convert_to_nx_project_1.default)(tree, { all: true });
-    await (0, devkit_1.formatFiles)(tree);
-}
-exports.splitConfigurationIntoProjectJsonFiles = splitConfigurationIntoProjectJsonFiles;
-exports.default = splitConfigurationIntoProjectJsonFiles;