Merge branch 'master' into fix/firstRelease-default-patch

.circleci/config.yml

@@ -6,7 +6,7 @@ version: 2.1
 orbs:
   nx: nrwl/nx@1.6.2
   rust: circleci/rust@1.6.0
-  browser-tools: circleci/browser-tools@1.4.6
+  browser-tools: circleci/browser-tools@1.4.8
 
 # -------------------------
 #        EXECUTORS
@@ -48,20 +48,20 @@ commands:
             - run:
                 name: Install pnpm package manager (linux)
                 command: |
-                  npm install --prefix=$HOME/.local -g @pnpm/exe@8.14
+                  npm install --prefix=$HOME/.local -g @pnpm/exe@8
       - when:
           condition:
             equal: [<< parameters.os >>, macos]
           steps:
             - run:
                 name: Install pnpm package manager (macos)
                 command: |
-                  npm install -g @pnpm/exe@8.14
+                  npm install -g @pnpm/exe@8
       - run:
           name: Install Dependencies
           command: |
             pnpm install --frozen-lockfile
-            pnpm playwright install --with-deps firefox webkit chrome
+            pnpm playwright install --with-deps
       - save_cache:
           name: Save pnpm Package Cache
           key: node-deps-{{ arch }}-v3-{{ checksum "pnpm-lock.yaml" }}
@@ -85,6 +85,7 @@ jobs:
       NX_NATIVE_LOGGING: 'false'
       NX_E2E_RUN_E2E: 'true'
       NX_CI_EXECUTION_ENV: 'linux'
+      NX_CLOUD_DTE_V2: 'true'
     steps:
       - checkout
       - nx/set-shas:
@@ -95,7 +96,6 @@ jobs:
             sudo apt-get update
             sudo apt-get install -y ca-certificates lsof
       - browser-tools/install-chrome
-      - browser-tools/install-chromedriver
       - run-pnpm-install:
           os: linux
       - run:
@@ -115,7 +115,7 @@ jobs:
             pids+=($!)
 
             (pnpm nx affected --targets=lint,test,build --base=$NX_BASE --head=$NX_HEAD --parallel=3 &&
-            pnpm nx affected --target=e2e --base=$NX_BASE --head=$NX_HEAD --parallel=1) &
+            pnpm nx affected --targets=e2e,e2e-ci --base=$NX_BASE --head=$NX_HEAD --parallel=1) &
             pids+=($!)
 
             for pid in "${pids[@]}"; do
@@ -158,7 +158,7 @@ jobs:
       - run:
           name: Run E2E Tests for macOS
           command: |
-            pnpm nx affected -t e2e-macos --parallel=1 --base=$NX_BASE --head=$NX_HEAD
+            pnpm nx affected -t e2e-macos-ci --parallel=1 --base=$NX_BASE --head=$NX_HEAD
           no_output_timeout: 45m
 
 # -------------------------

.eslintrc.json

@@ -17,14 +17,19 @@
           {
             "group": ["nx/src/plugins/js*"],
             "message": "Imports from 'nx/src/plugins/js' are not allowed. Use '@nx/js' instead"
+          },
+          {
+            "group": ["**/native-bindings", "**/native-bindings.js", ""],
+            "message": "Direct imports from native-bindings.js are not allowed. Import from index.js instead."
           }
         ]
       }
     ],
     "storybook/no-uninstalled-addons": [
       "error",
       {
-        "ignore": ["@nx/react/plugins/storybook"]
+        "ignore": ["@nx/react/plugins/storybook"],
+        "packageJsonLocation": "../../package.json"
       }
     ]
   },

.github/ISSUE_TEMPLATE/config.yml

@@ -1,14 +1,17 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Read the community guidelines
-    about: "Please make sure you have read the submission guidelines before posting an issue"
-    url: https://github.com/nrwl/nx/blob/master/CONTRIBUTING.md#-submitting-an-issue
-  - name: Want to start a discussion?
-    about: "Want to start a thread to discuss an idea? Use the discussions feature provided by GitHub."
-    url: https://github.com/nrwl/nx/discussions
-  - name: Have a question?
+  - name: "\U0001F680 Feature Request"
+    about: "Suggest a new feature to make Nx better"
+    url: https://github.com/nrwl/nx/discussions/new?category=feature-requests
+  - name: Start a Discussion
+    about: "Start a discussion to share your experience with Nx"
+    url: https://github.com/nrwl/nx/discussions/new/choose
+  - name: Join the Discord
     url: https://go.nx.dev/community
     about: "The Nx Official Discord Server is a great place for questions to be asked and answered. Please use the #forum if you need help with your workspace!"
   - name: Are you looking for integration with a new tool?
     url: https://nx.dev/community
     about: "There are a lot of awesome Plugins for Nx provided by the community! Check here to see if there is a community plugin to integrate your tool."
+  - name: Read the community guidelines
+    about: "Please make sure you have read the submission guidelines before posting an issue"
+    url: https://github.com/nrwl/nx/blob/master/CONTRIBUTING.md#-submitting-an-issue

.github/workflows/e2e-matrix.yml

@@ -17,6 +17,7 @@ env:
 permissions: { }
 jobs:
   preinstall:
+    if: ${{ github.repository_owner == 'nrwl' }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -34,7 +35,7 @@ jobs:
     name: Cache install (${{ matrix.os }}, node v${{ matrix.node_version }})
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PNPM
         run: |
@@ -54,6 +55,11 @@ jobs:
           path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ matrix.node_version }}-${{ github.run_id }}
 
+      - name: Ensure Python setuptools Installed on Macos
+        if: ${{ matrix.os == 'macos-latest' }}
+        id: brew-install-python-setuptools
+        run: brew install python-setuptools
+
       - name: Install packages
         if: steps.cache-modules.outputs.cache-hit != 'true'
         run: pnpm install --frozen-lockfile
@@ -86,6 +92,7 @@ jobs:
         run: npx cypress install
 
   e2e:
+    if: ${{ github.repository_owner == 'nrwl' }}
     needs: preinstall
     permissions:
       contents: read
@@ -104,41 +111,34 @@ jobs:
           - yarn
           - pnpm
         project:
-          - e2e-angular-core
-          - e2e-angular-extensions
-          - e2e-angular-module-federation
+          - e2e-angular
           - e2e-cypress
           - e2e-detox
           - e2e-esbuild
           - e2e-eslint
           - e2e-expo
+          - e2e-gradle
           - e2e-jest
           - e2e-js
           - e2e-lerna-smoke-tests
-          - e2e-next-core
-          - e2e-next-extensions
+          - e2e-next
           - e2e-node
           - e2e-nuxt
           - e2e-nx-init
-          - e2e-nx-misc
-          - e2e-nx-run
+          - e2e-nx
           - e2e-playwright
           - e2e-plugin
-          - e2e-react-core
-          - e2e-react-module-federation
-          - e2e-react-extensions
+          - e2e-react
           - e2e-react-native
           - e2e-release
           - e2e-remix
           - e2e-rollup
           - e2e-storybook
-          - e2e-storybook-angular
           - e2e-vite
           - e2e-vue
           - e2e-web
           - e2e-webpack
           - e2e-workspace-create
-          - e2e-workspace-create-npm
         include:
           # os short names
           - os: ubuntu-latest
@@ -151,11 +151,7 @@ jobs:
           - os: macos-latest
             os_timeout: 90
           # codeowner groups
-          - project: e2e-angular-core
-            codeowners: 'S04SS457V38'
-          - project: e2e-angular-extensions
-            codeowners: 'S04SS457V38'
-          - project: e2e-angular-module-federation
+          - project: e2e-angular
             codeowners: 'S04SS457V38'
           - project: e2e-cypress
             codeowners: 'S04T16BTJJY'
@@ -165,6 +161,8 @@ jobs:
             codeowners: 'S04SJ6HHP0X'
           - project: e2e-expo
             codeowners: 'S04TNCNJG5N'
+          - project: e2e-gradle
+            codeowners: 'S04TNCNJG5N'
           - project: e2e-jest
             codeowners: 'S04T16BTJJY'
           - project: e2e-js
@@ -173,25 +171,19 @@ jobs:
             codeowners: 'S04TNCVEETS'
           - project: e2e-eslint
             codeowners: 'S04SYJGKSCT'
-          - project: e2e-next-core
-            codeowners: 'S04TNCNJG5N'
-          - project: e2e-next-extensions
+          - project: e2e-next
             codeowners: 'S04TNCNJG5N'
           - project: e2e-node
             codeowners: 'S04SJ6HHP0X'
           - project: e2e-nx-init
             codeowners: 'S04SYHYKGNP'
-          - project: e2e-nx-misc
+          - project: e2e-nx
             codeowners: 'S04SYHYKGNP'
           - project: e2e-plugin
             codeowners: 'S04SYHYKGNP'
           - project: e2e-release
             codeowners: 'S04SYHYKGNP'
-          - project: e2e-nx-run
-            codeowners: 'S04SYHYKGNP'
-          - project: e2e-react-core
-            codeowners: 'S04TNCNJG5N'
-          - project: e2e-react-extensions
+          - project: e2e-react
             codeowners: 'S04TNCNJG5N'
           - project: e2e-react-native
             codeowners: 'S04TNCNJG5N'
@@ -203,8 +195,6 @@ jobs:
             codeowners: 'S04SVQ8H0G5'
           - project: e2e-playwright
             codeowners: 'S04SVQ8H0G5'
-          - project: e2e-storybook-angular
-            codeowners: 'S04SVQ8H0G5'
           - project: e2e-remix
             codeowners: 'S04SVQ8H0G5'
           - project: e2e-vite
@@ -217,8 +207,6 @@ jobs:
             codeowners: 'S04SJ6PL98X'
           - project: e2e-workspace-create
             codeowners: 'S04SYHYKGNP'
-          - project: e2e-workspace-create-npm
-            codeowners: 'S04SYHYKGNP'
         exclude:
           # exclude react-native tests from ubuntu
           - os: ubuntu-latest
@@ -229,11 +217,7 @@ jobs:
             project: e2e-expo
           # exclude non-CNW/Lerna tests from non-LTS node versions
           - node_version: 18
-            project: e2e-angular-core
-          - node_version: 18
-            project: e2e-angular-extensions
-          - node_version: 18
-            project: e2e-angular-module-federation
+            project: e2e-angular
           - node_version: 18
             project: e2e-cypress
           - node_version: 18
@@ -242,34 +226,30 @@ jobs:
             project: e2e-esbuild
           - node_version: 18
             project: e2e-expo
+          - node_version: 18
+            project: e2e-gradle
           - node_version: 18
             project: e2e-jest
           - node_version: 18
             project: e2e-js
           - node_version: 18
             project: e2e-eslint
           - node_version: 18
-            project: e2e-next-core
-          - node_version: 18
-            project: e2e-next-extensions
+            project: e2e-next
           - node_version: 18
             project: e2e-node
           - node_version: 18
             project: e2e-nuxt
           - node_version: 18
             project: e2e-nx-init
           - node_version: 18
-            project: e2e-nx-misc
+            project: e2e-nx
           - node_version: 18
             project: e2e-plugin
           - node_version: 18
             project: e2e-playwright
           - node_version: 18
-            project: e2e-react-core
-          - node_version: 18
-            project: e2e-react-module-federation
-          - node_version: 18
-            project: e2e-react-extensions
+            project: e2e-react
           - node_version: 18
             project: e2e-react-native
           - node_version: 18
@@ -280,8 +260,6 @@ jobs:
             project: e2e-rollup
           - node_version: 18
             project: e2e-storybook
-          - node_version: 18
-            project: e2e-storybook-angular
           - node_version: 18
             project: e2e-vite
           - node_version: 18
@@ -300,7 +278,7 @@ jobs:
     name: ${{ matrix.os_name }}/${{ matrix.package_manager }}/${{ matrix.node_version }} ${{ join(matrix.project) }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Prepare dir for output
         run: mkdir -p outputs
@@ -381,7 +359,7 @@ jobs:
 
       - name: Run e2e tests
         id: e2e-run
-        run: pnpm nx run-many -t e2e,e2e-macos -p ${{ matrix.project }}
+        run: pnpm nx run-many -t e2e-local -p ${{ matrix.project }}
         timeout-minutes: ${{ matrix.os_timeout }}
         env:
           GIT_AUTHOR_EMAIL: test@test.com
@@ -399,6 +377,7 @@ jobs:
           NX_E2E_VERBOSE_LOGGING: 'true'
           NX_PERF_LOGGING: 'false'
           NX_DAEMON: 'true'
+          NX_SKIP_LOG_GROUPING: 'true'
 
       - name: Save matrix config in file
         if: ${{ always() }}
@@ -429,7 +408,7 @@ jobs:
         timeout-minutes: 15
 
   process-result:
-    if: ${{ always() }}
+    if: ${{ always() && github.repository_owner == 'nrwl' }}
     runs-on: ubuntu-latest
     needs: e2e
     outputs: