@nrwl/nx-plugin 14.8.8 → 14.9.0-beta.1

package/CHANGELOG.md

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [14.8.8](https://github.com/nrwl/nx/compare/14.8.7...14.8.8) (2023-03-14)
+
 
 **Note:** Version bump only for package @nrwl/nx-plugin

package/LICENSE

@@ -1,22 +1,22 @@
-(The MIT License)
-
-Copyright (c) 2017-2022 Narwhal Technologies Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+(The MIT License)
+
+Copyright (c) 2017-2023 Narwhal Technologies Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -47,40 +47,19 @@ npm init nx-workspace
 yarn create nx-workspace
 ```
 
-The `create-nx-workspace` command will ask you to select a preset, which will configure some plugins and create your applications to help you get started.
-
-```
-? What to create in the new workspace (Use arrow keys)
-❯ apps              [an empty workspace with no plugins with a layout that works best for building apps]
-  core              [an empty workspace with no plugins set up to publish npm packages (similar to yarn workspaces)]
-  ts                [an empty workspace with the JS/TS plugin preinstalled]
-  react             [a workspace with a single React application]
-  angular           [a workspace with a single Angular application]
-  next.js           [a workspace with a single Next.js application]
-  nest              [a workspace with a single Nest application]
-  express           [a workspace with a single Express application]
-  web components    [a workspace with a single app built using web components]
-  react-native      [a workspace with a single React Native application]
-  react-express     [a workspace with a full stack application (React + Express)]
-```
-
-Select the preset that works best for you
-
-### Adding Nx to an Existing Monorepo
+### Adding Nx to an Existing Repository
 
 Run:
 
 ```bash
-npx add-nx-to-monorepo@latest
+npx nx@latest init
 ```
 
 ## Documentation & Resources
 
-A few links to help you get started:
-
-- [Nx.Dev: Documentation, Guides, Interactive Tutorials](https://nx.dev)
-- [Tutorial: Adding Nx to an Existing Monorepo](/recipe/adding-to-monorepo)
-- [Official Nx YouTube Channel](https://www.youtube.com/c/Nrwl_io)
+- [Nx.Dev: Documentation, Guides, Tutorials](https://nx.dev)
+- [Intro to Nx](https://nx.dev/getting-started/intro)
+- [Official Nx YouTube Channel](https://www.youtube.com/@NxDevtools)
 - [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
 
 <p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 

package/migrations.json

@@ -1,20 +1,5 @@
 {
   "schematics": {
-    "update-10.2.0": {
-      "version": "10.2.0",
-      "description": "Remove deprecated jest builder options",
-      "factory": "./src/migrations/update-10-2-0/update-10-2-0"
-    },
-    "rename-ng-update-into-nx-migrate": {
-      "version": "11.0.0-beta.4",
-      "description": "Rename ng-update into nx-migrate",
-      "factory": "./src/migrations/update-11-0-0/rename-ng-update-into-nx-migrate"
-    },
-    "update-schema-version-for-executors-and-generators": {
-      "version": "11.0.17",
-      "description": "Update schema versions for executors and generators",
-      "factory": "./src/migrations/update-11-0-0/update-schema-version-for-executors-and-generators"
-    },
     "add-swc-deps": {
       "cli": "nx",
       "version": "14.1.9-beta.0",
@@ -26,6 +11,24 @@
       "version": "14.2.3-beta.0",
       "description": "Adds @swc/core and @swc-node as a dev dep if you are using them (repeated due to bad version on earlier migration)",
       "factory": "./src/migrations/update-14-1-9/add-swc-deps-if-needed"
+    },
+    "update-15-0-0": {
+      "cli": "nx",
+      "version": "15.0.0-beta.0",
+      "description": "Migrates executor schema files to v2",
+      "factory": "./src/migrations/update-15-0-0/specify-output-capture"
+    },
+    "update-configs-jest-29": {
+      "version": "15.9.0-beta.0",
+      "cli": "nx",
+      "description": "Update nx plugin jest configs to support jest 29 changes (https://jestjs.io/docs/upgrading-to-jest29)",
+      "factory": "./src/migrations/update-15-9-0/jest-29-configs"
+    },
+    "update-tests-jest-29": {
+      "version": "15.9.0-beta.0",
+      "cli": "nx",
+      "description": "Update nx plugin jest test files to support jest 29 changes (https://jestjs.io/docs/upgrading-to-jest29)",
+      "factory": "./src/migrations/update-15-9-0/jest-29-tests"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/nx-plugin",
-  "version": "14.8.8",
+  "version": "14.9.0-beta.1",
   "private": false,
   "description": "This plugin is used to create Nx plugins! It contains generators for generating common plugin features like generators, executors, migrations and more.",
   "repository": {
@@ -28,16 +28,17 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/devkit": "14.8.8",
-    "@nrwl/jest": "14.8.8",
-    "@nrwl/js": "14.8.8",
-    "@nrwl/linter": "14.8.8",
+    "@nrwl/devkit": "14.9.0-beta.1",
+    "@nrwl/jest": "14.9.0-beta.1",
+    "@nrwl/js": "14.9.0-beta.1",
+    "@nrwl/linter": "14.9.0-beta.1",
+    "@phenomnomnominal/tsquery": "4.1.1",
     "dotenv": "~10.0.0",
-    "fs-extra": "^10.1.0",
+    "fs-extra": "^11.1.0",
     "tslib": "^2.3.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "26f7cfdf15ae9c7f90a79789d744b71612951ae4"
+  "gitHead": "b2a467bcb2bdc124ed52f3755780bca429a43855"
 }

package/src/executors/e2e/e2e.impl.js

@@ -5,27 +5,35 @@ const tslib_1 = require("tslib");
 require("dotenv/config");
 const devkit_1 = require("@nrwl/devkit");
 const jest_impl_1 = require("@nrwl/jest/src/executors/jest/jest.impl");
+// TODO(Caleb & Craigory): can we get rid of this and just use @nrwl/jest directly?
 function nxPluginE2EExecutor(options, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* nxPluginE2EExecutor_1() {
-        var e_1, _a;
+        var _a, e_1, _b, _c;
         const { target } = options, jestOptions = tslib_1.__rest(options, ["target"]);
         let success;
         try {
-            for (var _b = tslib_1.__asyncValues(runBuildTarget(target, context)), _c; _c = yield tslib_1.__await(_b.next()), !_c.done;) {
-                const _ = _c.value;
+            for (var _d = true, _e = tslib_1.__asyncValues(runBuildTarget(target, context)), _f; _f = yield tslib_1.__await(_e.next()), _a = _f.done, !_a;) {
+                _c = _f.value;
+                _d = false;
                 try {
-                    success = yield tslib_1.__await(runTests(jestOptions, context));
+                    const _ = _c;
+                    try {
+                        success = yield tslib_1.__await(runTests(jestOptions, context));
+                    }
+                    catch (e) {
+                        devkit_1.logger.error(e.message);
+                        success = false;
+                    }
                 }
-                catch (e) {
-                    devkit_1.logger.error(e.message);
-                    success = false;
+                finally {
+                    _d = true;
                 }
             }
         }
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (_c && !_c.done && (_a = _b.return)) yield tslib_1.__await(_a.call(_b));
+                if (!_d && !_a && (_b = _e.return)) yield tslib_1.__await(_b.call(_e));
             }
             finally { if (e_1) throw e_1.error; }
         }
@@ -35,22 +43,29 @@ function nxPluginE2EExecutor(options, context) {
 exports.nxPluginE2EExecutor = nxPluginE2EExecutor;
 function runBuildTarget(buildTarget, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* runBuildTarget_1() {
-        var e_2, _a;
+        var _a, e_2, _b, _c;
         const { project, target, configuration } = (0, devkit_1.parseTargetString)(buildTarget);
         const buildTargetOptions = (0, devkit_1.readTargetOptions)({ project, target, configuration }, context);
         const targetSupportsWatch = Object.keys(buildTargetOptions).includes('watch');
         try {
-            for (var _b = tslib_1.__asyncValues(yield tslib_1.__await((0, devkit_1.runExecutor)({ project, target, configuration }, targetSupportsWatch ? { watch: false } : {}, context))), _c; _c = yield tslib_1.__await(_b.next()), !_c.done;) {
-                const output = _c.value;
-                if (!output.success)
-                    throw new Error('Could not compile application files.');
-                yield yield tslib_1.__await(output.success);
+            for (var _d = true, _e = tslib_1.__asyncValues(yield tslib_1.__await((0, devkit_1.runExecutor)({ project, target, configuration }, targetSupportsWatch ? { watch: false } : {}, context))), _f; _f = yield tslib_1.__await(_e.next()), _a = _f.done, !_a;) {
+                _c = _f.value;
+                _d = false;
+                try {
+                    const output = _c;
+                    if (!output.success)
+                        throw new Error('Could not compile application files.');
+                    yield yield tslib_1.__await(output.success);
+                }
+                finally {
+                    _d = true;
+                }
             }
         }
         catch (e_2_1) { e_2 = { error: e_2_1 }; }
         finally {
             try {
-                if (_c && !_c.done && (_a = _b.return)) yield tslib_1.__await(_a.call(_b));
+                if (!_d && !_a && (_b = _e.return)) yield tslib_1.__await(_b.call(_e));
             }
             finally { if (e_2) throw e_2.error; }
         }

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

@@ -1 +1 @@
-{"version":3,"file":"e2e.impl.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/executors/e2e/e2e.impl.ts"],"names":[],"mappings":";;;;AAAA,yBAAuB;AAIvB,yCAKsB;AAEtB,uEAAuE;AAGvE,SAAuB,mBAAmB,CACxC,OAAmC,EACnC,OAAwB;;;QAExB,MAAM,EAAE,MAAM,KAAqB,OAAO,EAAvB,WAAW,kBAAK,OAAO,EAApC,UAA0B,CAAU,CAAC;QAE3C,IAAI,OAAgB,CAAC;;YACrB,KAAsB,IAAA,KAAA,sBAAA,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA,IAAA;gBAA1C,MAAM,CAAC,WAAA,CAAA;gBAChB,IAAI;oBACF,OAAO,GAAG,sBAAM,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA,CAAC;iBAChD;gBAAC,OAAO,CAAC,EAAE;oBACV,eAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;oBACxB,OAAO,GAAG,KAAK,CAAC;iBACjB;aACF;;;;;;;;;QAED,6BAAO,EAAE,OAAO,EAAE,EAAC;IACrB,CAAC;CAAA;AAjBD,kDAiBC;AAED,SAAgB,cAAc,CAC5B,WAAmB,EACnB,OAAwB;;;QAExB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,0BAAiB,EAAC,WAAW,CAAC,CAAC;QAC1E,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAC1C,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,EAClC,OAAO,CACR,CAAC;QACF,MAAM,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;;YAE9E,KAA2B,IAAA,KAAA,sBAAA,sBAAM,IAAA,oBAAW,EAC1C,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,EAClC,mBAAmB,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAC3C,OAAO,CACR,CAAA,CAAA,IAAA;gBAJU,MAAM,MAAM,WAAA,CAAA;gBAKrB,IAAI,CAAC,MAAM,CAAC,OAAO;oBACjB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;gBAC1D,4BAAM,MAAM,CAAC,OAAO,CAAA,CAAC;aACtB;;;;;;;;;IACH,CAAC;CAAA;AAED,SAAe,QAAQ,CACrB,WAAgC,EAChC,OAAwB;;QAExB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,wBAAY,kCAC/B,WAAW,KAAE,KAAK,EAAE,KAAK,KAC9B,OAAO,CACR,CAAC;QAEF,OAAO,OAAO,CAAC;IACjB,CAAC;CAAA;AAED,kBAAe,mBAAmB,CAAC"}
+{"version":3,"file":"e2e.impl.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/executors/e2e/e2e.impl.ts"],"names":[],"mappings":";;;;AAAA,yBAAuB;AAIvB,yCAKsB;AAEtB,uEAAuE;AAGvE,mFAAmF;AACnF,SAAuB,mBAAmB,CACxC,OAAmC,EACnC,OAAwB;;;QAExB,MAAM,EAAE,MAAM,KAAqB,OAAO,EAAvB,WAAW,kBAAK,OAAO,EAApC,UAA0B,CAAU,CAAC;QAE3C,IAAI,OAAgB,CAAC;;YACrB,KAAsB,eAAA,KAAA,sBAAA,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA,IAAA;gBAA/B,cAA+B;gBAA/B,WAA+B;;oBAA1C,MAAM,CAAC,KAAA,CAAA;oBAChB,IAAI;wBACF,OAAO,GAAG,sBAAM,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA,CAAC;qBAChD;oBAAC,OAAO,CAAC,EAAE;wBACV,eAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;wBACxB,OAAO,GAAG,KAAK,CAAC;qBACjB;;;;;aACF;;;;;;;;;QAED,6BAAO,EAAE,OAAO,EAAE,EAAC;IACrB,CAAC;CAAA;AAjBD,kDAiBC;AAED,SAAgB,cAAc,CAC5B,WAAmB,EACnB,OAAwB;;;QAExB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,0BAAiB,EAAC,WAAW,CAAC,CAAC;QAC1E,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAC1C,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,EAClC,OAAO,CACR,CAAC;QACF,MAAM,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;;YAE9E,KAA2B,eAAA,KAAA,sBAAA,sBAAM,IAAA,oBAAW,EAC1C,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,EAClC,mBAAmB,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAC3C,OAAO,CACR,CAAA,CAAA,IAAA;gBAJ0B,cAI1B;gBAJ0B,WAI1B;;oBAJU,MAAM,MAAM,KAAA,CAAA;oBAKrB,IAAI,CAAC,MAAM,CAAC,OAAO;wBACjB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;oBAC1D,4BAAM,MAAM,CAAC,OAAO,CAAA,CAAC;;;;;aACtB;;;;;;;;;IACH,CAAC;CAAA;AAED,SAAe,QAAQ,CACrB,WAAgC,EAChC,OAAwB;;QAExB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,wBAAY,kCAC/B,WAAW,KAAE,KAAK,EAAE,KAAK,KAC9B,OAAO,CACR,CAAC;QAEF,OAAO,OAAO,CAAC;IACjB,CAAC;CAAA;AAED,kBAAe,mBAAmB,CAAC"}

package/src/executors/e2e/schema.json

@@ -1,4 +1,6 @@
 {
+  "version": 2,
+  "outputCapture": "direct-nodejs",
   "title": "Nx Plugin Playground Target",
   "description": "Creates a playground for a Nx Plugin.",
   "cli": "nx",
@@ -6,22 +8,24 @@
   "properties": {
     "target": {
       "description": "The build target for the Nx Plugin project.",
-      "type": "string"
+      "type": "string",
+      "x-priority": "important"
     },
     "jestConfig": {
       "type": "string",
       "description": "Jest config file.",
       "x-completion-type": "file",
-      "x-completion-glob": "jest.config@(.js|.ts)"
+      "x-completion-glob": "jest.config@(.js|.ts)",
+      "x-priority": "important"
     },
     "tsSpecConfig": {
       "type": "string",
       "description": "The tsconfig file for specs.",
       "x-deprecated": "Use the `tsconfig` property for `ts-jest` in the e2e project `jest.config.js` file. It will be removed in the next major release.",
       "x-completion-type": "file",
-      "x-completion-glob": "tsconfig.*.json"
+      "x-completion-glob": "tsconfig.*.json",
+      "x-priority": "important"
     },
-
     "codeCoverage": {
       "description": "Indicates that test coverage information should be collected and reported in the output. (https://jestjs.io/docs/cli#--coverageboolean)",
       "type": "boolean",
@@ -56,17 +60,24 @@
     "tsConfig": {
       "description": "The name of the Typescript configuration file. Set the tsconfig option in the jest config file. ",
       "type": "string",
-      "x-deprecated": true
+      "x-deprecated": "Use the ts-jest configuration options in the jest config file instead."
     },
     "setupFile": {
       "description": "The name of a setup file used by Jest. (use Jest config file https://jestjs.io/docs/en/configuration#setupfilesafterenv-array)",
       "type": "string",
-      "x-deprecated": true
+      "x-deprecated": "Use the setupFilesAfterEnv option in the jest config file. https://jestjs.io/docs/en/configuration#setupfilesafterenv-array"
     },
     "bail": {
       "alias": "b",
       "description": "Exit the test suite immediately after `n` number of failing tests. (https://jestjs.io/docs/cli#--bail)",
-      "oneOf": [{ "type": "number" }, { "type": "boolean" }]
+      "oneOf": [
+        {
+          "type": "number"
+        },
+        {
+          "type": "boolean"
+        }
+      ]
     },
     "ci": {
       "description": "Whether to run Jest in continuous integration (CI) mode. This option is on by default in most popular CI environments. It will prevent snapshots from being written unless explicitly requested. (https://jestjs.io/docs/cli#--ci)",
@@ -88,7 +99,14 @@
     "maxWorkers": {
       "alias": "w",
       "description": "Specifies the maximum number of workers the worker-pool will spawn for running tests. This defaults to the number of the cores available on your machine. Useful for CI. (its usually best not to override this default) (https://jestjs.io/docs/cli#--maxworkersnumstring)",
-      "oneOf": [{ "type": "number" }, { "type": "string" }]
+      "oneOf": [
+        {
+          "type": "number"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "onlyChanged": {
       "alias": "o",

package/src/generators/e2e-project/e2e.d.ts

@@ -1,5 +1,6 @@
 import type { Tree } from '@nrwl/devkit';
+import { GeneratorCallback } from '@nrwl/devkit';
 import type { Schema } from './schema';
-export declare function e2eProjectGenerator(host: Tree, schema: Schema): Promise<void>;
+export declare function e2eProjectGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default e2eProjectGenerator;
 export declare const e2eProjectSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/e2e-project/e2e.js

@@ -4,18 +4,20 @@ exports.e2eProjectSchematic = exports.e2eProjectGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const jest_1 = require("@nrwl/jest");
-const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
+const js_1 = require("@nrwl/js");
 const path = require("path");
+const linter_1 = require("@nrwl/linter");
 function normalizeOptions(host, options) {
-    var _a;
-    const { npmScope, appsDir } = (0, devkit_1.getWorkspaceLayout)(host);
+    var _a, _b;
+    const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.projectDirectory);
+    const { npmScope, appsDir: defaultAppsDir } = (0, devkit_1.getWorkspaceLayout)(host);
+    const appsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : defaultAppsDir;
     const projectName = `${options.pluginName}-e2e`;
-    const projectRoot = options.projectDirectory
-        ? (0, devkit_1.joinPathFragments)(appsDir, `${options.projectDirectory}-e2e`)
+    const projectRoot = projectDirectory
+        ? (0, devkit_1.joinPathFragments)(appsDir, `${projectDirectory}-e2e`)
         : (0, devkit_1.joinPathFragments)(appsDir, projectName);
     const pluginPropertyName = (0, devkit_1.names)(options.pluginName).propertyName;
-    return Object.assign(Object.assign({}, options), { minimal: (_a = options.minimal) !== null && _a !== void 0 ? _a : false, projectName,
-        pluginPropertyName,
+    return Object.assign(Object.assign({}, options), { minimal: (_a = options.minimal) !== null && _a !== void 0 ? _a : false, projectName, linter: (_b = options.linter) !== null && _b !== void 0 ? _b : linter_1.Linter.EsLint, pluginPropertyName,
         projectRoot,
         npmScope });
 }
@@ -28,7 +30,7 @@ function validatePlugin(host, pluginName) {
     }
 }
 function addFiles(host, options) {
-    (0, devkit_1.generateFiles)(host, path.join(__dirname, './files'), options.projectRoot, Object.assign(Object.assign({}, options), { tmpl: '', rootTsConfigPath: (0, typescript_1.getRelativePathToRootTsConfig)(host, options.projectRoot) }));
+    (0, devkit_1.generateFiles)(host, path.join(__dirname, './files'), options.projectRoot, Object.assign(Object.assign({}, options), { tmpl: '', rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot) }));
 }
 function updateWorkspaceConfiguration(host, options) {
     (0, devkit_1.addProjectConfiguration)(host, options.projectName, {
@@ -43,7 +45,7 @@ function updateWorkspaceConfiguration(host, options) {
         },
         tags: [],
         implicitDependencies: [options.pluginName],
-    }, options.standaloneConfig);
+    });
 }
 function addJest(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -62,14 +64,36 @@ function addJest(host, options) {
         (0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);
     });
 }
+function addLintingToApplication(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const lintTask = yield (0, linter_1.lintProjectGenerator)(tree, {
+            linter: options.linter,
+            project: options.projectName,
+            tsConfigPaths: [
+                (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.app.json'),
+            ],
+            eslintFilePatterns: [`${options.projectRoot}/**/*.ts`],
+            unitTestRunner: 'jest',
+            skipFormat: true,
+            setParserOptionsProject: false,
+        });
+        return lintTask;
+    });
+}
 function e2eProjectGenerator(host, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const tasks = [];
         validatePlugin(host, schema.pluginName);
         const options = normalizeOptions(host, schema);
         addFiles(host, options);
         updateWorkspaceConfiguration(host, options);
         yield addJest(host, options);
+        if (options.linter !== linter_1.Linter.None) {
+            const lintTask = yield addLintingToApplication(host, Object.assign({}, options));
+            tasks.push(lintTask);
+        }
         yield (0, devkit_1.formatFiles)(host);
+        return (0, devkit_1.runTasksInSerial)(...tasks);
     });
 }
 exports.e2eProjectGenerator = e2eProjectGenerator;

package/src/generators/e2e-project/e2e.js.map

@@ -1 +1 @@
-{"version":3,"file":"e2e.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/e2e-project/e2e.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"e2e.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/e2e-project/e2e.ts"],"names":[],"mappings":";;;;AACA,yCAasB;AACtB,qCAAkD;AAClD,iCAAyD;AACzD,6BAA6B;AAG7B,yCAA4D;AAU5D,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IACnD,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAClE,OAAO,CAAC,gBAAgB,CACzB,CAAC;IACF,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IACvE,MAAM,OAAO,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,cAAc,CAAC;IAElD,MAAM,WAAW,GAAG,GAAG,OAAO,CAAC,UAAU,MAAM,CAAC;IAChD,MAAM,WAAW,GAAG,gBAAgB;QAClC,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,GAAG,gBAAgB,MAAM,CAAC;QACvD,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC5C,MAAM,kBAAkB,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC,YAAY,CAAC;IAElE,uCACK,OAAO,KACV,OAAO,EAAE,MAAA,OAAO,CAAC,OAAO,mCAAI,KAAK,EACjC,WAAW,EACX,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,eAAM,CAAC,MAAM,EACvC,kBAAkB;QAClB,WAAW;QACX,QAAQ,IACR;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,IAAU,EAAE,UAAkB;IACpD,IAAI;QACF,IAAA,iCAAwB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;KAC5C;IAAC,WAAM;QACN,MAAM,IAAI,KAAK,CAAC,iBAAiB,UAAU,sBAAsB,CAAC,CAAC;KACpE;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,WAAW,kCACnE,OAAO,KACV,IAAI,EAAE,EAAE,EACR,gBAAgB,EAAE,IAAA,kCAA6B,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,IAC1E,CAAC;AACL,CAAC;AAED,SAAS,4BAA4B,CAAC,IAAU,EAAE,OAAyB;IACzE,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE;QACjD,IAAI,EAAE,OAAO,CAAC,WAAW;QACzB,WAAW,EAAE,aAAa;QAC1B,UAAU,EAAE,GAAG,OAAO,CAAC,WAAW,MAAM;QACxC,OAAO,EAAE;YACP,GAAG,EAAE;gBACH,QAAQ,EAAE,qBAAqB;gBAC/B,OAAO,EAAE,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,QAAQ,EAAE;aACnD;SACF;QACD,IAAI,EAAE,EAAE;QACR,oBAAoB,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC;KAC3C,CAAC,CAAC;AACL,CAAC;AAED,SAAe,OAAO,CAAC,IAAU,EAAE,OAAyB;;QAC1D,MAAM,IAAA,2BAAoB,EAAC,IAAI,EAAE;YAC/B,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,SAAS,EAAE,MAAM;YACjB,UAAU,EAAE,KAAK;YACjB,eAAe,EAAE,IAAI;SACtB,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACpE,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;QACjD,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;QAC/C,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,mCACtB,UAAU,KACb,UAAU,EAAE,WAAW,CAAC,UAAU,GACnC,CAAC;QAEF,+BAA+B;QAC/B,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;QAE5B,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACjE,CAAC;CAAA;AAED,SAAe,uBAAuB,CACpC,IAAU,EACV,OAAyB;;QAEzB,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;YAChD,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,aAAa,EAAE;gBACb,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC;aAC5D;YACD,kBAAkB,EAAE,CAAC,GAAG,OAAO,CAAC,WAAW,UAAU,CAAC;YACtD,cAAc,EAAE,MAAM;YACtB,UAAU,EAAE,IAAI;YAChB,uBAAuB,EAAE,KAAK;SAC/B,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AAED,SAAsB,mBAAmB,CAAC,IAAU,EAAE,MAAc;;QAClE,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QACxC,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/C,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACxB,4BAA4B,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5C,MAAM,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE7B,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,IAAI,EAAE;YAClC,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAAC,IAAI,oBAC9C,OAAO,EACV,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACtB;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAnBD,kDAmBC;AAED,kBAAe,mBAAmB,CAAC;AACtB,QAAA,mBAAmB,GAAG,IAAA,2BAAkB,EAAC,mBAAmB,CAAC,CAAC"}

package/src/generators/e2e-project/schema.d.ts

@@ -1,9 +1,11 @@
+import { Linter } from '@nrwl/linter';
+
 export interface Schema {
   pluginName: string;
   npmPackageName: string;
   projectDirectory?: string;
   pluginOutputPath?: string;
   jestConfig?: string;
-  standaloneConfig?: boolean;
   minimal?: boolean;
+  linter?: Linter;
 }

package/src/generators/e2e-project/schema.json

@@ -8,11 +8,13 @@
   "properties": {
     "pluginName": {
       "type": "string",
-      "description": "the name of the plugin to be tested."
+      "description": "the project name of the plugin to be tested.",
+      "x-priority": "important"
     },
     "npmPackageName": {
       "type": "string",
-      "description": "the name of the package that would be published to NPM."
+      "description": "the package name of the plugin as it would be published to NPM.",
+      "x-priority": "important"
     },
     "projectDirectory": {
       "type": "string",
@@ -20,20 +22,24 @@
     },
     "pluginOutputPath": {
       "type": "string",
-      "description": "the output path of the plugin after it builds."
+      "description": "the output path of the plugin after it builds.",
+      "x-priority": "important"
     },
     "jestConfig": {
       "type": "string",
       "description": "Jest config file."
     },
-    "tsSpecConfig": {
-      "type": "string",
-      "description": "Spec `tsconfig` file.",
-      "x-deprecated": true
-    },
     "standaloneConfig": {
       "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
-      "type": "boolean"
+      "type": "boolean",
+      "default": true,
+      "x-deprecated": "Nx only supports standaloneConfig"
+    },
+    "linter": {
+      "description": "The tool to use for running lint checks.",
+      "type": "string",
+      "enum": ["eslint", "none"],
+      "default": "eslint"
     },
     "minimal": {
       "type": "boolean",
@@ -41,6 +47,5 @@
       "default": false
     }
   },
-  "required": ["pluginName", "npmPackageName"],
-  "additionalProperties": false
+  "required": ["pluginName", "npmPackageName"]
 }

package/src/generators/executor/files/executor/__fileName__/schema.json__tmpl__

@@ -1,5 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
+  "version": 2,
   "cli": "nx",
   "title": "<%= className %> executor",
   "description": "",

package/src/generators/executor/schema.json

@@ -19,7 +19,8 @@
       "$default": {
         "$source": "projectName"
       },
-      "x-prompt": "What is the name of the project for the executor?"
+      "x-prompt": "What is the name of the project for the executor?",
+      "x-priority": "important"
     },
     "name": {
       "type": "string",
@@ -28,12 +29,12 @@
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the executor?"
+      "x-prompt": "What name would you like to use for the executor?",
+      "x-priority": "important"
     },
     "description": {
       "type": "string",
-      "description": "Executor description.",
-      "alias": "d"
+      "description": "Executor description."
     },
     "unitTestRunner": {
       "type": "string",

package/src/generators/generator/files/generator/__fileName__/generator.spec.ts__tmpl__

@@ -9,7 +9,7 @@ describe('<%= name %> generator', () => {
   const options: <%= className %>GeneratorSchema = { name: 'test' };
 
   beforeEach(() => {
-    appTree = createTreeWithEmptyWorkspace();
+    appTree = createTreeWithEmptyWorkspace({layout: 'apps-libs'});
   });
 
   it('should run successfully', async () => {

package/src/generators/generator/files/generator/__fileName__/schema.json__tmpl__

@@ -21,8 +21,7 @@
     }, 
     "directory": {
       "type": "string",
-      "description": "A directory where the project is placed",
-      "alias": "d"
+      "description": "A directory where the project is placed"
     }
   },
   "required": ["name"]

package/src/generators/generator/generator.js

@@ -67,6 +67,10 @@ function updateGeneratorJson(host, options) {
             schema: `./src/generators/${options.fileName}/schema.json`,
             description: options.description,
         };
+        // @todo(v17): Remove this, prop is defunct.
+        if (options.name === 'preset') {
+            generators[options.name]['x-use-standalone-layout'] = true;
+        }
         json.generators = generators;
         return json;
     });

package/src/generators/generator/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/generator/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/generator/generator.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,yCAQsB;AAEtB,6BAA6B;AAY7B,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;IACnD,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpD,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,GACxD,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAElD,MAAM,cAAc,GAAG,IAAA,iBAAQ,EAC7B,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CACvC,CAAC,IAAI,CAAC;IAEP,IAAI,WAAmB,CAAC;IACxB,IAAI,OAAO,CAAC,WAAW,EAAE;QACvB,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;KACnC;SAAM;QACL,WAAW,GAAG,GAAG,OAAO,CAAC,IAAI,YAAY,CAAC;KAC3C;IAED,uCACK,OAAO,KACV,QAAQ;QACR,SAAS;QACT,WAAW;QACX,WAAW;QACX,iBAAiB;QACjB,QAAQ;QACR,cAAc,IACd;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,MAAM,SAAS,GAAG,GAAG,OAAO,CAAC,iBAAiB,eAAe,OAAO,CAAC,QAAQ,iCAAiC,CAAC;IAE/G,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC3B,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,wCAAwC,CAAC,CAAC;KACjE;IAED,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,mBAAmB,CAAC,EACzC,GAAG,OAAO,CAAC,iBAAiB,aAAa,kCAEpC,OAAO,KACV,IAAI,EAAE,EAAE,IAEX,CAAC;IAEF,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;QACrC,IAAI,CAAC,MAAM,CACT,IAAI,CAAC,IAAI,CACP,OAAO,CAAC,iBAAiB,EACzB,YAAY,EACZ,OAAO,CAAC,QAAQ,EAChB,mBAAmB,CACpB,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAU,EAAE,OAAyB;IACjE,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,EACtD,CAAC,IAAI,EAAE,EAAE;;QACP,MAAA,IAAI,CAAC,UAAU,oCAAf,IAAI,CAAC,UAAU,GAAK,iBAAiB,EAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC,CACF,CAAC;IACF,IAAA,kBAAS,EACP,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,iBAAiB,CAAC,EACzD;QACE,UAAU,EAAE,EAAE;KACf,CACF,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAU,EAAE,OAAyB;;IAChE,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAC1B,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CACvD,CAAC;IACF,MAAM,qBAAqB,GACzB,MAAA,WAAW,CAAC,UAAU,mCAAI,WAAW,CAAC,UAAU,CAAC;IACnD,IAAI,cAAc,GAAG,qBAAqB;QACxC,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,qBAAqB,CAAC;QAC/D,CAAC,CAAC,IAAI,CAAC;IAET,IAAI,CAAC,cAAc,EAAE;QACnB,cAAc,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;KAC5E;IACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;QAChC,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACrC;IAED,OAAO,IAAA,mBAAU,EAAiB,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;;QAC/D,IAAI,UAAU,GAAG,MAAA,IAAI,CAAC,UAAU,mCAAI,IAAI,CAAC,UAAU,CAAC;QACpD,UAAU,GAAG,UAAU,IAAI,EAAE,CAAC;QAC9B,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG;YACzB,OAAO,EAAE,oBAAoB,OAAO,CAAC,QAAQ,YAAY;YACzD,MAAM,EAAE,oBAAoB,OAAO,CAAC,QAAQ,cAAc;YAC1D,WAAW,EAAE,OAAO,CAAC,WAAW;SACjC,CAAC;QACF,4CAA4C;QAC5C,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC7B,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,yBAAyB,CAAC,GAAG,IAAI,CAAC;SAC5D;QACD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAE7B,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAsB,kBAAkB,CAAC,IAAU,EAAE,MAAc;;QACjE,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAExB,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrC,CAAC;CAAA;AAND,gDAMC;AAED,kBAAe,kBAAkB,CAAC;AACrB,QAAA,kBAAkB,GAAG,IAAA,2BAAkB,EAAC,kBAAkB,CAAC,CAAC"}

package/src/generators/generator/schema.json

@@ -19,7 +19,8 @@
       "$default": {
         "$source": "projectName"
       },
-      "x-prompt": "What is the name of the project for the generator?"
+      "x-prompt": "What is the name of the project for the generator?",
+      "x-priority": "important"
     },
     "name": {
       "type": "string",
@@ -28,7 +29,8 @@
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the generator?"
+      "x-prompt": "What name would you like to use for the generator?",
+      "x-priority": "important"
     },
     "description": {
       "type": "string",