Merge branch 'master' into feat/create-nodes-async-v2

.circleci/config.yml

@@ -88,7 +88,7 @@ jobs:
       NX_CI_EXECUTION_ENV: 'linux'
     steps:
       - checkout
-      - run: npx nx-cloud@next start-ci-run --distributes-on="8 linux-medium" --stop-agents-after="e2e"
+      - run: npx nx-cloud@next start-ci-run --stop-agents-after="e2e"
       - run:
           command: |
             sudo apt-get update

.nx/workflows/agents.yaml

@@ -1,55 +1,59 @@
-launch-templates:
-  linux-medium:
-    env:
-      CI: 'true'
-      GIT_AUTHOR_EMAIL: test@test.com
-      GIT_AUTHOR_NAME: Test
-      GIT_COMMITTER_EMAIL: test@test.com
-      GIT_COMMITTER_NAME: Test
-      NX_E2E_CI_CACHE_KEY: e2e-circleci-linux
-      NX_VERBOSE_LOGGING: 'false'
-      NX_DAEMON: 'true'
-      NX_PERF_LOGGING: 'false'
-      NX_NATIVE_LOGGING: 'false'
-      SELECTED_PM: 'pnpm'
-      NX_E2E_RUN_E2E: 'true'
-      NPM_CONFIG_PREFIX: '/home/workflows/.npm-global'
-      NX_CLOUD_ACCESS_TOKEN: '{{secrets.NX_CLOUD_ACCESS_TOKEN}}'
-    init-steps:
-      - name: Checkout
-        uses: 'nrwl/nx-cloud-workflows/v1.1/workflow-steps/checkout/main.yaml'
+parallelism: 8
+env:
+  CI: 'true'
+  GIT_AUTHOR_EMAIL: test@test.com
+  GIT_AUTHOR_NAME: Test
+  GIT_COMMITTER_EMAIL: test@test.com
+  GIT_COMMITTER_NAME: Test
+  NX_E2E_CI_CACHE_KEY: e2e-circleci-linux
+  NX_VERBOSE_LOGGING: 'false'
+  NX_DAEMON: 'true'
+  NX_PERF_LOGGING: 'false'
+  NX_NATIVE_LOGGING: 'false'
+  SELECTED_PM: 'pnpm'
+  NX_E2E_RUN_E2E: 'true'
+  NPM_CONFIG_PREFIX: '/home/workflows/.npm-global'
+  NX_CLOUD_ACCESS_TOKEN: '{{secrets.NX_CLOUD_ACCESS_TOKEN}}'
+on:
+  - events:
+      - CREATE_RUN_GROUP
+steps:
+  - name: Checkout
+    uses: 'nrwl/nx-cloud-workflows/v1.1/workflow-steps/checkout/main.yaml'
 
-      - name: Cache restore
-        uses: 'nrwl/nx-cloud-workflows/v1.1/workflow-steps/cache/main.yaml'
-        env:
-          KEY: 'pnpm-lock.yaml'
-          PATHS: |
-            node_modules
-            ~/.cache/Cypress
-            ~/.pnpm-store
-          BASE_BRANCH: 'master'
+  - name: Cache restore
+    uses: 'nrwl/nx-cloud-workflows/v1.1/workflow-steps/cache/main.yaml'
+    env:
+      KEY: 'pnpm-lock.yaml'
+      PATHS: |
+        node_modules
+        ~/.cache/Cypress
+        ~/.pnpm-store
+      BASE_BRANCH: 'master'
 
-      - name: Install Pnpm
-        script: |
-          npm install -g @pnpm/exe@8.7.4
+  - name: Install Pnpm
+    script: |
+      npm install -g @pnpm/exe@8.7.4
 
-      - name: Pnpm Install
-        script: |
-          pnpm install --frozen-lockfile
+  - name: Pnpm Install
+    script: |
+      pnpm install --frozen-lockfile
 
-      - name: Install Cypress
-        script: pnpm exec cypress install
+  - name: Install Cypress
+    script: pnpm exec cypress install
 
-      - name: Install Rust
-        script: |
-          curl --proto '=https' --tlsv1.3 https://sh.rustup.rs -sSf | sh -s -- -y
-          source "$HOME/.cargo/env"
-          rustup toolchain install 1.70.0
+  - name: Install Rust
+    script: |
+      curl --proto '=https' --tlsv1.3 https://sh.rustup.rs -sSf | sh -s -- -y
+      source "$HOME/.cargo/env"
+      rustup toolchain install 1.70.0
 
-      - name: Configure git metadata (needed for lerna smoke tests)
-        script: |
-          git config --global user.email test@test.com
-          git config --global user.name "Test Test"
+  - name: Configure git metadata (needed for lerna smoke tests)
+    script: |
+      git config --global user.email test@test.com
+      git config --global user.name "Test Test"
 
-      - name: Load Cargo Env
-        script: source "$HOME/.cargo/env"
+  - name: Run Agent
+    script: |
+      source "$HOME/.cargo/env"
+      npx nx-cloud start-agent

packages/jest/src/migrations/update-17-1-0/move-options-to-target-defaults.spec.ts

@@ -559,4 +559,46 @@ describe('move-options-to-target-defaults migration', () => {
       },
     });
   });
+
+  it("should't error if a project is present in the graph but not using project.json", async () => {
+    projectGraph.nodes['csproj'] = {
+      name: 'csproj',
+      type: 'lib',
+      data: {
+        root: 'csproj',
+        targets: {
+          build: {
+            command: 'echo HELLO',
+          },
+        },
+      },
+    };
+    addProjectConfiguration(tree, 'proj1', {
+      root: 'proj1',
+      targets: {
+        test: {
+          executor: '@nx/jest:jest',
+          options: {
+            jestConfig: 'jest.config.js',
+            passWithNoTests: true,
+          },
+          configurations: {
+            ci: {
+              ci: true,
+              codeCoverage: true,
+            },
+          },
+        },
+      },
+    });
+    updateNxJson(tree, {
+      targetDefaults: {
+        build: {
+          inputs: ['default', '^production'],
+        },
+      },
+    });
+    const promise = update(tree);
+    await expect(promise).resolves.not.toThrow();
+  });
 });

packages/jest/src/migrations/update-17-1-0/move-options-to-target-defaults.ts

@@ -174,7 +174,7 @@ function isTargetDefaultUsed(
           targetName,
           targetDefaults,
           // It might seem like we should use the graph here too but we don't want to pass an executor which was processed in the graph
-          projectMap.get(p.name).targets?.[targetName]?.executor
+          projectMap.get(p.name)?.targets?.[targetName]?.executor
         ) === targetDefault
       ) {
         return true;