Merge branch 'master' into master

.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,27 +48,71 @@ 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" }}
           paths:
             - ~/.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
 # -------------------------
@@ -85,6 +129,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:
@@ -96,6 +141,9 @@ jobs:
             sudo apt-get install -y ca-certificates lsof
       - browser-tools/install-chrome
       - browser-tools/install-chromedriver
+      - install-sdkman
+      - install-gradle:
+          gradle-version: '8.5'
       - run-pnpm-install:
           os: linux
       - run:
@@ -115,7 +163,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

.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

@@ -34,7 +34,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: |
@@ -112,6 +112,7 @@ jobs:
           - e2e-esbuild
           - e2e-eslint
           - e2e-expo
+          - e2e-gradle
           - e2e-jest
           - e2e-js
           - e2e-lerna-smoke-tests
@@ -165,6 +166,8 @@ jobs:
             codeowners: 'S04SJ6HHP0X'
           - project: e2e-expo
             codeowners: 'S04TNCNJG5N'
+          - project: e2e-gradle
+            codeowners: 'S04TNCNJG5N'
           - project: e2e-jest
             codeowners: 'S04T16BTJJY'
           - project: e2e-js
@@ -242,6 +245,8 @@ 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
@@ -300,7 +305,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

.github/workflows/e2e-windows.yml

@@ -27,7 +27,7 @@ jobs:
     name: Cache install (node v${{ matrix.node_version }})
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: pnpm/action-setup@v2
         name: Install pnpm
@@ -43,7 +43,7 @@ jobs:
 
       - name: Cache node_modules
         id: cache-modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           lookup-only: true
           path: '**/node_modules'
@@ -62,7 +62,7 @@ jobs:
 
       - name: Install Cypress
         if: steps.cache-cypress.outputs.cache-hit != 'true'
-        run: npx cypress install
+        run: pnpm cypress install
 
   e2e:
     needs: preinstall
@@ -234,7 +234,7 @@ jobs:
     name: ${{ matrix.project }} (v${{ matrix.node_version }})
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Prepare dir for output
         run: mkdir -p outputs

.github/workflows/publish.yml

@@ -5,7 +5,7 @@ on:
     - cron: "0 3 * * 2-6" # Tuesdays - Saturdays, at 3am UTC
   workflow_dispatch:
   release:
-    types: [published]
+    types: [ published ]
 
 env:
   DEBUG: napi:*
@@ -158,62 +158,64 @@ jobs:
           if-no-files-found: error
 
   build-freebsd:
-     if: ${{ github.repository_owner == 'nrwl' }}
-     runs-on: macos-13-large
-     name: Build FreeBSD
-     timeout-minutes: 45
-     steps:
-       - uses: actions/checkout@v4
-         if: ${{ github.event_name != 'schedule' }}
-       - name: Build
-         id: build
-         if: ${{ github.event_name != 'schedule' }}
-         uses: cross-platform-actions/action@v0.22.0
-         env:
-           DEBUG: napi:*
-           RUSTUP_IO_THREADS: 1
-         with:
-           operating_system: freebsd
-           version: '13.2'
-           architecture: x86-64
-           environment_variables: DEBUG RUSTUP_IO_THREADS CI
-           shell: bash
-           run: |
-             env
-             whoami
-             sudo pkg install -y -f node libnghttp2 npm git
-             sudo npm install --location=global --ignore-scripts pnpm
-             curl https://sh.rustup.rs -sSf --output rustup.sh
-             sh rustup.sh -y --profile minimal --default-toolchain stable
-             source "$HOME/.cargo/env"
-             echo "~~~~ rustc --version ~~~~"
-             rustc --version
-             echo "~~~~ node -v ~~~~"
-             node -v
-             echo "~~~~ pnpm --version ~~~~"
-             pnpm --version
-             pwd
-             ls -lah
-             whoami
-             env
-             freebsd-version
-             mkdir -p /Users/runner/work/_temp/_github_workflow
-             echo "{}" > /Users/runner/work/_temp/_github_workflow/event.json
-             pnpm install --frozen-lockfile --ignore-scripts
-             pnpm nx run-many --outputStyle stream --target=build-native -- --target=x86_64-unknown-freebsd
-             pnpm nx reset
-             rm -rf node_modules
-             rm -rf dist
-             echo "KILL ALL NODE PROCESSES"
-             killall node || true
-             echo "COMPLETE"
-       - name: Upload artifact
-         if: ${{ github.event_name != 'schedule' }}
-         uses: actions/upload-artifact@v3
-         with:
-           name: bindings-freebsd
-           path: packages/**/*.node
-           if-no-files-found: error
+    if: ${{ github.repository_owner == 'nrwl' }}
+    runs-on: macos-13-large
+    name: Build FreeBSD
+    timeout-minutes: 45
+    steps:
+      - uses: actions/checkout@v4
+        if: ${{ github.event_name != 'schedule' }}
+      - name: Build
+        id: build
+        if: ${{ github.event_name != 'schedule' }}
+        uses: cross-platform-actions/action@v0.22.0
+        env:
+          DEBUG: napi:*
+          RUSTUP_IO_THREADS: 1
+          NX_PREFER_TS_NODE: true
+          PLAYWRIGHT_BROWSERS_PATH: 0
+        with:
+          operating_system: freebsd
+          version: '13.2'
+          architecture: x86-64
+          environment_variables: DEBUG RUSTUP_IO_THREADS CI NX_PREFER_TS_NODE PLAYWRIGHT_BROWSERS_PATH
+          shell: bash
+          run: |
+            env
+            whoami
+            sudo pkg install -y -f node libnghttp2 npm git
+            sudo npm install --location=global --ignore-scripts pnpm
+            curl https://sh.rustup.rs -sSf --output rustup.sh
+            sh rustup.sh -y --profile minimal --default-toolchain stable
+            source "$HOME/.cargo/env"
+            echo "~~~~ rustc --version ~~~~"
+            rustc --version
+            echo "~~~~ node -v ~~~~"
+            node -v
+            echo "~~~~ pnpm --version ~~~~"
+            pnpm --version
+            pwd
+            ls -lah
+            whoami
+            env
+            freebsd-version
+            mkdir -p /Users/runner/work/_temp/_github_workflow
+            echo "{}" > /Users/runner/work/_temp/_github_workflow/event.json
+            pnpm install --frozen-lockfile --ignore-scripts
+            pnpm nx run-many --outputStyle stream --target=build-native -- --target=x86_64-unknown-freebsd
+            pnpm nx reset
+            rm -rf node_modules
+            rm -rf dist
+            echo "KILL ALL NODE PROCESSES"
+            killall node || true
+            echo "COMPLETE"
+      - name: Upload artifact
+        if: ${{ github.event_name != 'schedule' }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: bindings-freebsd
+          path: packages/**/*.node
+          if-no-files-found: error
 
   publish:
     if: ${{ github.repository_owner == 'nrwl' }}
@@ -273,9 +275,9 @@ jobs:
         # Publish docs only on a full release
         if: ${{ !github.event.release.prerelease }}
         run: |
-          # Publish docs only when publishing the latest version
-          if [ "$(git describe --tags `git rev-list --tags --max-count=1`)" = "$GITHUB_REF_NAME" ]; then
+          # The GITHUB_REF_NAME is a full version (i.e. 17.3.2). The branchName will only use the major version number.
+          # We will publish docs to the website branch based on the current tag (i.e. website-17)
+          branchName=website-${GITHUB_REF_NAME%.*.*}
           # We force recreate the branch in order to always be up to date and avoid merge conflicts within the automated workflow
-          git branch -f website
-          git push -f origin website
-          fi
+          git branch -f $branchName
+          git push -f origin $branchName