@nrwl/workspace 14.0.0-beta.2 → 14.0.0-beta.5

package/.eslintrc.json

@@ -0,0 +1,24 @@
+{
+  "extends": "../../.eslintrc",
+  "rules": {},
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["**/*.ts"],
+      "excludedFiles": ["./src/migrations/**", "./src/utils/**"],
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          "@nrwl/workspace",
+          "@angular-devkit/core",
+          "@angular-devkit/architect",
+          "@angular-devkit/schematics"
+        ]
+      }
+    }
+  ],
+  "ignorePatterns": ["!**/*"]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/workspace",
-  "version": "14.0.0-beta.2",
+  "version": "14.0.0-beta.5",
   "description": "Smart, Fast and Extensible Build System.",
   "repository": {
     "type": "git",
@@ -32,26 +32,26 @@
     "requirements": {},
     "migrations": "./migrations.json",
     "packageGroup": {
-      "@nrwl/angular": "14.0.0-beta.2",
-      "@nrwl/cypress": "14.0.0-beta.2",
-      "@nrwl/devkit": "14.0.0-beta.2",
-      "@nrwl/eslint-plugin-nx": "14.0.0-beta.2",
-      "@nrwl/express": "14.0.0-beta.2",
-      "@nrwl/jest": "14.0.0-beta.2",
-      "@nrwl/linter": "14.0.0-beta.2",
-      "@nrwl/nest": "14.0.0-beta.2",
-      "@nrwl/next": "14.0.0-beta.2",
-      "@nrwl/node": "14.0.0-beta.2",
-      "@nrwl/nx-plugin": "14.0.0-beta.2",
-      "@nrwl/react": "14.0.0-beta.2",
-      "@nrwl/storybook": "14.0.0-beta.2",
-      "@nrwl/web": "14.0.0-beta.2",
-      "@nrwl/js": "14.0.0-beta.2",
-      "@nrwl/cli": "14.0.0-beta.2",
+      "@nrwl/angular": "14.0.0-beta.5",
+      "@nrwl/cypress": "14.0.0-beta.5",
+      "@nrwl/devkit": "14.0.0-beta.5",
+      "@nrwl/eslint-plugin-nx": "14.0.0-beta.5",
+      "@nrwl/express": "14.0.0-beta.5",
+      "@nrwl/jest": "14.0.0-beta.5",
+      "@nrwl/linter": "14.0.0-beta.5",
+      "@nrwl/nest": "14.0.0-beta.5",
+      "@nrwl/next": "14.0.0-beta.5",
+      "@nrwl/node": "14.0.0-beta.5",
+      "@nrwl/nx-plugin": "14.0.0-beta.5",
+      "@nrwl/react": "14.0.0-beta.5",
+      "@nrwl/storybook": "14.0.0-beta.5",
+      "@nrwl/web": "14.0.0-beta.5",
+      "@nrwl/js": "14.0.0-beta.5",
+      "@nrwl/cli": "14.0.0-beta.5",
       "@nrwl/nx-cloud": "latest",
-      "@nrwl/react-native": "14.0.0-beta.2",
-      "@nrwl/detox": "14.0.0-beta.2",
-      "nx": "14.0.0-beta.2"
+      "@nrwl/react-native": "14.0.0-beta.5",
+      "@nrwl/detox": "14.0.0-beta.5",
+      "nx": "14.0.0-beta.5"
     }
   },
   "peerDependencies": {
@@ -84,9 +84,9 @@
     "minimatch": "3.0.4",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
-    "nx": "14.0.0-beta.2",
-    "@nrwl/devkit": "14.0.0-beta.2",
-    "@nrwl/jest": "14.0.0-beta.2",
-    "@nrwl/linter": "14.0.0-beta.2"
+    "nx": "14.0.0-beta.5",
+    "@nrwl/devkit": "14.0.0-beta.5",
+    "@nrwl/jest": "14.0.0-beta.5",
+    "@nrwl/linter": "14.0.0-beta.5"
   }
 }

package/src/generators/ci-workflow/ci-workflow.js

@@ -8,12 +8,18 @@ function ciWorkflowGenerator(host, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const ci = schema.ci;
         const options = normalizeOptions(schema);
+        const nxJson = (0, devkit_1.readJson)(host, 'nx.json');
+        const nxCloudUsed = Object.values(nxJson.tasksRunnerOptions).find((r) => r.runner == '@nrwl/nx-cloud');
+        if (!nxCloudUsed) {
+            throw new Error('This workspace is not connected to Nx Cloud.');
+        }
         (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, 'files', ci), '', options);
+        yield (0, devkit_1.formatFiles)(host);
     });
 }
 exports.ciWorkflowGenerator = ciWorkflowGenerator;
 function normalizeOptions(options) {
-    const { name: workflowName, fileName: workflowFileName } = (0, devkit_1.names)(options.name || 'build');
+    const { name: workflowName, fileName: workflowFileName } = (0, devkit_1.names)(options.name || 'CI');
     const { exec: packageManagerPrefix, ciInstall: packageManagerInstall } = (0, devkit_1.getPackageManagerCommand)();
     return {
         workflowName,

package/src/generators/ci-workflow/ci-workflow.js.map

@@ -1 +1 @@
-{"version":3,"file":"ci-workflow.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/ci-workflow/ci-workflow.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AACtB,+DAAiE;AAOjE,SAAsB,mBAAmB,CAAC,IAAU,EAAE,MAAc;;QAClE,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;QACrB,MAAM,OAAO,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAEzC,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IAC9E,CAAC;CAAA;AALD,kDAKC;AAWD,SAAS,gBAAgB,CAAC,OAAe;IACvC,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,IAAA,cAAK,EAC9D,OAAO,CAAC,IAAI,IAAI,OAAO,CACxB,CAAC;IACF,MAAM,EAAE,IAAI,EAAE,oBAAoB,EAAE,SAAS,EAAE,qBAAqB,EAAE,GACpE,IAAA,iCAAwB,GAAE,CAAC;IAC7B,OAAO;QACL,YAAY;QACZ,gBAAgB;QAChB,qBAAqB;QACrB,oBAAoB;QACpB,UAAU,EAAE,IAAA,gCAAiB,GAAE;QAC/B,IAAI,EAAE,EAAE;KACT,CAAC;AACJ,CAAC"}
+{"version":3,"file":"ci-workflow.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/ci-workflow/ci-workflow.ts"],"names":[],"mappings":";;;;AAAA,yCASsB;AACtB,+DAAiE;AAOjE,SAAsB,mBAAmB,CAAC,IAAU,EAAE,MAAc;;QAClE,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;QACrB,MAAM,OAAO,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAEzC,MAAM,MAAM,GAAwB,IAAA,iBAAQ,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC9D,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAC/D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,gBAAgB,CACpC,CAAC;QACF,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;SACjE;QAED,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;QAC5E,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAdD,kDAcC;AAWD,SAAS,gBAAgB,CAAC,OAAe;IACvC,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,IAAA,cAAK,EAC9D,OAAO,CAAC,IAAI,IAAI,IAAI,CACrB,CAAC;IACF,MAAM,EAAE,IAAI,EAAE,oBAAoB,EAAE,SAAS,EAAE,qBAAqB,EAAE,GACpE,IAAA,iCAAwB,GAAE,CAAC;IAC7B,OAAO;QACL,YAAY;QACZ,gBAAgB;QAChB,qBAAqB;QACrB,oBAAoB;QACpB,UAAU,EAAE,IAAA,gCAAiB,GAAE;QAC/B,IAAI,EAAE,EAAE;KACT,CAAC;AACJ,CAAC"}

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

@@ -6,29 +6,22 @@ pr:
   - <%= mainBranch %>
 
 variables:
-  - name: NX_CLOUD_DISTRIBUTED_EXECUTION
-    value: 'true'
-  - name: NX_BRANCH
-    ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-      value: $(System.PullRequest.PullRequestNumber)
-    ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
-      value: $(Build.SourceBranchName)
-  - name: TARGET_BRANCH
-    ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-      value: $[replace(variables['System.PullRequest.TargetBranch'],'refs/heads/','origin/')]
-  - name: BASE_SHA
-    ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-      value: $(git merge-base $(TARGET_BRANCH) HEAD)
-    ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
-      value: $(git rev-parse HEAD~1)
-  - name: HEAD_SHA
-    value: $(git rev-parse HEAD)
+  CI: 'true'
+  NX_CLOUD_DISTRIBUTED_EXECUTION: 'true'
+  ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+    NX_BRANCH: $(System.PullRequest.PullRequestNumber)
+    TARGET_BRANCH: $[replace(variables['System.PullRequest.TargetBranch'],'refs/heads/','origin/')]
+    BASE_SHA: $(git merge-base $(TARGET_BRANCH) HEAD)
+  ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
+    NX_BRANCH: $(Build.SourceBranchName)
+    BASE_SHA: $(git rev-parse HEAD~1)
+  HEAD_SHA: $(git rev-parse HEAD)
 
 jobs:
   - job: agents
     strategy:
       parallel: 3
-    displayName: 'Nx Cloud Agent'
+    displayName: Nx Cloud Agent
     pool:
       vmImage: 'ubuntu-latest'
     steps:
@@ -38,10 +31,10 @@ jobs:
       <% } %>- script: <%= packageManagerInstall %>
         displayName: NPM Install Dependencies
       - script: npx nx-cloud start-agent
-        displayName: 'Start Nx-Cloud agent
+        displayName: Start Nx-Cloud agent
 
   - job: main
-    displayName: 'Nx Cloud Main'
+    displayName: Nx Cloud Main
     pool:
       vmImage: 'ubuntu-latest'
     steps:
@@ -52,9 +45,9 @@ jobs:
         displayName: NPM Install Dependencies
       - script: <%= packageManagerPrefix %> nx-cloud start-ci-run
         displayName: Start CI run
-      - script: <%= packageManagerPrefix %> nx workspace-lint
+      - script: <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx workspace-lint
         displayName: Run workspace lint
-      - script: <%= packageManagerPrefix %> nx format:check --base=$(BASE_SHA) --head=$(HEAD_SHA)
+      - script: <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx format:check --base=$(BASE_SHA) --head=$(HEAD_SHA)
         displayName: Check format
       - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) --target=lint --parallel=3
         displayName: Run lint

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

@@ -0,0 +1,76 @@
+version: 2.1
+
+orbs:
+  nx: nrwl/nx@1.4.0
+
+jobs:
+  agent:
+    docker:
+      - image: cimg/node:lts-browsers
+    parameters:
+      ordinal:
+        type: integer
+    steps:
+      - checkout
+      <% if(packageManagerPrefix == 'pnpm exec'){ %>
+      - run:
+          name: Install PNPM
+          command: npm install --prefix=$HOME/.local -g pnpm@6.32.4
+      <% } %>- run:
+          name: Install dependencies
+          command: <%= packageManagerInstall %>
+      - run:
+          name: Start the agent << parameters.ordinal >>
+          command: <%= packageManagerPrefix %> nx-cloud start-agent
+          no_output_timeout: 60m
+  main:
+    docker:
+      - image: cimg/node:lts-browsers
+    environment:
+      NX_CLOUD_DISTRIBUTED_EXECUTION: 'true'
+    steps:
+      - checkout
+      <% if(packageManagerPrefix == 'pnpm exec'){ %>
+      - run:
+          name: Install PNPM
+          command: npm install --prefix=$HOME/.local -g pnpm@6.32.4
+      <% } %>- run:
+          name: Install dependencies
+          command: <%= packageManagerInstall %>
+      - nx/set-shas:
+          main-branch-name: '<%= mainBranch %>'
+      - run:
+          name: Initialize the Nx Cloud distributed CI run
+          command: <%= packageManagerPrefix %> nx-cloud start-ci-run
+      - run:
+          name: Run workspace lint
+          command: <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx workspace-lint
+      - run:
+          name: Check format
+          command: <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx format:check --base=$NX_BASE --head=$NX_HEAD
+      - run:
+          name: Run lint
+          command: <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD --target=lint --parallel=3
+      - run:
+          name: Run test
+          command: <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD --target=test --parallel=3 --ci --code-coverage
+      - run:
+          name: Run build
+          command: <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD --target=build --parallel=3
+      - run:
+          name: Stop all agents
+          command: <%= packageManagerPrefix %> nx-cloud stop-all-agents
+          when: always
+
+workflows:
+  version: 2
+
+  <%= workflowFileName %>:
+    jobs:
+      - agent:
+          name: Nx Cloud Agent << matrix.ordinal >>
+          matrix:
+            parameters:
+              ordinal: [1, 2, 3]
+      - main:
+          name: Nx Cloud Main

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

@@ -0,0 +1,26 @@
+name: <%= workflowName %>
+
+on:
+  push:
+    branches:
+      - <%= mainBranch %>
+  pull_request:
+
+jobs:
+  main:
+    name: Nx Cloud - Main Job
+    uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.2
+    with:
+      parallel-commands: |
+        <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx workspace-lint
+        <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx format:check
+      parallel-commands-on-agents: |
+        <%= packageManagerPrefix %> nx affected --target=lint --parallel=3
+        <%= packageManagerPrefix %> nx affected --target=test --parallel=3 --ci --code-coverage
+        <%= packageManagerPrefix %> nx affected --target=build --parallel=3
+
+  agents:
+    name: Nx Cloud - Agents
+    uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.2
+    with:
+      number-of-agents: 3

package/src/generators/ci-workflow/schema.json

@@ -27,6 +27,7 @@
         "$source": "argv",
         "index": 0
       },
+      "default": "CI",
       "x-prompt": "How should we name your workflow?",
       "pattern": "^[a-zA-Z].*$"
     }

package/src/generators/library/files/lib/tsconfig.lib.json

@@ -6,5 +6,5 @@
     "types": []
   },
   "include": ["**/*.ts"<% if (js) { %>, "**/*.js"<% } %>],
-  "exclude": ["**/*.spec.ts"<% if (js) { %>, "**/*.spec.js"<% } %>]
+  "exclude": ["jest.config.ts","**/*.spec.ts"<% if (js) { %>, "**/*.spec.js"<% } %>]
 }

package/src/generators/move/lib/update-jest-config.js

@@ -10,7 +10,7 @@ const path = require("path");
  * @param schema The options provided to the schematic
  */
 function updateJestConfig(tree, schema, project) {
-    const jestConfigPath = path.join(schema.relativeToRootDestination, 'jest.config.js');
+    const jestConfigPath = path.join(schema.relativeToRootDestination, 'jest.config.ts');
     if (tree.exists(jestConfigPath)) {
         const oldContent = tree.read(jestConfigPath, 'utf-8');
         const findName = new RegExp(`'${schema.projectName}'`, 'g');
@@ -20,8 +20,8 @@ function updateJestConfig(tree, schema, project) {
             .replace(findDir, schema.relativeToRootDestination);
         tree.write(jestConfigPath, newContent);
     }
-    // update root jest.config.js
-    const rootJestConfigPath = '/jest.config.js';
+    // update root jest.config.ts
+    const rootJestConfigPath = '/jest.config.ts';
     if (!tree.exists(rootJestConfigPath)) {
         return;
     }

package/src/generators/move/lib/update-project-root-files.js

@@ -4,6 +4,7 @@ exports.updateProjectRootFiles = void 0;
 const devkit_1 = require("@nrwl/devkit");
 const path = require("path");
 const path_1 = require("path");
+const allowedExt = ['.ts', '.js', '.json'];
 /**
  * Updates the files in the root of the project
  *
@@ -27,7 +28,8 @@ function updateProjectRootFiles(tree, schema, project) {
     const dots = /\./g;
     const regex = new RegExp(oldRelativeRoot.replace(dots, '\\.'), 'g');
     for (const file of tree.children(schema.relativeToRootDestination)) {
-        if (!(0, path_1.extname)(file).startsWith('.js')) {
+        const ext = (0, path_1.extname)(file);
+        if (!allowedExt.includes(ext)) {
             continue;
         }
         if (file === '.eslintrc.json') {

package/src/generators/move/lib/update-project-root-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-project-root-files.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-project-root-files.ts"],"names":[],"mappings":";;;AACA,yCAA6C;AAC7C,6BAA6B;AAC7B,+BAAqC;AAGrC;;;;;;GAMG;AACH,SAAgB,sBAAsB,CACpC,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CACP,IAAI,CAAC,IAAI,CAAC,sBAAa,EAAE,MAAM,CAAC,yBAAyB,CAAC,EAC1D,sBAAa,CACd;SACA,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAa,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,sBAAa,CAAC;SAC/D,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IAEb,IAAI,eAAe,KAAK,eAAe,EAAE;QACvC,gBAAgB;QAChB,OAAO;KACR;IAED,MAAM,IAAI,GAAG,KAAK,CAAC;IACnB,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC;IAEpE,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,yBAAyB,CAAC,EAAE;QAClE,IAAI,CAAC,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YACpC,SAAS;SACV;QACD,IAAI,IAAI,KAAK,gBAAgB,EAAE;YAC7B,SAAS;SACV;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAC1B,IAAA,WAAI,EAAC,MAAM,CAAC,yBAAyB,EAAE,IAAI,CAAC,EAC5C,OAAO,CACR,CAAC;QACF,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QAC9D,IAAI,CAAC,KAAK,CAAC,IAAA,WAAI,EAAC,MAAM,CAAC,yBAAyB,EAAE,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC;KACtE;AACH,CAAC;AAxCD,wDAwCC"}
+{"version":3,"file":"update-project-root-files.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-project-root-files.ts"],"names":[],"mappings":";;;AACA,yCAA6C;AAC7C,6BAA6B;AAC7B,+BAAqC;AAErC,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AAC3C;;;;;;GAMG;AACH,SAAgB,sBAAsB,CACpC,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CACP,IAAI,CAAC,IAAI,CAAC,sBAAa,EAAE,MAAM,CAAC,yBAAyB,CAAC,EAC1D,sBAAa,CACd;SACA,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAa,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,sBAAa,CAAC;SAC/D,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IAEb,IAAI,eAAe,KAAK,eAAe,EAAE;QACvC,gBAAgB;QAChB,OAAO;KACR;IAED,MAAM,IAAI,GAAG,KAAK,CAAC;IACnB,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC;IACpE,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,yBAAyB,CAAC,EAAE;QAClE,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;QAC1B,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC7B,SAAS;SACV;QACD,IAAI,IAAI,KAAK,gBAAgB,EAAE;YAC7B,SAAS;SACV;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAC1B,IAAA,WAAI,EAAC,MAAM,CAAC,yBAAyB,EAAE,IAAI,CAAC,EAC5C,OAAO,CACR,CAAC;QACF,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QAC9D,IAAI,CAAC,KAAK,CAAC,IAAA,WAAI,EAAC,MAAM,CAAC,yBAAyB,EAAE,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC;KACtE;AACH,CAAC;AAxCD,wDAwCC"}

package/src/generators/remove/lib/test-files/jest.config.js

@@ -0,0 +1,9 @@
+module.exports = {
+    projects: [
+        '<rootDir>/apps/my-app/',
+        '<rootDir>/apps/my-other-app',
+        '<rootDir>/libs/my-lib',
+        '<rootDir>/libs/my-other-lib/',
+    ],
+};
+//# sourceMappingURL=jest.config.js.map

package/src/generators/remove/lib/test-files/jest.config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"jest.config.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/generators/remove/lib/test-files/jest.config.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,GAAG;IACf,QAAQ,EAAE;QACR,wBAAwB;QACxB,6BAA6B;QAC7B,uBAAuB;QACvB,8BAA8B;KAC/B;CACF,CAAC"}

package/src/generators/remove/lib/update-jest-config.js

@@ -6,39 +6,39 @@ const get_source_nodes_1 = require("../../../utilities/typescript/get-source-nod
 const typescript_1 = require("typescript");
 const path_1 = require("path");
 function isUsingUtilityFunction(host) {
-    return host.read('jest.config.js').toString().includes('getJestProjects()');
+    return host.read('jest.config.ts').toString().includes('getJestProjects()');
 }
 /**
  * Updates the root jest config projects array and removes the project.
  */
 function updateJestConfig(tree, schema, projectConfig) {
     const projectToRemove = schema.projectName;
-    if (!tree.exists('jest.config.js') ||
-        !tree.exists((0, path_1.join)(projectConfig.root, 'jest.config.js')) ||
+    if (!tree.exists('jest.config.ts') ||
+        !tree.exists((0, path_1.join)(projectConfig.root, 'jest.config.ts')) ||
         isUsingUtilityFunction(tree)) {
         return;
     }
-    const contents = tree.read('jest.config.js', 'utf-8');
-    const sourceFile = (0, typescript_1.createSourceFile)('jest.config.js', contents, typescript_1.ScriptTarget.Latest);
+    const contents = tree.read('jest.config.ts', 'utf-8');
+    const sourceFile = (0, typescript_1.createSourceFile)('jest.config.ts', contents, typescript_1.ScriptTarget.Latest);
     const sourceNodes = (0, get_source_nodes_1.getSourceNodes)(sourceFile);
     const projectsAssignment = sourceNodes.find((node) => (0, typescript_1.isPropertyAssignment)(node) &&
         node.name.getText(sourceFile) === 'projects' &&
         (0, typescript_1.isArrayLiteralExpression)(node.initializer));
     if (!projectsAssignment) {
-        throw Error(`Could not remove ${projectToRemove} from projects in /jest.config.js. Please remove ${projectToRemove} from your projects.`);
+        throw Error(`Could not remove ${projectToRemove} from projects in /jest.config.ts. Please remove ${projectToRemove} from your projects.`);
     }
     const projectsArray = projectsAssignment.initializer;
     const project = projectsArray.elements.find((item) => (0, typescript_1.isStringLiteral)(item) &&
         item.text.startsWith(`<rootDir>/${projectConfig.root}`));
     if (!project) {
-        console.warn(`Could not find ${projectToRemove} in projects in /jest.config.js.`);
+        console.warn(`Could not find ${projectToRemove} in projects in /jest.config.ts.`);
         return;
     }
     const previousProject = projectsArray.elements[projectsArray.elements.indexOf(project) - 1];
     const start = previousProject
         ? previousProject.getEnd()
         : project.getStart(sourceFile);
-    tree.write('jest.config.js', (0, devkit_1.applyChangesToString)(contents, [
+    tree.write('jest.config.ts', (0, devkit_1.applyChangesToString)(contents, [
         {
             type: devkit_1.ChangeType.Delete,
             start,

package/src/utils/versions.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.typescriptESLintVersion = exports.tslintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
-exports.nxVersion = '14.0.0-beta.2';
+exports.nxVersion = '14.0.0-beta.5';
 exports.angularCliVersion = '~13.3.0';
 exports.typescriptVersion = '~4.6.2';
 exports.prettierVersion = '^2.5.1';