@nrwl/workspace 14.8.7 → 14.9.0-beta.1

package/src/executors/run-commands/schema.json

@@ -1,4 +1,5 @@
 {
+  "version": 2,
   "title": "Run Commands",
   "description": "Run any custom commands with Nx.",
   "type": "object",
@@ -137,6 +138,13 @@
     }
   },
   "additionalProperties": true,
-  "required": [],
+  "oneOf": [
+    {
+      "required": ["commands"]
+    },
+    {
+      "required": ["command"]
+    }
+  ],
   "examplesFile": "../../../docs/run-commands-examples.md"
 }

package/src/executors/run-script/schema.json

@@ -1,4 +1,5 @@
 {
+  "version": 2,
   "title": "Run Script",
   "description": "Run any NPM script of a project in the project's root directory.",
   "type": "object",

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

@@ -1,6 +1,6 @@
 import { Tree } from '@nrwl/devkit';
 export interface Schema {
     name?: string;
-    ci: 'github' | 'azure' | 'circleci';
+    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

@@ -13,6 +13,9 @@ function ciWorkflowGenerator(host, schema) {
         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);
     });
@@ -30,4 +33,14 @@ function normalizeOptions(options) {
         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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"ci-workflow.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/ci-workflow/ci-workflow.ts"],"names":[],"mappings":";;;;AAAA,yCAUsB;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,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__

@@ -45,8 +45,6 @@ jobs:
         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 workspace-lint
-        displayName: Run workspace lint
       - 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

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__

@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  nx: nrwl/nx@1.5.1
+  nx: nrwl/nx@1.6.1
 
 jobs:
   agent:
@@ -42,9 +42,6 @@ jobs:
       - 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: 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

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

@@ -9,13 +9,13 @@ on:
 jobs:
   main:
     name: Nx Cloud - Main Job
-    uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.7
+    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 workspace-lint
         <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx format:check
       parallel-commands-on-agents: |
         <%= packageManagerPrefix %> nx affected --target=lint --parallel=3
@@ -24,6 +24,6 @@ jobs:
 
   agents:
     name: Nx Cloud - Agents
-    uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.7
+    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

@@ -9,14 +9,16 @@
     "ci": {
       "type": "string",
       "description": "CI provider.",
-      "enum": ["github", "circleci", "azure"],
+      "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": "github", "label": "GitHub Actions" },
           { "value": "circleci", "label": "Circle CI" },
-          { "value": "azure", "label": "Azure DevOps" }
+          { "value": "azure", "label": "Azure DevOps" },
+          { "value": "bitbucket-pipelines", "label": "BitBucket Pipelines" },
+          { "value": "gitlab", "label": "Gitlab" }
         ]
       }
     },

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

@@ -1,7 +1,6 @@
 import { Tree } from '@nrwl/devkit';
 import { Schema } from './schema';
-export declare const SCHEMA_OPTIONS_ARE_MUTUALLY_EXCLUSIVE = "--project and --all are mutually exclusive";
-export declare function validateSchema(schema: Schema): Promise<void>;
+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

@@ -1,59 +1,83 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.validateSchema = exports.SCHEMA_OPTIONS_ARE_MUTUALLY_EXCLUSIVE = void 0;
+exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.validateSchema = void 0;
 const tslib_1 = require("tslib");
-const path_1 = require("path");
-const enquirer_1 = require("enquirer");
 const devkit_1 = require("@nrwl/devkit");
-const get_project_configuration_path_1 = require("./utils/get-project-configuration-path");
-exports.SCHEMA_OPTIONS_ARE_MUTUALLY_EXCLUSIVE = '--project and --all are mutually exclusive';
-function validateSchema(schema) {
+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 exports.SCHEMA_OPTIONS_ARE_MUTUALLY_EXCLUSIVE;
+            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 (!schema.project && !schema.all) {
-            schema.project = (yield (0, enquirer_1.prompt)([
-                {
-                    message: 'What project should be converted?',
-                    type: 'input',
-                    name: 'project',
-                },
-            ])).project;
+        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 workspace = (0, devkit_1.readWorkspaceConfiguration)(host);
-        if (workspace.version < 2) {
-            devkit_1.logger.error(`
-NX Only workspaces with version 2+ support project.json files.
-To upgrade change the version number at the top of ${(0, devkit_1.getWorkspacePath)(host)} and run 'nx format'.
-`);
-            throw new Error('v2+ Required');
-        }
-        yield validateSchema(schema);
-        const projects = schema.all
-            ? (0, devkit_1.getProjects)(host).entries()
-            : [[schema.project, (0, devkit_1.readProjectConfiguration)(host, schema.project)]];
-        for (const [project, configuration] of projects) {
-            const configPath = (0, get_project_configuration_path_1.getProjectConfigurationPath)(configuration);
-            if (host.exists(configPath)) {
-                devkit_1.logger.warn(`Skipping ${project} since ${configPath} already exists.`);
-                continue;
+        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;
             }
-            delete configuration.root;
-            (0, devkit_1.writeJson)(host, configPath, configuration);
-            (0, devkit_1.updateJson)(host, (0, devkit_1.getWorkspacePath)(host), (value) => {
-                value.projects[project] = (0, devkit_1.normalizePath)((0, path_1.dirname)(configPath));
-                return value;
-            });
+        }
+        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;

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

@@ -1 +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,+BAA+B;AAC/B,uCAAkC;AAElC,yCAasB;AAGtB,2FAAqF;AAExE,QAAA,qCAAqC,GAChD,4CAA4C,CAAC;AAE/C,SAAsB,cAAc,CAAC,MAAc;;QACjD,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE;YAChC,MAAM,6CAAqC,CAAC;SAC7C;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;YAClC,MAAM,CAAC,OAAO,GAAG,CACf,MAAM,IAAA,iBAAM,EAAsB;gBAChC;oBACE,OAAO,EAAE,mCAAmC;oBAC5C,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,SAAS;iBAChB;aACF,CAAC,CACH,CAAC,OAAO,CAAC;SACX;IACH,CAAC;CAAA;AAhBD,wCAgBC;AAED,SAAsB,2BAA2B,CAAC,IAAU,EAAE,MAAc;;QAC1E,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;QACnD,IAAI,SAAS,CAAC,OAAO,GAAG,CAAC,EAAE;YACzB,eAAM,CAAC,KAAK,CAAC;;qDAEoC,IAAA,yBAAgB,EAC/D,IAAI,CACL;CACJ,CAAC,CAAC;YACC,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;SACjC;QAED,MAAM,cAAc,CAAC,MAAM,CAAC,CAAC;QAE7B,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG;YACzB,CAAC,CAAC,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE;YAC7B,CAAC,CAAE,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAG9D,CAAC;QAET,KAAK,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,QAAQ,EAAE;YAC/C,MAAM,UAAU,GAAG,IAAA,4DAA2B,EAAC,aAAa,CAAC,CAAC;YAC9D,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;gBAC3B,eAAM,CAAC,IAAI,CAAC,YAAY,OAAO,UAAU,UAAU,kBAAkB,CAAC,CAAC;gBACvE,SAAS;aACV;YAED,OAAO,aAAa,CAAC,IAAI,CAAC;YAE1B,IAAA,kBAAS,EAAC,IAAI,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;YAE3C,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,yBAAgB,EAAC,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE;gBACjD,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,IAAA,sBAAa,EAAC,IAAA,cAAO,EAAC,UAAU,CAAC,CAAC,CAAC;gBAC7D,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAzCD,kEAyCC;AAED,kBAAe,2BAA2B,CAAC;AAE9B,QAAA,2BAA2B,GAAG,IAAA,2BAAkB,EAC3D,2BAA2B,CAC5B,CAAC"}
+{"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":"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"}

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

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

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

@@ -1,8 +1,8 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "SchematicsConvertToNxProject",
-  "title": "Create a custom target to run any command",
-  "description": "Create a custom target to run any command.",
+  "title": "@nrwl/workspace:fix-configuration",
+  "description": "Migrates v1 config to v2 standalone configuration.",
   "type": "object",
   "cli": "nx",
   "examples": [
@@ -17,17 +17,22 @@
   ],
   "properties": {
     "project": {
-      "description": "Project name.",
+      "description": "Convert a single project",
       "type": "string"
     },
     "all": {
-      "description": "Should every project be converted?",
+      "description": "Convert all projects",
+      "type": "boolean"
+    },
+    "reformat": {
+      "description": "Just reformats the configuration",
       "type": "boolean"
     },
     "skipFormat": {
-      "description": "Skip formatting files.",
+      "description": "Skip formatting files",
       "type": "boolean",
-      "default": false
+      "default": false,
+      "x-priority": "internal"
     }
   }
 }

package/src/generators/library/files/lib/__dot__babelrc__tmpl__

@@ -1,3 +1,3 @@
 {
-  "presets": [["@nrwl/web/babel", { "useBuiltIns": "usage" }]]
+  "presets": [["@nrwl/js/babel", { "useBuiltIns": "usage" }]]
 }

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

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

package/src/generators/library/library.d.ts

@@ -1,10 +1,11 @@
-import { Tree, GeneratorCallback } from '@nrwl/devkit';
+import { GeneratorCallback, Tree } from '@nrwl/devkit';
 import { Schema } from './schema';
 export interface NormalizedSchema extends Schema {
     name: string;
     fileName: string;
     projectRoot: string;
     projectDirectory: string;
+    libsDir: string;
     parsedTags: string[];
     importPath?: string;
 }

package/src/generators/library/library.js

@@ -5,13 +5,8 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const path_1 = require("nx/src/utils/path");
 const path_2 = require("path");
-const run_tasks_in_serial_1 = require("../../utilities/run-tasks-in-serial");
-const typescript_1 = require("../../utilities/typescript");
+const ts_config_1 = require("../../utilities/ts-config");
 const versions_1 = require("../../utils/versions");
-// nx-ignore-next-line
-const { jestProjectGenerator } = require('@nrwl/jest');
-// nx-ignore-next-line
-const { lintProjectGenerator, Linter } = require('@nrwl/linter');
 function addProject(tree, options) {
     const projectConfiguration = {
         root: options.projectRoot,
@@ -21,34 +16,38 @@ function addProject(tree, options) {
         tags: options.parsedTags,
     };
     if (options.buildable) {
-        const { libsDir } = (0, devkit_1.getWorkspaceLayout)(tree);
         (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nrwl/js': versions_1.nxVersion });
         projectConfiguration.targets.build = {
             executor: '@nrwl/js:tsc',
             outputs: ['{options.outputPath}'],
             options: {
-                outputPath: `dist/${libsDir}/${options.projectDirectory}`,
+                outputPath: options.libsDir != '.'
+                    ? `dist/${options.libsDir}/${options.projectDirectory}`
+                    : `dist/${options.projectDirectory}`,
                 main: `${options.projectRoot}/src/index` + (options.js ? '.js' : '.ts'),
                 tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
                 assets: [`${options.projectRoot}/*.md`],
             },
         };
     }
-    (0, devkit_1.addProjectConfiguration)(tree, options.name, projectConfiguration, options.standaloneConfig);
+    (0, devkit_1.addProjectConfiguration)(tree, options.name, projectConfiguration);
 }
 function addLint(tree, options) {
-    return lintProjectGenerator(tree, {
-        project: options.name,
-        linter: options.linter,
-        skipFormat: true,
-        tsConfigPaths: [
-            (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'),
-        ],
-        unitTestRunner: options.unitTestRunner,
-        eslintFilePatterns: [
-            `${options.projectRoot}/**/*.${options.js ? 'js' : 'ts'}`,
-        ],
-        setParserOptionsProject: options.setParserOptionsProject,
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nrwl/linter', versions_1.nxVersion);
+        return lintProjectGenerator(tree, {
+            project: options.name,
+            linter: options.linter,
+            skipFormat: true,
+            tsConfigPaths: [
+                (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'),
+            ],
+            unitTestRunner: options.unitTestRunner,
+            eslintFilePatterns: [
+                `${options.projectRoot}/**/*.${options.js ? 'js' : 'ts'}`,
+            ],
+            setParserOptionsProject: options.setParserOptionsProject,
+        });
     });
 }
 exports.addLint = addLint;
@@ -61,7 +60,7 @@ function updateTsConfig(tree, options) {
     });
 }
 function updateRootTsConfig(host, options) {
-    (0, devkit_1.updateJson)(host, (0, typescript_1.getRootTsConfigPathInTree)(host), (json) => {
+    (0, devkit_1.updateJson)(host, (0, ts_config_1.getRootTsConfigPathInTree)(host), (json) => {
         const c = json.compilerOptions;
         c.paths = c.paths || {};
         delete c.paths[options.name];
@@ -79,7 +78,7 @@ function createFiles(tree, options) {
     const rootOffset = (0, devkit_1.offsetFromRoot)(options.projectRoot);
     (0, devkit_1.generateFiles)(tree, (0, path_2.join)(__dirname, './files/lib'), options.projectRoot, Object.assign(Object.assign({}, options), { dot: '.', className,
         name,
-        propertyName, js: !!options.js, cliCommand: 'nx', strict: undefined, tmpl: '', offsetFromRoot: rootOffset, rootTsConfigPath: (0, typescript_1.getRelativePathToRootTsConfig)(tree, options.projectRoot), hasUnitTestRunner: options.unitTestRunner !== 'none', hasLinter: options.linter !== 'none' }));
+        propertyName, js: !!options.js, cliCommand: 'nx', strict: undefined, tmpl: '', offsetFromRoot: rootOffset, rootTsConfigPath: (0, ts_config_1.getRelativePathToRootTsConfig)(tree, options.projectRoot), hasUnitTestRunner: options.unitTestRunner !== 'none', hasLinter: options.linter !== 'none' }));
     if (options.unitTestRunner === 'none') {
         tree.delete((0, path_2.join)(options.projectRoot, 'src/lib', `${options.fileName}.spec.ts`));
     }
@@ -96,18 +95,26 @@ function createFiles(tree, options) {
 }
 function addJest(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { jestProjectGenerator } = (0, devkit_1.ensurePackage)('@nrwl/jest', versions_1.nxVersion);
         return yield jestProjectGenerator(tree, Object.assign(Object.assign({}, options), { project: options.name, setupFile: 'none', supportTsx: true, babelJest: options.babelJest, skipSerializers: true, testEnvironment: options.testEnvironment, skipFormat: true }));
     });
 }
+function addTypescript(tree, options) {
+    // add tsconfig.base.json
+    if (!options.skipTsConfig && !(0, ts_config_1.getRootTsConfigFileName)()) {
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files/root'), '.', {});
+    }
+    return !options.js
+        ? (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { typescript: versions_1.typescriptVersion })
+        : () => { };
+}
 function libraryGenerator(tree, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const options = normalizeOptions(tree, schema);
+        const tasks = [];
+        addTypescript(tree, options);
         createFiles(tree, options);
-        if (!options.skipTsConfig) {
-            updateRootTsConfig(tree, options);
-        }
         addProject(tree, options);
-        const tasks = [];
         if (options.linter !== 'none') {
             const lintCallback = yield addLint(tree, options);
             tasks.push(lintCallback);
@@ -116,10 +123,13 @@ function libraryGenerator(tree, schema) {
             const jestCallback = yield addJest(tree, options);
             tasks.push(jestCallback);
         }
+        if (!options.skipTsConfig) {
+            updateRootTsConfig(tree, options);
+        }
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }
-        return (0, run_tasks_in_serial_1.runTasksInSerial)(...tasks);
+        return (0, devkit_1.runTasksInSerial)(...tasks);
     });
 }
 exports.libraryGenerator = libraryGenerator;
@@ -127,13 +137,12 @@ exports.default = libraryGenerator;
 exports.librarySchematic = (0, devkit_1.convertNxGenerator)(libraryGenerator);
 function normalizeOptions(tree, options) {
     const name = (0, devkit_1.names)(options.name).fileName;
-    const projectDirectory = options.directory
-        ? `${(0, devkit_1.names)(options.directory).fileName}/${name}`
-        : name;
+    const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory ? `${(0, devkit_1.names)(options.directory).fileName}/${name}` : name);
     if (!options.unitTestRunner) {
         options.unitTestRunner = 'jest';
     }
     if (!options.linter) {
+        const { Linter } = require('@nrwl/linter');
         options.linter = Linter.EsLint;
     }
     const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');
@@ -141,7 +150,8 @@ function normalizeOptions(tree, options) {
         fileName: options.simpleModuleName ? name : projectName,
         pascalCaseFiles: options.pascalCaseFiles,
     });
-    const { libsDir, npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
+    const { libsDir: defaultLibsDir, npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
+    const libsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : defaultLibsDir;
     const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, projectDirectory);
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
@@ -150,7 +160,8 @@ function normalizeOptions(tree, options) {
     return Object.assign(Object.assign({}, options), { fileName, name: projectName, projectRoot,
         projectDirectory,
         parsedTags,
-        importPath });
+        importPath,
+        libsDir });
 }
 function getCaseAwareFileName(options) {
     const normalized = (0, devkit_1.names)(options.fileName);