Merge branch 'master' into fix-create-package-tslib-dependency

.circleci/config.yml

@@ -69,50 +69,6 @@ commands:
             - ~/.pnpm-store
             - ~/.cache/Cypress
             - node_modules
-  install-sdkman:
-    description: Install SDKMAN
-    steps:
-      - restore_cache:
-          name: Restore SDKMAN executable and binaries from cache
-          keys:
-            - sdkman-cli-{{ arch }}-v2
-      - run:
-          name: Installing SDKMAN
-          command: |
-            if [ ! -d ~/.sdkman ]
-            then
-              curl -s "https://get.sdkman.io?rcupdate=false" | bash
-              sed -i -e 's/sdkman_auto_answer=false/sdkman_auto_answer=true/g' ~/.sdkman/etc/config
-            fi
-            echo -e '\nsource "/home/circleci/.sdkman/bin/sdkman-init.sh"' >> $BASH_ENV
-            source $BASH_ENV
-            sdk version
-      - save_cache:
-          name: Save SDKMAN executable and binaries to cache
-          key: sdkman-cli-{{ arch }}-v2
-          paths:
-            - ~/.sdkman
-  install-gradle:
-    description: Install gradle
-    parameters:
-      gradle-version:
-        type: string
-        default: ''
-    steps:
-      - restore_cache:
-          name: Restore Gradle binary from cache
-          keys:
-            - gradle-cli-{{ arch }}-v1
-      - run:
-          name: Installing Gradle
-          command: |
-            sdk install gradle << parameters.gradle-version >>
-            gradle --version
-      - save_cache:
-          name: Save Gradle binary to cache
-          key: gradle-cli-{{ arch }}-v1
-          paths:
-            - ~/.sdkman/candidates/gradle/
 # -------------------------
 #          JOBS
 # -------------------------
@@ -129,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:
@@ -137,12 +94,8 @@ jobs:
       - run:
           command: |
             sudo apt-get update
-            sudo apt-get install -y ca-certificates lsof
+            sudo apt-get install -y ca-certificates lsof libvips-dev libglib2.0-dev libgirepository1.0-dev
       - browser-tools/install-chrome
-      - browser-tools/install-chromedriver
-      - install-sdkman
-      - install-gradle:
-          gradle-version: '8.5'
       - run-pnpm-install:
           os: linux
       - run:
@@ -205,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
 
 # -------------------------

.devcontainer/Dockerfile

@@ -0,0 +1,7 @@
+FROM mcr.microsoft.com/devcontainers/typescript-node:20-bullseye
+
+# Update the underlying (Debian) OS, to make sure we have the latest security patches and libraries like 'GLIBC' 
+RUN sudo apt-get update  && sudo apt-get -y upgrade
+
+# Update pnpm
+RUN npm install -g [email protected]

.devcontainer/devcontainer.json

@@ -3,7 +3,10 @@
 {
   "name": "NxDevContainer",
   // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-  "image": "mcr.microsoft.com/devcontainers/typescript-node:20-bullseye",
+  "build": {
+    // Path is relative to the devcontainer.json file.
+    "dockerfile": "Dockerfile"
+  },
   "features": {
     "ghcr.io/devcontainers/features/rust:1": {}
   },

.devcontainer/postCreateCommand.sh

@@ -1,11 +1,5 @@
 #!/bin/sh
 
-# Update the underlying (Debian) OS, to make sure we have the latest security patches and libraries like 'GLIBC' 
-sudo apt-get update  && sudo apt-get -y upgrade
-
-# Update pnpm
-#npm install -g pnpm
-
 # Install dependencies
 pnpm install --frozen-lockfile
 

.env

@@ -0,0 +1 @@
+NX_ISOLATE_PLUGINS=true

.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/PULL_REQUEST_TEMPLATE.md

@@ -4,6 +4,8 @@
 <!-- Please make sure that your commit message follows our format -->
 <!-- Example: `fix(nx): must begin with lowercase` -->
 
+<!-- If this is a particularly complex change or feature addition, you can request a dedicated Nx release for this pull request branch. Mention someone from the Nx team or the `@nrwl/nx-pipelines-reviewers` and they will confirm if the PR warrants its own release for testing purposes, and generate it for you if appropriate. -->
+
 ## Current Behavior
 <!-- This is the behavior we have today -->
 

.github/workflows/e2e-matrix.yml

@@ -17,6 +17,7 @@ env:
 permissions: { }
 jobs:
   preinstall:
+    if: ${{ github.repository_owner == 'nrwl' }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -38,7 +39,7 @@ jobs:
 
       - name: Install PNPM
         run: |
-          npm install -g @pnpm/exe@8.14
+          npm install -g @pnpm/exe@8
 
       - name: Set node
         uses: actions/setup-node@v3
@@ -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,9 +111,7 @@ jobs:
           - yarn
           - pnpm
         project:
-          - e2e-angular-core
-          - e2e-angular-extensions
-          - e2e-angular-module-federation
+          - e2e-angular
           - e2e-cypress
           - e2e-detox
           - e2e-esbuild
@@ -116,30 +121,24 @@ jobs:
           - 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
@@ -152,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'
@@ -176,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'
@@ -206,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
@@ -220,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
@@ -232,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
@@ -254,27 +235,21 @@ jobs:
           - 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
@@ -285,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
@@ -312,7 +285,7 @@ jobs:
 
       - name: Install PNPM
         run: |
-          npm install -g @pnpm/exe@8.7.4
+          npm install -g @pnpm/exe@8
 
       - name: Use Node.js ${{ matrix.node_version }}
         uses: actions/setup-node@v3
@@ -386,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: [email protected]
@@ -435,7 +408,7 @@ jobs:
         timeout-minutes: 15
 
   process-result:
-    if: ${{ always() }}
+    if: ${{ always() && github.repository_owner == 'nrwl' }}
     runs-on: ubuntu-latest
     needs: e2e
     outputs: