@nx/workspace 16.0.0-beta.1

package/src/executors/counter/counter.impl.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.batchCounter = void 0;
+const tslib_1 = require("tslib");
+const os_1 = require("os");
+function wait() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return new Promise((res) => {
+            setTimeout(() => res(), 1000);
+        });
+    });
+}
+function counter(opts) {
+    return tslib_1.__asyncGenerator(this, arguments, function* counter_1() {
+        for (let i = 0; i < opts.to; ++i) {
+            console.log(i);
+            yield yield tslib_1.__await({ success: false });
+            yield tslib_1.__await(wait());
+        }
+        yield yield tslib_1.__await({ success: opts.result });
+    });
+}
+exports.default = counter;
+function batchCounter(taskGraph, inputs) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const result = {};
+        const results = yield Promise.all(taskGraph.roots
+            .map((rootTaskId) => [rootTaskId, inputs[rootTaskId]])
+            .map(([taskId, options]) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let terminalOutput = '';
+            for (let i = 0; i < options.to; ++i) {
+                console.log(i);
+                terminalOutput += i + os_1.EOL;
+                yield wait();
+            }
+            return [taskId, options.result, terminalOutput];
+        })));
+        for (const [taskId, taskResult, terminalOutput] of results) {
+            result[taskId] = {
+                success: taskResult,
+                terminalOutput,
+            };
+        }
+        return result;
+    });
+}
+exports.batchCounter = batchCounter;
+//# sourceMappingURL=counter.impl.js.map

package/src/executors/counter/counter.impl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"counter.impl.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/executors/counter/counter.impl.ts"],"names":[],"mappings":";;;;AAAA,2BAAyB;AAEzB,SAAe,IAAI;;QACjB,OAAO,IAAI,OAAO,CAAO,CAAC,GAAG,EAAE,EAAE;YAC/B,UAAU,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAOD,SAA+B,OAAO,CAAC,IAAoB;;QACzD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE;YAChC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACf,4BAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA,CAAC;YACzB,sBAAM,IAAI,EAAE,CAAA,CAAC;SACd;QACD,4BAAM,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,CAAA,CAAC;IACjC,CAAC;CAAA;AAPD,0BAOC;AAED,SAAsB,YAAY,CAChC,SAAS,EACT,MAAsC;;QAEtC,MAAM,MAAM,GACV,EAAE,CAAC;QAEL,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9B,SAAS,CAAC,KAAkB;aAC1B,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,CAAU,CAAC;aAC9D,GAAG,CAAC,CAAO,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE;YAC/B,IAAI,cAAc,GAAG,EAAE,CAAC;YACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE;gBACnC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACf,cAAc,IAAI,CAAC,GAAG,QAAG,CAAC;gBAC1B,MAAM,IAAI,EAAE,CAAC;aACd;YAED,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,cAAc,CAAU,CAAC;QAC3D,CAAC,CAAA,CAAC,CACL,CAAC;QAEF,KAAK,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,cAAc,CAAC,IAAI,OAAO,EAAE;YAC1D,MAAM,CAAC,MAAM,CAAC,GAAG;gBACf,OAAO,EAAE,UAAU;gBACnB,cAAc;aACf,CAAC;SACH;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CAAA;AA9BD,oCA8BC"}

package/src/executors/counter/schema.json

@@ -0,0 +1,20 @@
+{
+  "version": 2,
+  "title": "Counter",
+  "description": "A dummy executor useful for E2E tests.",
+  "type": "object",
+  "cli": "nx",
+  "outputCapture": "pipe",
+  "properties": {
+    "to": {
+      "type": "number",
+      "description": "Count to this number."
+    },
+    "result": {
+      "type": "boolean",
+      "description": "Final result."
+    }
+  },
+  "additionalProperties": true,
+  "required": ["to"]
+}

package/src/generators/ci-workflow/ci-workflow.d.ts

@@ -0,0 +1,6 @@
+import { Tree } from '@nx/devkit';
+export interface Schema {
+    name?: string;
+    ci: 'github' | 'azure' | 'circleci' | 'bitbucket-pipelines' | 'gitlab';
+}
+export declare function ciWorkflowGenerator(host: Tree, schema: Schema): Promise<void>;

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

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ciWorkflowGenerator = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const default_base_1 = require("../../utilities/default-base");
+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' || r.runner == 'nx-cloud');
+        if (!nxCloudUsed) {
+            throw new Error('This workspace is not connected to Nx Cloud.');
+        }
+        if (ci === 'bitbucket-pipelines' && defaultBranchNeedsOriginPrefix(nxJson)) {
+            (0, devkit_1.writeJson)(host, 'nx.json', appendOriginPrefix(nxJson));
+        }
+        (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 || 'CI');
+    const { exec: packageManagerPrefix, ciInstall: packageManagerInstall } = (0, devkit_1.getPackageManagerCommand)();
+    return {
+        workflowName,
+        workflowFileName,
+        packageManagerInstall,
+        packageManagerPrefix,
+        mainBranch: (0, default_base_1.deduceDefaultBase)(),
+        tmpl: '',
+    };
+}
+function defaultBranchNeedsOriginPrefix(nxJson) {
+    var _a, _b;
+    return !((_b = (_a = nxJson.affected) === null || _a === void 0 ? void 0 : _a.defaultBase) === null || _b === void 0 ? void 0 : _b.startsWith('origin/'));
+}
+function appendOriginPrefix(nxJson) {
+    var _a, _b;
+    return Object.assign(Object.assign({}, nxJson), { affected: Object.assign(Object.assign({}, ((_a = nxJson.affected) !== null && _a !== void 0 ? _a : {})), { defaultBase: ((_b = nxJson.affected) === null || _b === void 0 ? void 0 : _b.defaultBase)
+                ? `origin/${nxJson.affected.defaultBase}`
+                : 'origin/main' }) });
+}
+//# sourceMappingURL=ci-workflow.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ci-workflow.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/ci-workflow/ci-workflow.ts"],"names":[],"mappings":";;;;AAAA,uCAUoB;AACpB,+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,IAAI,CAAC,CAAC,MAAM,IAAI,UAAU,CAC9D,CAAC;QACF,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;SACjE;QAED,IAAI,EAAE,KAAK,qBAAqB,IAAI,8BAA8B,CAAC,MAAM,CAAC,EAAE;YAC1E,IAAA,kBAAS,EAAC,IAAI,EAAE,SAAS,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC;SACxD;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;AAlBD,kDAkBC;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;AAED,SAAS,8BAA8B,CAAC,MAA2B;;IACjE,OAAO,CAAC,CAAA,MAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,WAAW,0CAAE,UAAU,CAAC,SAAS,CAAC,CAAA,CAAC;AAC9D,CAAC;AAED,SAAS,kBAAkB,CAAC,MAA2B;;IACrD,uCACK,MAAM,KACT,QAAQ,kCACH,CAAC,MAAA,MAAM,CAAC,QAAQ,mCAAI,EAAE,CAAC,KAC1B,WAAW,EAAE,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,WAAW;gBACvC,CAAC,CAAC,UAAU,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE;gBACzC,CAAC,CAAC,aAAa,OAEnB;AACJ,CAAC"}

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

@@ -0,0 +1,58 @@
+name: <%= workflowName %>
+
+trigger:
+  - <%= mainBranch %>
+pr:
+  - <%= mainBranch %>
+
+variables:
+  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
+    pool:
+      vmImage: 'ubuntu-latest'
+    steps:
+      <% if(packageManagerPrefix == 'pnpm exec'){ %>
+      - script: npm install --prefix=$HOME/.local -g pnpm@6.32.4
+        displayName: Install PNPM
+      <% } %>- script: <%= packageManagerInstall %>
+        displayName: NPM Install Dependencies
+      - script: npx nx-cloud start-agent
+        displayName: Start Nx-Cloud agent
+
+  - job: main
+    displayName: Nx Cloud Main
+    pool:
+      vmImage: 'ubuntu-latest'
+    steps:
+      <% if(packageManagerPrefix == 'pnpm exec'){ %>
+      - script: npm install --prefix=$HOME/.local -g pnpm@6.32.4
+        displayName: Install PNPM
+      <% } %>- script: <%= packageManagerInstall %>
+        displayName: NPM Install Dependencies
+      - script: <%= packageManagerPrefix %> nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
+        displayName: Start CI run
+      - 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
+      - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) --target=test --parallel=3 --ci --code-coverage
+        displayName: Run test
+      - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) --target=build --parallel=3
+        displayName: Run build
+      - script: <%= packageManagerPrefix %> nx-cloud stop-all-agents
+        condition: always()
+        displayName: Stop all Nx-Cloud agents

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

@@ -0,0 +1,36 @@
+image: node:16.18
+
+clone:
+  depth: full
+
+definitions:
+  steps:
+    - step: &agent
+        name: Agent
+        script:
+          - export NX_BRANCH=$BITBUCKET_PR_ID
+          <% if(packageManagerPrefix == 'pnpm exec'){ %>
+          - npm install --prefix=$HOME/.local -g pnpm@6.32.4
+          <% } %>
+          - <%= packageManagerInstall %>
+          - <%= packageManagerPrefix %> nx-cloud start-agent
+
+pipelines:
+  pull-requests:
+    '**':
+      - parallel:
+          - step:
+              name: <%= workflowName %>
+              script:
+                - export NX_BRANCH=$BITBUCKET_PR_ID
+                <% if(packageManagerPrefix == 'pnpm exec'){ %>
+                - npm install --prefix=$HOME/.local -g pnpm@6.32.4
+                <% } %>
+                - <%= packageManagerInstall %>
+                - <%= packageManagerPrefix %> nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
+                - <%= packageManagerPrefix %> nx-cloud record -- yarn nx format:check
+                - <%= packageManagerPrefix %> nx affected --target=lint & <%= packageManagerPrefix %> nx affected --target=test & <%= packageManagerPrefix %> nx affected --target=build
+                - <%= packageManagerPrefix %> nx-cloud stop-all-agents
+          - step: *agent
+          - step: *agent
+          - step: *agent

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

@@ -0,0 +1,73 @@
+version: 2.1
+
+orbs:
+  nx: nrwl/nx@1.6.1
+
+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 --stop-agents-after="build" --agent-count=3
+      - 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,29 @@
+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.11.3
+    with:
+      main-branch-name: <%= mainBranch %>
+      number-of-agents: 3
+      init-commands: |
+        <%= packageManagerPrefix %> nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
+      parallel-commands: |
+        <%= 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.11.3
+    with:
+      number-of-agents: 3

package/src/generators/ci-workflow/files/gitlab/.gitlab-ci.yml__tmpl__

@@ -0,0 +1,47 @@
+image: node:18
+variables:
+  CI: 'true'
+
+# Creating template for DTE agents
+.dte-agent:
+  interruptible: true
+  script:
+    <% if(packageManagerPrefix == 'pnpm exec'){ %>
+    - npm install --prefix=$HOME/.local -g pnpm@6.32.4
+    <% } %>
+    - <%= packageManagerInstall %>
+    - <%= packageManagerPrefix %> nx-cloud start-agent
+
+# Creating template for a job running DTE (orchestrator)
+.base-pipeline:
+  interruptible: true
+  only:
+    - main
+    - merge_requests
+  before_script:
+    <% if(packageManagerPrefix == 'pnpm exec'){ %>
+    - npm install --prefix=$HOME/.local -g pnpm@6.32.4
+    <% } %>
+    - <%= packageManagerInstall %>
+    - NX_HEAD=$CI_COMMIT_SHA
+    - NX_BASE=${CI_MERGE_REQUEST_DIFF_BASE_SHA:-$CI_COMMIT_BEFORE_SHA}
+
+# Main job running DTE
+<%= workflowName %>:
+  stage: affected
+  extends: .base-pipeline
+  script:
+    - <%= packageManagerPrefix %> nx-cloud start-ci-run --stop-agents-after="build"
+    - <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx format:check --base=$NX_BASE --head=$NX_HEAD
+    - <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD --target=lint --parallel=3 & <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD --target=test --parallel=3 --ci --code-coverage & <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD --target=e2e --parallel=3 --ci --code-coverage & <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD --target=build --parallel=3
+
+# Create as many agents as you want
+nx-dte-agent1:
+  extends: .dte-agent
+  stage: affected
+nx-dte-agent2:
+  extends: .dte-agent
+  stage: affected
+nx-dte-agent3:
+  extends: .dte-agent
+  stage: affected

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

@@ -0,0 +1,38 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "NxWorkspaceCIWorkflow",
+  "title": "Generate a CI workflow.",
+  "description": "Generate a CI workflow.",
+  "cli": "nx",
+  "type": "object",
+  "properties": {
+    "ci": {
+      "type": "string",
+      "description": "CI provider.",
+      "enum": ["github", "circleci", "azure", "bitbucket-pipelines", "gitlab"],
+      "x-prompt": {
+        "message": "What is your target CI provider?",
+        "type": "list",
+        "items": [
+          { "value": "github", "label": "GitHub Actions" },
+          { "value": "circleci", "label": "Circle CI" },
+          { "value": "azure", "label": "Azure DevOps" },
+          { "value": "bitbucket-pipelines", "label": "BitBucket Pipelines" },
+          { "value": "gitlab", "label": "Gitlab" }
+        ]
+      }
+    },
+    "name": {
+      "type": "string",
+      "description": "Workflow name.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "default": "CI",
+      "x-prompt": "How should we name your workflow?",
+      "pattern": "^[a-zA-Z].*$"
+    }
+  },
+  "required": ["ci"]
+}

package/src/generators/convert-to-nx-project/convert-to-nx-project.d.ts

@@ -0,0 +1,6 @@
+import { Tree } from '@nx/devkit';
+import { Schema } from './schema';
+export declare function validateSchema(schema: Schema, configName: string): Promise<void>;
+export declare function convertToNxProjectGenerator(host: Tree, schema: Schema): Promise<void>;
+export default convertToNxProjectGenerator;
+export declare const convertToNxProjectSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/convert-to-nx-project/convert-to-nx-project.js

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.validateSchema = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const path_1 = require("path");
+const angular_json_1 = require("nx/src/adapter/angular-json");
+const output_1 = require("../../utils/output");
+function validateSchema(schema, configName) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        if (schema.project && schema.all) {
+            throw new Error('--project and --all are mutually exclusive');
+        }
+        if (schema.project && schema.reformat) {
+            throw new Error('--project and --reformat are mutually exclusive');
+        }
+        if (schema.all && schema.reformat) {
+            throw new Error('--all and --reformat are mutually exclusive');
+        }
+        if ((configName === 'workspace.json' && schema.project) ||
+            (configName === 'workspace.json' && schema.reformat)) {
+            throw new Error('workspace.json is no longer supported. Please pass --all to convert all projects and remove workspace.json.');
+        }
+        if (!schema.project && !schema.all && !schema.reformat) {
+            schema.all = true;
+        }
+    });
+}
+exports.validateSchema = validateSchema;
+function convertToNxProjectGenerator(host, schema) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const configName = host.exists('angular.json')
+            ? 'angular.json'
+            : 'workspace.json';
+        if (!host.exists(configName))
+            return;
+        yield validateSchema(schema, configName);
+        const projects = (0, angular_json_1.toNewFormat)((0, devkit_1.readJson)(host, configName)).projects;
+        const leftOverProjects = {};
+        for (const projectName of Object.keys(projects)) {
+            const config = projects[projectName];
+            if ((!schema.project || schema.project === projectName) &&
+                !schema.reformat) {
+                if (typeof config === 'string') {
+                    // configuration is in project.json
+                    const projectConfig = (0, devkit_1.readJson)(host, (0, path_1.join)(config, 'project.json'));
+                    if (projectConfig.name !== projectName) {
+                        projectConfig.name = projectName;
+                        projectConfig.root = config;
+                        (0, devkit_1.updateProjectConfiguration)(host, projectName, projectConfig);
+                    }
+                }
+                else {
+                    // configuration is an object in workspace.json
+                    const path = (0, path_1.join)(config.root, 'project.json');
+                    if (!host.exists(path)) {
+                        projects[projectName].name = projectName;
+                        (0, devkit_1.addProjectConfiguration)(host, path, projects[projectName]);
+                    }
+                }
+            }
+            else {
+                leftOverProjects[projectName] = config;
+            }
+        }
+        if (Object.keys(leftOverProjects).length > 0) {
+            (0, devkit_1.writeJson)(host, 'angular.json', (0, angular_json_1.toOldFormat)({ version: 1, projects: leftOverProjects }));
+        }
+        else {
+            host.delete(configName);
+        }
+        if (!schema.skipFormat) {
+            yield (0, devkit_1.formatFiles)(host);
+        }
+        output_1.output.note({
+            title: 'Use "nx show projects" to read the list of projects.',
+            bodyLines: [
+                `If you read the list of projects from ${configName}, use "nx show projects" instead.`,
+            ],
+        });
+    });
+}
+exports.convertToNxProjectGenerator = convertToNxProjectGenerator;
+exports.default = convertToNxProjectGenerator;
+exports.convertToNxProjectSchematic = (0, devkit_1.convertNxGenerator)(convertToNxProjectGenerator);
+//# sourceMappingURL=convert-to-nx-project.js.map

package/src/generators/convert-to-nx-project/convert-to-nx-project.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"convert-to-nx-project.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/convert-to-nx-project/convert-to-nx-project.ts"],"names":[],"mappings":";;;;AAAA,uCAQoB;AACpB,+BAA4B;AAE5B,8DAAuE;AACvE,+CAA4C;AAE5C,SAAsB,cAAc,CAAC,MAAc,EAAE,UAAkB;;QACrE,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;SAC/D;QAED,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,QAAQ,EAAE;YACrC,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;SACpE;QAED,IAAI,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,QAAQ,EAAE;YACjC,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;SAChE;QAED,IACE,CAAC,UAAU,KAAK,gBAAgB,IAAI,MAAM,CAAC,OAAO,CAAC;YACnD,CAAC,UAAU,KAAK,gBAAgB,IAAI,MAAM,CAAC,QAAQ,CAAC,EACpD;YACA,MAAM,IAAI,KAAK,CACb,6GAA6G,CAC9G,CAAC;SACH;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YACtD,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC;SACnB;IACH,CAAC;CAAA;AAzBD,wCAyBC;AAED,SAAsB,2BAA2B,CAAC,IAAU,EAAE,MAAc;;QAC1E,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;YAC5C,CAAC,CAAC,cAAc;YAChB,CAAC,CAAC,gBAAgB,CAAC;QAErB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;YAAE,OAAO;QAErC,MAAM,cAAc,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAEzC,MAAM,QAAQ,GAAG,IAAA,0BAAW,EAAC,IAAA,iBAAQ,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC;QAClE,MAAM,gBAAgB,GAAG,EAAE,CAAC;QAE5B,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YAC/C,MAAM,MAAM,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;YACrC,IACE,CAAC,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,KAAK,WAAW,CAAC;gBACnD,CAAC,MAAM,CAAC,QAAQ,EAChB;gBACA,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;oBAC9B,mCAAmC;oBACnC,MAAM,aAAa,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;oBACnE,IAAI,aAAa,CAAC,IAAI,KAAK,WAAW,EAAE;wBACtC,aAAa,CAAC,IAAI,GAAG,WAAW,CAAC;wBACjC,aAAa,CAAC,IAAI,GAAG,MAAM,CAAC;wBAC5B,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;qBAC9D;iBACF;qBAAM;oBACL,+CAA+C;oBAC/C,MAAM,IAAI,GAAG,IAAA,WAAI,EAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;oBAC/C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;wBACtB,QAAQ,CAAC,WAAW,CAAC,CAAC,IAAI,GAAG,WAAW,CAAC;wBACzC,IAAA,gCAAuB,EAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;qBAC5D;iBACF;aACF;iBAAM;gBACL,gBAAgB,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC;aACxC;SACF;QAED,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5C,IAAA,kBAAS,EACP,IAAI,EACJ,cAAc,EACd,IAAA,0BAAW,EAAC,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC,CACxD,CAAC;SACH;aAAM;YACL,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;SACzB;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,eAAM,CAAC,IAAI,CAAC;YACV,KAAK,EAAE,sDAAsD;YAC7D,SAAS,EAAE;gBACT,yCAAyC,UAAU,mCAAmC;aACvF;SACF,CAAC,CAAC;IACL,CAAC;CAAA;AA3DD,kEA2DC;AAED,kBAAe,2BAA2B,CAAC;AAE9B,QAAA,2BAA2B,GAAG,IAAA,2BAAkB,EAC3D,2BAA2B,CAC5B,CAAC"}

package/src/generators/convert-to-nx-project/schema.d.ts

@@ -0,0 +1,7 @@
+export interface Schema {
+  project?: string;
+  all?: boolean;
+
+  reformat?: boolean;
+  skipFormat?: boolean;
+}

package/src/generators/convert-to-nx-project/schema.json

@@ -0,0 +1,38 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "SchematicsConvertToNxProject",
+  "title": "@nrwl/workspace:fix-configuration",
+  "description": "Migrates v1 config to v2 standalone configuration.",
+  "type": "object",
+  "cli": "nx",
+  "examples": [
+    {
+      "command": "nx g @nrwl/workspace:convert-to-nx-project --project my-feature-lib",
+      "description": "Convert the `my-feature-lib` project to use `project.json` file instead of `workspace.json`"
+    },
+    {
+      "command": "nx g @nrwl/workspace:convert-to-nx-project --all",
+      "description": "Convert all projects in `workspace.json` to separate `project.json` files"
+    }
+  ],
+  "properties": {
+    "project": {
+      "description": "Convert a single project",
+      "type": "string"
+    },
+    "all": {
+      "description": "Convert all projects",
+      "type": "boolean"
+    },
+    "reformat": {
+      "description": "Just reformats the configuration",
+      "type": "boolean"
+    },
+    "skipFormat": {
+      "description": "Skip formatting files",
+      "type": "boolean",
+      "default": false,
+      "x-priority": "internal"
+    }
+  }
+}

package/src/generators/move/lib/check-destination.d.ts

@@ -0,0 +1,11 @@
+import { ProjectConfiguration, Tree } from '@nx/devkit';
+import { Schema } from '../schema';
+/**
+ * Checks whether the destination folder is valid
+ *
+ * - must not be outside the workspace
+ * - must be a new folder
+ *
+ * @param schema The options provided to the schematic
+ */
+export declare function checkDestination(tree: Tree, schema: Schema, projectConfig: ProjectConfiguration): void;

package/src/generators/move/lib/check-destination.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkDestination = void 0;
+const utils_1 = require("./utils");
+/**
+ * Checks whether the destination folder is valid
+ *
+ * - must not be outside the workspace
+ * - must be a new folder
+ *
+ * @param schema The options provided to the schematic
+ */
+function checkDestination(tree, schema, projectConfig) {
+    const INVALID_DESTINATION = `Invalid destination: [${schema.destination}]`;
+    if (schema.destination.includes('..')) {
+        throw new Error(`${INVALID_DESTINATION} - Please specify explicit path.`);
+    }
+    const destination = (0, utils_1.getDestination)(tree, schema, projectConfig);
+    if (tree.children(destination).length > 0) {
+        throw new Error(`${INVALID_DESTINATION} - Path is not empty.`);
+    }
+}
+exports.checkDestination = checkDestination;
+//# sourceMappingURL=check-destination.js.map

package/src/generators/move/lib/check-destination.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"check-destination.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/check-destination.ts"],"names":[],"mappings":";;;AAEA,mCAAyC;AAEzC;;;;;;;GAOG;AACH,SAAgB,gBAAgB,CAC9B,IAAU,EACV,MAAc,EACd,aAAmC;IAEnC,MAAM,mBAAmB,GAAG,yBAAyB,MAAM,CAAC,WAAW,GAAG,CAAC;IAE3E,IAAI,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACrC,MAAM,IAAI,KAAK,CAAC,GAAG,mBAAmB,kCAAkC,CAAC,CAAC;KAC3E;IAED,MAAM,WAAW,GAAG,IAAA,sBAAc,EAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;IAEhE,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;QACzC,MAAM,IAAI,KAAK,CAAC,GAAG,mBAAmB,uBAAuB,CAAC,CAAC;KAChE;AACH,CAAC;AAhBD,4CAgBC"}

package/src/generators/move/lib/create-project-configuration-in-new-destination.d.ts

@@ -0,0 +1,3 @@
+import { ProjectConfiguration, Tree } from '@nx/devkit';
+import { NormalizedSchema } from '../schema';
+export declare function createProjectConfigurationInNewDestination(tree: Tree, schema: NormalizedSchema, projectConfig: ProjectConfiguration): void;

package/src/generators/move/lib/create-project-configuration-in-new-destination.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createProjectConfigurationInNewDestination = void 0;
+const devkit_1 = require("@nx/devkit");
+function createProjectConfigurationInNewDestination(tree, schema, projectConfig) {
+    if (projectConfig.name) {
+        projectConfig.name = schema.newProjectName;
+    }
+    // replace old root path with new one
+    const projectString = JSON.stringify(projectConfig);
+    const newProjectString = projectString.replace(new RegExp(projectConfig.root, 'g'), schema.relativeToRootDestination);
+    const newProject = JSON.parse(newProjectString);
+    // Create a new project with the root replaced
+    (0, devkit_1.addProjectConfiguration)(tree, schema.newProjectName, newProject);
+}
+exports.createProjectConfigurationInNewDestination = createProjectConfigurationInNewDestination;
+//# sourceMappingURL=create-project-configuration-in-new-destination.js.map

package/src/generators/move/lib/create-project-configuration-in-new-destination.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-project-configuration-in-new-destination.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/create-project-configuration-in-new-destination.ts"],"names":[],"mappings":";;;AAAA,uCAIoB;AAGpB,SAAgB,0CAA0C,CACxD,IAAU,EACV,MAAwB,EACxB,aAAmC;IAEnC,IAAI,aAAa,CAAC,IAAI,EAAE;QACtB,aAAa,CAAC,IAAI,GAAG,MAAM,CAAC,cAAc,CAAC;KAC5C;IAED,qCAAqC;IACrC,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IACpD,MAAM,gBAAgB,GAAG,aAAa,CAAC,OAAO,CAC5C,IAAI,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,EACnC,MAAM,CAAC,yBAAyB,CACjC,CAAC;IACF,MAAM,UAAU,GAAyB,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAEtE,8CAA8C;IAC9C,IAAA,gCAAuB,EAAC,IAAI,EAAE,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;AACnE,CAAC;AAnBD,gGAmBC"}

package/src/generators/move/lib/move-project-files.d.ts

@@ -0,0 +1,8 @@
+import { ProjectConfiguration, Tree } from '@nx/devkit';
+import { NormalizedSchema } from '../schema';
+/**
+ * Moves a project to the given destination path
+ *
+ * @param schema The options provided to the schematic
+ */
+export declare function moveProjectFiles(tree: Tree, schema: NormalizedSchema, project: ProjectConfiguration): void;