@nx/plugin 16.8.0-beta.4 → 16.8.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "16.8.0-beta.4",
+  "version": "16.8.0-beta.5",
   "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,11 +28,11 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/nx-plugin": "16.8.0-beta.4",
-    "@nx/devkit": "16.8.0-beta.4",
-    "@nx/jest": "16.8.0-beta.4",
-    "@nx/js": "16.8.0-beta.4",
-    "@nx/linter": "16.8.0-beta.4",
+    "@nrwl/nx-plugin": "16.8.0-beta.5",
+    "@nx/devkit": "16.8.0-beta.5",
+    "@nx/jest": "16.8.0-beta.5",
+    "@nx/js": "16.8.0-beta.5",
+    "@nx/linter": "16.8.0-beta.5",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "fs-extra": "^11.1.0",
     "tslib": "^2.3.0"
@@ -41,5 +41,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "c9aad2dc8c2b34531cf61549bff872e68c481e4e"
+  "gitHead": "ad2d1e8a55b2d1b358bb5e7483343d9757ff2c53"
 }

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

@@ -1,77 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxPluginE2EExecutor = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const jest_impl_1 = require("@nx/jest/src/executors/jest/jest.impl");
 // TODO(v18): remove this
-function nxPluginE2EExecutor(options, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* nxPluginE2EExecutor_1() {
-        var _a, e_1, _b, _c;
-        const { target } = options, jestOptions = tslib_1.__rest(options, ["target"]);
-        devkit_1.output.warn({
-            title: `"@nx/plugin:e2e" is deprecated and will be removed in Nx 18`,
-            bodyLines: [
-                'Use the "@nx/jest:jest" executor instead and set the following:',
-                `"dependsOn": ["${target}"]`,
-            ],
-        });
-        let success;
+async function* nxPluginE2EExecutor(options, context) {
+    const { target, ...jestOptions } = options;
+    devkit_1.output.warn({
+        title: `"@nx/plugin:e2e" is deprecated and will be removed in Nx 18`,
+        bodyLines: [
+            'Use the "@nx/jest:jest" executor instead and set the following:',
+            `"dependsOn": ["${target}"]`,
+        ],
+    });
+    let success;
+    for await (const _ of runBuildTarget(target, context)) {
         try {
-            for (var _d = true, _e = tslib_1.__asyncValues(runBuildTarget(target, context)), _f; _f = yield tslib_1.__await(_e.next()), _a = _f.done, !_a; _d = true) {
-                _c = _f.value;
-                _d = false;
-                const _ = _c;
-                try {
-                    success = yield tslib_1.__await(runTests(jestOptions, context));
-                }
-                catch (e) {
-                    devkit_1.logger.error(e.message);
-                    success = false;
-                }
-            }
+            success = await runTests(jestOptions, context);
         }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (!_d && !_a && (_b = _e.return)) yield tslib_1.__await(_b.call(_e));
-            }
-            finally { if (e_1) throw e_1.error; }
+        catch (e) {
+            devkit_1.logger.error(e.message);
+            success = false;
         }
-        return yield tslib_1.__await({ success });
-    });
+    }
+    return { success };
 }
 exports.nxPluginE2EExecutor = nxPluginE2EExecutor;
-function runBuildTarget(buildTarget, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* runBuildTarget_1() {
-        var _a, e_2, _b, _c;
-        const graph = yield tslib_1.__await((0, devkit_1.createProjectGraphAsync)());
-        const { project, target, configuration } = (0, devkit_1.parseTargetString)(buildTarget, graph);
-        const buildTargetOptions = (0, devkit_1.readTargetOptions)({ project, target, configuration }, context);
-        const targetSupportsWatch = Object.keys(buildTargetOptions).includes('watch');
-        try {
-            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; _d = true) {
-                _c = _f.value;
-                _d = false;
-                const output = _c;
-                if (!output.success)
-                    throw new Error('Could not compile application files.');
-                yield yield tslib_1.__await(output.success);
-            }
-        }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-        finally {
-            try {
-                if (!_d && !_a && (_b = _e.return)) yield tslib_1.__await(_b.call(_e));
-            }
-            finally { if (e_2) throw e_2.error; }
-        }
-    });
+async function* runBuildTarget(buildTarget, context) {
+    const graph = await (0, devkit_1.createProjectGraphAsync)();
+    const { project, target, configuration } = (0, devkit_1.parseTargetString)(buildTarget, graph);
+    const buildTargetOptions = (0, devkit_1.readTargetOptions)({ project, target, configuration }, context);
+    const targetSupportsWatch = Object.keys(buildTargetOptions).includes('watch');
+    for await (const output of await (0, devkit_1.runExecutor)({ project, target, configuration }, targetSupportsWatch ? { watch: false } : {}, context)) {
+        if (!output.success)
+            throw new Error('Could not compile application files.');
+        yield output.success;
+    }
 }
-function runTests(jestOptions, context) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { success } = yield (0, jest_impl_1.jestExecutor)(Object.assign(Object.assign({}, jestOptions), { watch: false }), context);
-        return success;
-    });
+async function runTests(jestOptions, context) {
+    const { success } = await (0, jest_impl_1.jestExecutor)({ ...jestOptions, watch: false }, context);
+    return success;
 }
 exports.default = nxPluginE2EExecutor;

package/src/generators/create-package/create-package.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPackageSchematic = exports.createPackageGeneratorInternal = exports.createPackageGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const versions_1 = require("nx/src/utils/versions");
@@ -9,30 +8,29 @@ const generator_1 = require("../generator/generator");
 const normalize_schema_1 = require("./utils/normalize-schema");
 const has_generator_1 = require("../../utils/has-generator");
 const path_1 = require("path");
-function createPackageGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield createPackageGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+async function createPackageGenerator(host, schema) {
+    return await createPackageGeneratorInternal(host, {
+        projectNameAndRootFormat: 'derived',
+        ...schema,
     });
 }
 exports.createPackageGenerator = createPackageGenerator;
-function createPackageGeneratorInternal(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const tasks = [];
-        const options = yield (0, normalize_schema_1.normalizeSchema)(host, schema);
-        const pluginPackageName = yield addPresetGenerator(host, options);
-        const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {
-            'create-nx-workspace': versions_1.nxVersion,
-        }, {});
-        tasks.push(installTask);
-        yield createCliPackage(host, options, pluginPackageName);
-        if (options.e2eProject) {
-            addE2eProject(host, options);
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+async function createPackageGeneratorInternal(host, schema) {
+    const tasks = [];
+    const options = await (0, normalize_schema_1.normalizeSchema)(host, schema);
+    const pluginPackageName = await addPresetGenerator(host, options);
+    const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {
+        'create-nx-workspace': versions_1.nxVersion,
+    }, {});
+    tasks.push(installTask);
+    await createCliPackage(host, options, pluginPackageName);
+    if (options.e2eProject) {
+        addE2eProject(host, options);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.createPackageGeneratorInternal = createPackageGeneratorInternal;
 /**
@@ -41,49 +39,57 @@ exports.createPackageGeneratorInternal = createPackageGeneratorInternal;
  * @param schema
  * @returns package name of the plugin
  */
-function addPresetGenerator(host, schema) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { root: projectRoot } = (0, devkit_1.readProjectConfiguration)(host, schema.project);
-        if (!(0, has_generator_1.hasGenerator)(host, schema.project, 'preset')) {
-            yield (0, generator_1.default)(host, {
-                name: 'preset',
-                project: schema.project,
-                unitTestRunner: schema.unitTestRunner,
-                skipFormat: true,
-            });
-        }
-        return (_a = (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(projectRoot, 'package.json'))) === null || _a === void 0 ? void 0 : _a.name;
-    });
-}
-function createCliPackage(host, options, pluginPackageName) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, js_1.libraryGenerator)(host, Object.assign(Object.assign({}, options), { rootProject: false, config: 'project', publishable: true, bundler: options.bundler, importPath: options.name, skipFormat: true, skipTsConfig: true }));
-        host.delete((0, devkit_1.joinPathFragments)(options.projectRoot, 'src'));
-        // Add the bin entry to the package.json
-        (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), (packageJson) => {
-            packageJson.bin = {
-                [options.name]: './bin/index.js',
-            };
-            packageJson.dependencies = {
-                'create-nx-workspace': versions_1.nxVersion,
-            };
-            return packageJson;
-        });
-        // update project build target to use the bin entry
-        const projectConfiguration = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
-        projectConfiguration.sourceRoot = (0, devkit_1.joinPathFragments)(options.projectRoot, 'bin');
-        projectConfiguration.targets.build.options.main = (0, devkit_1.joinPathFragments)(options.projectRoot, 'bin/index.ts');
-        projectConfiguration.targets.build.options.updateBuildableProjectDepsInPackageJson =
-            false;
-        projectConfiguration.implicitDependencies = [options.project];
-        (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfiguration);
-        // Add bin files to tsconfg.lib.json
-        (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'), (tsConfig) => {
-            tsConfig.include.push('bin/**/*.ts');
-            return tsConfig;
+async function addPresetGenerator(host, schema) {
+    const { root: projectRoot } = (0, devkit_1.readProjectConfiguration)(host, schema.project);
+    if (!(0, has_generator_1.hasGenerator)(host, schema.project, 'preset')) {
+        await (0, generator_1.default)(host, {
+            name: 'preset',
+            project: schema.project,
+            unitTestRunner: schema.unitTestRunner,
+            skipFormat: true,
         });
-        (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/create-framework-package'), options.projectRoot, Object.assign(Object.assign({}, options), { preset: pluginPackageName, tmpl: '' }));
+    }
+    return (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(projectRoot, 'package.json'))?.name;
+}
+async function createCliPackage(host, options, pluginPackageName) {
+    await (0, js_1.libraryGenerator)(host, {
+        ...options,
+        rootProject: false,
+        config: 'project',
+        publishable: true,
+        bundler: options.bundler,
+        importPath: options.name,
+        skipFormat: true,
+        skipTsConfig: true,
+    });
+    host.delete((0, devkit_1.joinPathFragments)(options.projectRoot, 'src'));
+    // Add the bin entry to the package.json
+    (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), (packageJson) => {
+        packageJson.bin = {
+            [options.name]: './bin/index.js',
+        };
+        packageJson.dependencies = {
+            'create-nx-workspace': versions_1.nxVersion,
+        };
+        return packageJson;
+    });
+    // update project build target to use the bin entry
+    const projectConfiguration = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
+    projectConfiguration.sourceRoot = (0, devkit_1.joinPathFragments)(options.projectRoot, 'bin');
+    projectConfiguration.targets.build.options.main = (0, devkit_1.joinPathFragments)(options.projectRoot, 'bin/index.ts');
+    projectConfiguration.targets.build.options.updateBuildableProjectDepsInPackageJson =
+        false;
+    projectConfiguration.implicitDependencies = [options.project];
+    (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfiguration);
+    // Add bin files to tsconfg.lib.json
+    (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'), (tsConfig) => {
+        tsConfig.include.push('bin/**/*.ts');
+        return tsConfig;
+    });
+    (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/create-framework-package'), options.projectRoot, {
+        ...options,
+        preset: pluginPackageName,
+        tmpl: '',
     });
 }
 /**

package/src/generators/create-package/utils/normalize-schema.js

@@ -1,21 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeSchema = void 0;
-const tslib_1 = require("tslib");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
-function normalizeSchema(host, schema) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { projectName, names: projectNames, projectRoot, projectNameAndRootFormat, } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
-            name: schema.name,
-            projectType: 'library',
-            directory: schema.directory,
-            projectNameAndRootFormat: schema.projectNameAndRootFormat,
-            callingGenerator: '@nx/plugin:create-package',
-        });
-        schema.projectNameAndRootFormat = projectNameAndRootFormat;
-        return Object.assign(Object.assign({}, schema), { bundler: (_a = schema.compiler) !== null && _a !== void 0 ? _a : 'tsc', projectName,
-            projectRoot, name: projectNames.projectSimpleName });
+async function normalizeSchema(host, schema) {
+    const { projectName, names: projectNames, projectRoot, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+        name: schema.name,
+        projectType: 'library',
+        directory: schema.directory,
+        projectNameAndRootFormat: schema.projectNameAndRootFormat,
+        callingGenerator: '@nx/plugin:create-package',
     });
+    schema.projectNameAndRootFormat = projectNameAndRootFormat;
+    return {
+        ...schema,
+        bundler: schema.compiler ?? 'tsc',
+        projectName,
+        projectRoot,
+        name: projectNames.projectSimpleName,
+    };
 }
 exports.normalizeSchema = normalizeSchema;

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.e2eProjectSchematic = exports.e2eProjectGeneratorInternal = exports.e2eProjectGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const jest_1 = require("@nx/jest");
@@ -10,119 +9,132 @@ const generator_1 = require("@nx/js/src/generators/setup-verdaccio/generator");
 const add_local_registry_scripts_1 = require("@nx/js/src/utils/add-local-registry-scripts");
 const linter_1 = require("@nx/linter");
 const path_1 = require("path");
-function normalizeOptions(host, options) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projectName = options.rootProject ? 'e2e' : `${options.pluginName}-e2e`;
-        let projectRoot;
-        if (options.projectNameAndRootFormat === 'as-provided') {
-            const projectNameAndRootOptions = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
-                name: projectName,
-                projectType: 'application',
-                directory: options.rootProject || !options.projectDirectory
-                    ? projectName
-                    : `${options.projectDirectory}-e2e`,
-                projectNameAndRootFormat: `as-provided`,
-                callingGenerator: '@nx/plugin:e2e-project',
-            });
-            projectRoot = projectNameAndRootOptions.projectRoot;
-        }
-        else {
-            const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.projectDirectory);
-            const { appsDir: defaultAppsDir } = (0, devkit_1.getWorkspaceLayout)(host);
-            const appsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : defaultAppsDir;
-            projectRoot = options.rootProject
+async function normalizeOptions(host, options) {
+    const projectName = options.rootProject ? 'e2e' : `${options.pluginName}-e2e`;
+    let projectRoot;
+    if (options.projectNameAndRootFormat === 'as-provided') {
+        const projectNameAndRootOptions = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+            name: projectName,
+            projectType: 'application',
+            directory: options.rootProject || !options.projectDirectory
                 ? projectName
-                : 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), { projectName, linter: (_a = options.linter) !== null && _a !== void 0 ? _a : linter_1.Linter.EsLint, pluginPropertyName,
-            projectRoot });
-    });
+                : `${options.projectDirectory}-e2e`,
+            projectNameAndRootFormat: `as-provided`,
+            callingGenerator: '@nx/plugin:e2e-project',
+        });
+        projectRoot = projectNameAndRootOptions.projectRoot;
+    }
+    else {
+        const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.projectDirectory);
+        const { appsDir: defaultAppsDir } = (0, devkit_1.getWorkspaceLayout)(host);
+        const appsDir = layoutDirectory ?? defaultAppsDir;
+        projectRoot = options.rootProject
+            ? projectName
+            : projectDirectory
+                ? (0, devkit_1.joinPathFragments)(appsDir, `${projectDirectory}-e2e`)
+                : (0, devkit_1.joinPathFragments)(appsDir, projectName);
+    }
+    const pluginPropertyName = (0, devkit_1.names)(options.pluginName).propertyName;
+    return {
+        ...options,
+        projectName,
+        linter: options.linter ?? linter_1.Linter.EsLint,
+        pluginPropertyName,
+        projectRoot,
+    };
 }
 function validatePlugin(host, pluginName) {
     try {
         (0, devkit_1.readProjectConfiguration)(host, pluginName);
     }
-    catch (_a) {
+    catch {
         throw new Error(`Project name "${pluginName}" doesn't not exist.`);
     }
 }
 function addFiles(host, options) {
     const projectConfiguration = (0, devkit_1.readProjectConfiguration)(host, options.pluginName);
     const { name: pluginPackageName } = (0, devkit_1.readJson)(host, (0, path_1.join)(projectConfiguration.root, 'package.json'));
-    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, './files'), options.projectRoot, Object.assign(Object.assign({}, options), { tmpl: '', rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot), packageManagerCommands: (0, devkit_1.getPackageManagerCommand)('npm'), pluginPackageName }));
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, './files'), options.projectRoot, {
+        ...options,
+        tmpl: '',
+        rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot),
+        packageManagerCommands: (0, devkit_1.getPackageManagerCommand)('npm'),
+        pluginPackageName,
+    });
 }
-function addJest(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, devkit_1.addProjectConfiguration)(host, options.projectName, {
-            root: options.projectRoot,
-            projectType: 'application',
-            sourceRoot: `${options.projectRoot}/tests`,
-            targets: {},
-            implicitDependencies: [options.pluginName],
-        });
-        const jestTask = yield (0, jest_1.configurationGenerator)(host, {
-            project: options.projectName,
-            setupFile: 'none',
-            supportTsx: false,
-            skipSerializers: true,
-            skipFormat: true,
-        });
-        const { startLocalRegistryPath, stopLocalRegistryPath } = (0, add_local_registry_scripts_1.addLocalRegistryScripts)(host);
-        (0, jest_1.addPropertyToJestConfig)(host, (0, path_1.join)(options.projectRoot, 'jest.config.ts'), 'globalSetup', (0, path_1.join)((0, devkit_1.offsetFromRoot)(options.projectRoot), startLocalRegistryPath));
-        (0, jest_1.addPropertyToJestConfig)(host, (0, path_1.join)(options.projectRoot, 'jest.config.ts'), 'globalTeardown', (0, path_1.join)((0, devkit_1.offsetFromRoot)(options.projectRoot), stopLocalRegistryPath));
-        const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
-        const testTarget = project.targets.test;
-        project.targets.e2e = Object.assign(Object.assign({}, testTarget), { dependsOn: [`^build`], options: Object.assign(Object.assign({}, testTarget.options), { runInBand: true }), configurations: testTarget.configurations });
-        // remove the jest build target
-        delete project.targets.test;
-        (0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);
-        return jestTask;
+async function addJest(host, options) {
+    (0, devkit_1.addProjectConfiguration)(host, options.projectName, {
+        root: options.projectRoot,
+        projectType: 'application',
+        sourceRoot: `${options.projectRoot}/tests`,
+        targets: {},
+        implicitDependencies: [options.pluginName],
     });
+    const jestTask = await (0, jest_1.configurationGenerator)(host, {
+        project: options.projectName,
+        setupFile: 'none',
+        supportTsx: false,
+        skipSerializers: true,
+        skipFormat: true,
+    });
+    const { startLocalRegistryPath, stopLocalRegistryPath } = (0, add_local_registry_scripts_1.addLocalRegistryScripts)(host);
+    (0, jest_1.addPropertyToJestConfig)(host, (0, path_1.join)(options.projectRoot, 'jest.config.ts'), 'globalSetup', (0, path_1.join)((0, devkit_1.offsetFromRoot)(options.projectRoot), startLocalRegistryPath));
+    (0, jest_1.addPropertyToJestConfig)(host, (0, path_1.join)(options.projectRoot, 'jest.config.ts'), 'globalTeardown', (0, path_1.join)((0, devkit_1.offsetFromRoot)(options.projectRoot), stopLocalRegistryPath));
+    const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
+    const testTarget = project.targets.test;
+    project.targets.e2e = {
+        ...testTarget,
+        dependsOn: [`^build`],
+        options: {
+            ...testTarget.options,
+            runInBand: true,
+        },
+        configurations: testTarget.configurations,
+    };
+    // remove the jest build target
+    delete project.targets.test;
+    (0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);
+    return jestTask;
 }
-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;
+async function addLintingToApplication(tree, options) {
+    const lintTask = await (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* () {
-        return yield e2eProjectGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+async function e2eProjectGenerator(host, schema) {
+    return await e2eProjectGeneratorInternal(host, {
+        projectNameAndRootFormat: 'derived',
+        ...schema,
     });
 }
 exports.e2eProjectGenerator = e2eProjectGenerator;
-function e2eProjectGeneratorInternal(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const tasks = [];
-        validatePlugin(host, schema.pluginName);
-        const options = yield normalizeOptions(host, schema);
-        addFiles(host, options);
-        tasks.push(yield (0, generator_1.setupVerdaccio)(host, {
-            skipFormat: true,
+async function e2eProjectGeneratorInternal(host, schema) {
+    const tasks = [];
+    validatePlugin(host, schema.pluginName);
+    const options = await normalizeOptions(host, schema);
+    addFiles(host, options);
+    tasks.push(await (0, generator_1.setupVerdaccio)(host, {
+        skipFormat: true,
+    }));
+    tasks.push(await addJest(host, options));
+    if (options.linter !== linter_1.Linter.None) {
+        tasks.push(await addLintingToApplication(host, {
+            ...options,
         }));
-        tasks.push(yield addJest(host, options));
-        if (options.linter !== linter_1.Linter.None) {
-            tasks.push(yield addLintingToApplication(host, Object.assign({}, options)));
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.e2eProjectGeneratorInternal = e2eProjectGeneratorInternal;
 exports.default = e2eProjectGenerator;