@nx/workspace 19.0.0-beta.1 → 19.0.0-beta.10

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?",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "19.0.0-beta.1",
+  "version": "19.0.0-beta.10",
   "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.0.0-beta.1",
+    "@nx/devkit": "19.0.0-beta.10",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "19.0.0-beta.1",
-    "@nrwl/workspace": "19.0.0-beta.1"
+    "nx": "19.0.0-beta.10",
+    "@nrwl/workspace": "19.0.0-beta.10"
   },
   "publishConfig": {
     "access": "public"

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

@@ -41,15 +41,17 @@ jobs:
             echo "##vso[task.setvariable variable=BASE_SHA]$LAST_SHA"
           fi
 
+      <% if(packageManager == 'pnpm'){ %>
+      - script: npm install --prefix=$HOME/.local -g pnpm@8
+        displayName: Install PNPM
+
+      <% } %>
       # 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<% } %>"
 
-      <% if(packageManager == 'pnpm'){ %>
-      - script: npm install --prefix=$HOME/.local -g pnpm@8
-        displayName: Install PNPM
-      <% } %>- script: <%= packageManagerInstall %>
-      - script: git branch --track main origin/main
+      - script: <%= packageManagerInstall %>
+      - script: git branch --track <%= mainBranch %> origin/<%= mainBranch %>
         condition: eq(variables['Build.Reason'], 'PullRequest')
 
       - script: <%= packageManagerPrefix %> nx-cloud record -- nx format:check --base=$(BASE_SHA) --head=$(HEAD_SHA)

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

@@ -11,13 +11,14 @@ pipelines:
           script:
             - export NX_BRANCH=$BITBUCKET_PR_ID
 
+            <% if(packageManager == 'pnpm'){ %>
+            - npm install --prefix=$HOME/.local -g pnpm@8
+
+            <% } %>
             # 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
-            <% } %>
             - <%= packageManagerInstall %>
 
             - <%= packageManagerPrefix %> nx-cloud record -- nx format:check

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

@@ -9,23 +9,20 @@ jobs:
       - image: cimg/node:lts-browsers
     steps:
       - checkout
+      <% if(packageManager == 'pnpm'){ %>
+      - run:
+          name: Install PNPM
+          command: npm install --prefix=$HOME/.local -g pnpm@8
+      <% } %>
 
       # 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 %>
+      - run: <%= packageManagerInstall %>
       - nx/set-shas:
           main-branch-name: '<%= mainBranch %>'
 
-      # Required for nx affected if we're on a branch
-      - run: git branch --track main origin/main
-        condition: eq(variables['Build.Reason'], 'PullRequest')
-
       - 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<% } %>
 

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

@@ -17,16 +17,17 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      <% if(packageManager == 'pnpm'){ %>
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+      <% } %>
 
       # 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
+      # Cache node_modules
       - uses: actions/setup-node@v3
         with:
           node-version: 20
@@ -34,8 +35,5 @@ jobs:
       - run: <%= packageManagerInstall %>
       - uses: nrwl/nx-set-shas@v4
 
-      - run: git branch --track main origin/main
-        if: ${{ github.event_name == 'pull_request' }}
-
       - run: <%= packageManagerPrefix %> nx-cloud record -- nx format:check
       - run: <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>

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

@@ -9,13 +9,13 @@ variables:
     - main
     - merge_requests
   script:
+    <% if(packageManager == 'pnpm'){ %>
+    - npm install --prefix=$HOME/.local -g pnpm@8
+    <% } %>
     # 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
-    <% } %>
     - <%= packageManagerInstall %>
     - NX_HEAD=$CI_COMMIT_SHA
     - NX_BASE=${CI_MERGE_REQUEST_DIFF_BASE_SHA:-$CI_COMMIT_BEFORE_SHA}

package/src/generators/new/schema.json

@@ -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

@@ -16,7 +16,6 @@ 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;
@@ -33,7 +32,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,
@@ -50,7 +49,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,
@@ -66,7 +65,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,
         });
     }
@@ -81,7 +80,7 @@ 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,
         });
@@ -94,7 +93,7 @@ async function createPreset(tree, options) {
             directory: (0, path_1.join)('apps', options.name),
             projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
-            e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             unitTestRunner: 'vitest',
             addPlugin,
         });
@@ -107,7 +106,7 @@ async function createPreset(tree, options) {
             directory: '.',
             projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
-            e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             rootProject: true,
             unitTestRunner: 'vitest',
             addPlugin,
@@ -122,7 +121,7 @@ async function createPreset(tree, options) {
             projectNameAndRootFormat: 'as-provided',
             style: options.style,
             linter: options.linter,
-            e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             addPlugin,
         });
     }
@@ -136,7 +135,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,
         });
@@ -150,7 +149,7 @@ async function createPreset(tree, options) {
             projectNameAndRootFormat: 'as-provided',
             style: options.style,
             linter: options.linter,
-            e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             addPlugin,
         });
     }
@@ -164,7 +163,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,
         });
@@ -180,7 +179,7 @@ async function createPreset(tree, options) {
             linter: options.linter,
             appDir: options.nextAppDir,
             src: options.nextSrcDir,
-            e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             addPlugin,
         });
     }
@@ -195,7 +194,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,
         });
@@ -210,7 +209,7 @@ async function createPreset(tree, options) {
             style: options.style,
             linter: options.linter,
             bundler: 'vite',
-            e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             addPlugin,
         });
     }
@@ -238,11 +237,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),

package/src/generators/preset/schema.json

@@ -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/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",

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";

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;