@nx/next 16.8.0-beta.4 → 16.8.0-beta.6

package/src/executors/export/export.impl.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const export_1 = require("next/dist/export");
 const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
@@ -22,37 +21,35 @@ const pmCmd = (0, os_1.platform)() === 'win32' ? `npx.cmd` : 'npx';
 };
  * Read https://nextjs.org/docs/pages/building-your-application/deploying/static-exports
  **/
-function exportExecutor(options, context) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let dependencies = [];
-        if (!options.buildLibsFromSource) {
-            const result = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, 'build', // this should be generalized
-            context.configurationName);
-            dependencies = result.dependencies;
-        }
-        const buildTarget = (0, devkit_1.parseTargetString)(options.buildTarget, context.projectGraph);
-        try {
-            const args = getBuildTargetCommand(options);
-            (0, child_process_1.execFileSync)(pmCmd, args, {
-                stdio: [0, 1, 2],
-            });
-        }
-        catch (_a) {
-            throw new Error(`Build target failed: ${chalk.bold(options.buildTarget)}`);
-        }
-        const buildOptions = (0, devkit_1.readTargetOptions)(buildTarget, context);
-        const projectRoot = context.projectGraph.nodes[context.projectName].data.root;
-        // Taken from:
-        // https://github.com/vercel/next.js/blob/ead56eaab68409e96c19f7d9139747bac1197aa9/packages/next/cli/next-export.ts#L13
-        const nextExportCliSpan = nextTrace.trace('next-export-cli');
-        yield (0, export_1.default)(projectRoot, {
-            statusMessage: 'Exporting',
-            silent: options.silent,
-            threads: options.threads,
-            outdir: `${buildOptions.outputPath}/exported`,
-        }, nextExportCliSpan);
-        return { success: true };
-    });
+async function exportExecutor(options, context) {
+    let dependencies = [];
+    if (!options.buildLibsFromSource) {
+        const result = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, 'build', // this should be generalized
+        context.configurationName);
+        dependencies = result.dependencies;
+    }
+    const buildTarget = (0, devkit_1.parseTargetString)(options.buildTarget, context.projectGraph);
+    try {
+        const args = getBuildTargetCommand(options);
+        (0, child_process_1.execFileSync)(pmCmd, args, {
+            stdio: [0, 1, 2],
+        });
+    }
+    catch {
+        throw new Error(`Build target failed: ${chalk.bold(options.buildTarget)}`);
+    }
+    const buildOptions = (0, devkit_1.readTargetOptions)(buildTarget, context);
+    const projectRoot = context.projectGraph.nodes[context.projectName].data.root;
+    // Taken from:
+    // https://github.com/vercel/next.js/blob/ead56eaab68409e96c19f7d9139747bac1197aa9/packages/next/cli/next-export.ts#L13
+    const nextExportCliSpan = nextTrace.trace('next-export-cli');
+    await (0, export_1.default)(projectRoot, {
+        statusMessage: 'Exporting',
+        silent: options.silent,
+        threads: options.threads,
+        outdir: `${buildOptions.outputPath}/exported`,
+    }, nextExportCliSpan);
+    return { success: true };
 }
 exports.default = exportExecutor;
 function getBuildTargetCommand(options) {

package/src/executors/server/custom-server.impl.js

@@ -1,53 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-function serveExecutor(options, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* serveExecutor_1() {
-        // Cast to any to overwrite NODE_ENV
-        process.env.NODE_ENV = process.env.NODE_ENV
-            ? process.env.NODE_ENV
-            : options.dev
-                ? 'development'
-                : 'production';
-        // Setting port that the custom server should use.
-        process.env.PORT = options.port;
-        const projectRoot = context.projectGraph.nodes[context.projectName].data.root;
-        yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(runCustomServer(projectRoot, options, context))));
-    });
+async function* serveExecutor(options, context) {
+    // Cast to any to overwrite NODE_ENV
+    process.env.NODE_ENV = process.env.NODE_ENV
+        ? process.env.NODE_ENV
+        : options.dev
+            ? 'development'
+            : 'production';
+    // Setting port that the custom server should use.
+    process.env.PORT = options.port;
+    const projectRoot = context.projectGraph.nodes[context.projectName].data.root;
+    yield* runCustomServer(projectRoot, options, context);
 }
 exports.default = serveExecutor;
-function runCustomServer(root, options, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* runCustomServer_1() {
-        var _a, e_1, _b, _c;
-        process.env.NX_NEXT_DIR = root;
-        process.env.NX_NEXT_PUBLIC_DIR = (0, path_1.join)(root, 'public');
-        const baseUrl = `http://${options.hostname || 'localhost'}:${options.port}`;
-        const customServerBuild = yield tslib_1.__await((0, devkit_1.runExecutor)((0, devkit_1.parseTargetString)(options.customServerTarget, context.projectGraph), {
-            watch: options.dev ? true : false,
-        }, context));
-        try {
-            for (var _d = true, customServerBuild_1 = tslib_1.__asyncValues(customServerBuild), customServerBuild_1_1; customServerBuild_1_1 = yield tslib_1.__await(customServerBuild_1.next()), _a = customServerBuild_1_1.done, !_a; _d = true) {
-                _c = customServerBuild_1_1.value;
-                _d = false;
-                const result = _c;
-                if (!result.success) {
-                    return yield tslib_1.__await(result);
-                }
-                yield yield tslib_1.__await({
-                    success: true,
-                    baseUrl,
-                });
-            }
+async function* runCustomServer(root, options, context) {
+    process.env.NX_NEXT_DIR = root;
+    process.env.NX_NEXT_PUBLIC_DIR = (0, path_1.join)(root, 'public');
+    const baseUrl = `http://${options.hostname || 'localhost'}:${options.port}`;
+    const customServerBuild = await (0, devkit_1.runExecutor)((0, devkit_1.parseTargetString)(options.customServerTarget, context.projectGraph), {
+        watch: options.dev ? true : false,
+    }, context);
+    for await (const result of customServerBuild) {
+        if (!result.success) {
+            return result;
         }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (!_d && !_a && (_b = customServerBuild_1.return)) yield tslib_1.__await(_b.call(customServerBuild_1));
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-        return yield tslib_1.__await({ success: true });
-    });
+        yield {
+            success: true,
+            baseUrl,
+        };
+    }
+    return { success: true };
 }

package/src/executors/server/server.impl.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const child_process_1 = require("child_process");
@@ -8,61 +7,58 @@ const custom_server_impl_1 = require("./custom-server.impl");
 const create_cli_options_1 = require("../../utils/create-cli-options");
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
-function serveExecutor(options, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* serveExecutor_1() {
-        if (options.customServerTarget) {
-            return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, custom_server_impl_1.default)(options, context)))));
-        }
-        const buildOptions = (0, devkit_1.readTargetOptions)((0, devkit_1.parseTargetString)(options.buildTarget, context.projectGraph), context);
-        const projectRoot = context.workspace.projects[context.projectName].root;
-        const { port, keepAliveTimeout, hostname } = options;
-        // This is required for the default custom server to work. See the @nx/next:app generator.
-        process.env.NX_NEXT_DIR = projectRoot;
-        // Cast to any to overwrite NODE_ENV
-        process.env.NODE_ENV = process.env.NODE_ENV
-            ? process.env.NODE_ENV
-            : options.dev
-                ? 'development'
-                : 'production';
-        // Setting port that the custom server should use.
-        process.env.PORT = `${options.port}`;
-        const args = (0, create_cli_options_1.createCliOptions)({ port, hostname });
-        if (keepAliveTimeout && !options.dev) {
-            args.push(`--keepAliveTimeout=${keepAliveTimeout}`);
-        }
-        const nextDir = (0, path_1.resolve)(context.root, buildOptions.outputPath);
-        const mode = options.dev ? 'dev' : 'start';
-        const turbo = options.turbo && options.dev ? '--turbo' : '';
-        const nextBin = require.resolve('next/dist/bin/next');
-        yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, async_iterable_1.createAsyncIterable)(({ done, next, error }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const server = (0, child_process_1.fork)(nextBin, [mode, ...args, turbo], {
-                cwd: options.dev ? projectRoot : nextDir,
-                stdio: 'inherit',
-            });
-            server.once('exit', (code) => {
-                if (code === 0) {
-                    done();
-                }
-                else {
-                    error(new Error(`Next.js app exited with code ${code}`));
-                }
-            });
-            const killServer = () => {
-                if (server.connected) {
-                    server.kill('SIGTERM');
-                }
-            };
-            process.on('exit', () => killServer());
-            process.on('SIGINT', () => killServer());
-            process.on('SIGTERM', () => killServer());
-            process.on('SIGHUP', () => killServer());
-            yield (0, wait_for_port_open_1.waitForPortOpen)(port, { host: options.hostname });
-            next({
-                success: true,
-                baseUrl: `http://${(_a = options.hostname) !== null && _a !== void 0 ? _a : 'localhost'}:${port}`,
-            });
-        })))));
+async function* serveExecutor(options, context) {
+    if (options.customServerTarget) {
+        return yield* (0, custom_server_impl_1.default)(options, context);
+    }
+    const buildOptions = (0, devkit_1.readTargetOptions)((0, devkit_1.parseTargetString)(options.buildTarget, context.projectGraph), context);
+    const projectRoot = context.workspace.projects[context.projectName].root;
+    const { port, keepAliveTimeout, hostname } = options;
+    // This is required for the default custom server to work. See the @nx/next:app generator.
+    process.env.NX_NEXT_DIR = projectRoot;
+    // Cast to any to overwrite NODE_ENV
+    process.env.NODE_ENV = process.env.NODE_ENV
+        ? process.env.NODE_ENV
+        : options.dev
+            ? 'development'
+            : 'production';
+    // Setting port that the custom server should use.
+    process.env.PORT = `${options.port}`;
+    const args = (0, create_cli_options_1.createCliOptions)({ port, hostname });
+    if (keepAliveTimeout && !options.dev) {
+        args.push(`--keepAliveTimeout=${keepAliveTimeout}`);
+    }
+    const nextDir = (0, path_1.resolve)(context.root, buildOptions.outputPath);
+    const mode = options.dev ? 'dev' : 'start';
+    const turbo = options.turbo && options.dev ? '--turbo' : '';
+    const nextBin = require.resolve('next/dist/bin/next');
+    yield* (0, async_iterable_1.createAsyncIterable)(async ({ done, next, error }) => {
+        const server = (0, child_process_1.fork)(nextBin, [mode, ...args, turbo], {
+            cwd: options.dev ? projectRoot : nextDir,
+            stdio: 'inherit',
+        });
+        server.once('exit', (code) => {
+            if (code === 0) {
+                done();
+            }
+            else {
+                error(new Error(`Next.js app exited with code ${code}`));
+            }
+        });
+        const killServer = () => {
+            if (server.connected) {
+                server.kill('SIGTERM');
+            }
+        };
+        process.on('exit', () => killServer());
+        process.on('SIGINT', () => killServer());
+        process.on('SIGTERM', () => killServer());
+        process.on('SIGHUP', () => killServer());
+        await (0, wait_for_port_open_1.waitForPortOpen)(port, { host: options.hostname });
+        next({
+            success: true,
+            baseUrl: `http://${options.hostname ?? 'localhost'}:${port}`,
+        });
     });
 }
 exports.default = serveExecutor;

package/src/generators/application/application.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationSchematic = exports.applicationGeneratorInternal = exports.applicationGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const normalize_options_1 = require("./lib/normalize-options");
 const add_e2e_1 = require("./lib/add-e2e");
@@ -16,46 +15,48 @@ const add_linting_1 = require("./lib/add-linting");
 const custom_server_1 = require("../custom-server/custom-server");
 const update_cypress_tsconfig_1 = require("./lib/update-cypress-tsconfig");
 const show_possible_warnings_1 = require("./lib/show-possible-warnings");
-function applicationGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield applicationGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+async function applicationGenerator(host, schema) {
+    return await applicationGeneratorInternal(host, {
+        projectNameAndRootFormat: 'derived',
+        ...schema,
     });
 }
 exports.applicationGenerator = applicationGenerator;
-function applicationGeneratorInternal(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const tasks = [];
-        const options = yield (0, normalize_options_1.normalizeOptions)(host, schema);
-        (0, show_possible_warnings_1.showPossibleWarnings)(host, options);
-        const nextTask = yield (0, init_1.nextInitGenerator)(host, Object.assign(Object.assign({}, options), { skipFormat: true }));
-        tasks.push(nextTask);
-        (0, create_application_files_1.createApplicationFiles)(host, options);
-        (0, add_project_1.addProject)(host, options);
-        const e2eTask = yield (0, add_e2e_1.addE2e)(host, options);
-        tasks.push(e2eTask);
-        const jestTask = yield (0, add_jest_1.addJest)(host, options);
-        tasks.push(jestTask);
-        const lintTask = yield (0, add_linting_1.addLinting)(host, options);
-        tasks.push(lintTask);
-        const styledTask = (0, styles_1.addStyleDependencies)(host, {
-            style: options.style,
-            swc: !host.exists((0, devkit_1.joinPathFragments)(options.appProjectRoot, '.babelrc')),
-        });
-        tasks.push(styledTask);
-        (0, update_jest_config_1.updateJestConfig)(host, options);
-        (0, update_cypress_tsconfig_1.updateCypressTsConfig)(host, options);
-        (0, set_defaults_1.setDefaults)(host, options);
-        if (options.customServer) {
-            yield (0, custom_server_1.customServerGenerator)(host, {
-                project: options.projectName,
-                compiler: options.swc ? 'swc' : 'tsc',
-            });
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
+async function applicationGeneratorInternal(host, schema) {
+    const tasks = [];
+    const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
+    (0, show_possible_warnings_1.showPossibleWarnings)(host, options);
+    const nextTask = await (0, init_1.nextInitGenerator)(host, {
+        ...options,
+        skipFormat: true,
+    });
+    tasks.push(nextTask);
+    (0, create_application_files_1.createApplicationFiles)(host, options);
+    (0, add_project_1.addProject)(host, options);
+    const e2eTask = await (0, add_e2e_1.addE2e)(host, options);
+    tasks.push(e2eTask);
+    const jestTask = await (0, add_jest_1.addJest)(host, options);
+    tasks.push(jestTask);
+    const lintTask = await (0, add_linting_1.addLinting)(host, options);
+    tasks.push(lintTask);
+    const styledTask = (0, styles_1.addStyleDependencies)(host, {
+        style: options.style,
+        swc: !host.exists((0, devkit_1.joinPathFragments)(options.appProjectRoot, '.babelrc')),
     });
+    tasks.push(styledTask);
+    (0, update_jest_config_1.updateJestConfig)(host, options);
+    (0, update_cypress_tsconfig_1.updateCypressTsConfig)(host, options);
+    (0, set_defaults_1.setDefaults)(host, options);
+    if (options.customServer) {
+        await (0, custom_server_1.customServerGenerator)(host, {
+            project: options.projectName,
+            compiler: options.swc ? 'swc' : 'tsc',
+        });
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.applicationGeneratorInternal = applicationGeneratorInternal;
 exports.applicationSchematic = (0, devkit_1.convertNxGenerator)(applicationGenerator);

package/src/generators/application/lib/add-e2e.js

@@ -1,39 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const linter_1 = require("@nx/linter");
 const versions_1 = require("../../../utils/versions");
-function addE2e(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (options.e2eTestRunner === 'cypress') {
-            const { cypressProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-            return cypressProjectGenerator(host, Object.assign(Object.assign({}, options), { linter: linter_1.Linter.EsLint, name: options.e2eProjectName, directory: options.e2eProjectRoot, 
-                // the name and root are already normalized, instruct the generator to use them as is
-                projectNameAndRootFormat: 'as-provided', project: options.projectName, skipFormat: true }));
-        }
-        else if (options.e2eTestRunner === 'playwright') {
-            const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
-            (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
-                root: options.e2eProjectRoot,
-                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
-                targets: {},
-                implicitDependencies: [options.projectName],
-            });
-            return configurationGenerator(host, {
-                project: options.e2eProjectName,
-                skipFormat: true,
-                skipPackageJson: options.skipPackageJson,
-                directory: 'src',
-                js: false,
-                linter: options.linter,
-                setParserOptionsProject: options.setParserOptionsProject,
-                webServerAddress: 'http://127.0.0.1:4200',
-                webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.projectName}`,
-            });
-        }
-        return () => { };
-    });
+async function addE2e(host, options) {
+    if (options.e2eTestRunner === 'cypress') {
+        const { cypressProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+        return cypressProjectGenerator(host, {
+            ...options,
+            linter: linter_1.Linter.EsLint,
+            name: options.e2eProjectName,
+            directory: options.e2eProjectRoot,
+            // the name and root are already normalized, instruct the generator to use them as is
+            projectNameAndRootFormat: 'as-provided',
+            project: options.projectName,
+            skipFormat: true,
+        });
+    }
+    else if (options.e2eTestRunner === 'playwright') {
+        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
+        (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
+            root: options.e2eProjectRoot,
+            sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+            targets: {},
+            implicitDependencies: [options.projectName],
+        });
+        return configurationGenerator(host, {
+            project: options.e2eProjectName,
+            skipFormat: true,
+            skipPackageJson: options.skipPackageJson,
+            directory: 'src',
+            js: false,
+            linter: options.linter,
+            setParserOptionsProject: options.setParserOptionsProject,
+            webServerAddress: 'http://127.0.0.1:4200',
+            webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.projectName}`,
+        });
+    }
+    return () => { };
 }
 exports.addE2e = addE2e;

package/src/generators/application/lib/add-jest.js

@@ -1,35 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addJest = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
-function addJest(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (options.unitTestRunner !== 'jest') {
-            return () => { };
+async function addJest(host, options) {
+    if (options.unitTestRunner !== 'jest') {
+        return () => { };
+    }
+    const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
+    const jestTask = await configurationGenerator(host, {
+        ...options,
+        project: options.projectName,
+        supportTsx: true,
+        skipSerializers: true,
+        setupFile: 'none',
+        compiler: 'babel',
+        skipFormat: true,
+    });
+    const tsConfigSpecJson = (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.spec.json'));
+    (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json'), (json) => {
+        json.compilerOptions ??= {};
+        json.compilerOptions.types ??= [];
+        json.compilerOptions.types.push(...(tsConfigSpecJson?.compilerOptions?.types ?? []));
+        return json;
+    });
+    (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.spec.json'), (json) => {
+        json.compilerOptions.jsx = 'react';
+        // have to override exclude otherwise lint will fail with setParserOptionsProject and jest.config.ts
+        if (options.setParserOptionsProject) {
+            const tsConfig = (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json'));
+            json.exclude = tsConfig.exclude.filter((e) => e !== 'jest.config.ts');
         }
-        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
-        const jestTask = yield configurationGenerator(host, Object.assign(Object.assign({}, options), { project: options.projectName, supportTsx: true, skipSerializers: true, setupFile: 'none', compiler: 'babel', skipFormat: true }));
-        const tsConfigSpecJson = (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.spec.json'));
-        (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json'), (json) => {
-            var _a, _b, _c, _d;
-            var _e;
-            (_a = json.compilerOptions) !== null && _a !== void 0 ? _a : (json.compilerOptions = {});
-            (_b = (_e = json.compilerOptions).types) !== null && _b !== void 0 ? _b : (_e.types = []);
-            json.compilerOptions.types.push(...((_d = (_c = tsConfigSpecJson === null || tsConfigSpecJson === void 0 ? void 0 : tsConfigSpecJson.compilerOptions) === null || _c === void 0 ? void 0 : _c.types) !== null && _d !== void 0 ? _d : []));
-            return json;
-        });
-        (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.spec.json'), (json) => {
-            json.compilerOptions.jsx = 'react';
-            // have to override exclude otherwise lint will fail with setParserOptionsProject and jest.config.ts
-            if (options.setParserOptionsProject) {
-                const tsConfig = (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json'));
-                json.exclude = tsConfig.exclude.filter((e) => e !== 'jest.config.ts');
-            }
-            return json;
-        });
-        return jestTask;
+        return json;
     });
+    return jestTask;
 }
 exports.addJest = addJest;

package/src/generators/application/lib/add-linting.js

@@ -1,59 +1,62 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLinting = void 0;
-const tslib_1 = require("tslib");
 const linter_1 = require("@nx/linter");
 const devkit_1 = require("@nx/devkit");
 const lint_1 = require("@nx/react/src/utils/lint");
 const eslint_file_1 = require("@nx/linter/src/generators/utils/eslint-file");
-function addLinting(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const lintTask = yield (0, linter_1.lintProjectGenerator)(host, {
-            linter: options.linter,
-            project: options.projectName,
-            tsConfigPaths: [
-                (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
-            ],
-            unitTestRunner: options.unitTestRunner,
-            eslintFilePatterns: [`${options.appProjectRoot}/**/*.{ts,tsx,js,jsx}`],
-            skipFormat: true,
-            rootProject: options.rootProject,
-        });
-        if (options.linter === linter_1.Linter.EsLint && (0, eslint_file_1.isEslintConfigSupported)(host)) {
-            (0, eslint_file_1.addExtendsToLintConfig)(host, options.appProjectRoot, [
-                'plugin:@nx/react-typescript',
-                'next',
-                'next/core-web-vitals',
-            ]);
-            // Turn off @next/next/no-html-link-for-pages since there is an issue with nextjs throwing linting errors
-            // TODO(nicholas): remove after Vercel updates nextjs linter to only lint ["*.ts", "*.tsx", "*.js", "*.jsx"]
+async function addLinting(host, options) {
+    const lintTask = await (0, linter_1.lintProjectGenerator)(host, {
+        linter: options.linter,
+        project: options.projectName,
+        tsConfigPaths: [
+            (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
+        ],
+        unitTestRunner: options.unitTestRunner,
+        eslintFilePatterns: [`${options.appProjectRoot}/**/*.{ts,tsx,js,jsx}`],
+        skipFormat: true,
+        rootProject: options.rootProject,
+    });
+    if (options.linter === linter_1.Linter.EsLint && (0, eslint_file_1.isEslintConfigSupported)(host)) {
+        (0, eslint_file_1.addExtendsToLintConfig)(host, options.appProjectRoot, [
+            'plugin:@nx/react-typescript',
+            'next',
+            'next/core-web-vitals',
+        ]);
+        // Turn off @next/next/no-html-link-for-pages since there is an issue with nextjs throwing linting errors
+        // TODO(nicholas): remove after Vercel updates nextjs linter to only lint ["*.ts", "*.tsx", "*.js", "*.jsx"]
+        (0, eslint_file_1.addOverrideToLintConfig)(host, options.appProjectRoot, {
+            files: ['*.*'],
+            rules: {
+                '@next/next/no-html-link-for-pages': 'off',
+            },
+        }, { insertAtTheEnd: false });
+        (0, eslint_file_1.updateOverrideInLintConfig)(host, options.appProjectRoot, (o) => Array.isArray(o.files) &&
+            o.files.some((f) => f.match(/\*\.ts$/)) &&
+            o.files.some((f) => f.match(/\*\.tsx$/)) &&
+            o.files.some((f) => f.match(/\*\.js$/)) &&
+            o.files.some((f) => f.match(/\*\.jsx$/)), (o) => ({
+            ...o,
+            rules: {
+                ...o.rules,
+                '@next/next/no-html-link-for-pages': [
+                    'error',
+                    `${options.appProjectRoot}/pages`,
+                ],
+            },
+        }));
+        // add jest specific config
+        if (options.unitTestRunner === 'jest') {
             (0, eslint_file_1.addOverrideToLintConfig)(host, options.appProjectRoot, {
-                files: ['*.*'],
-                rules: {
-                    '@next/next/no-html-link-for-pages': 'off',
+                files: ['*.spec.ts', '*.spec.tsx', '*.spec.js', '*.spec.jsx'],
+                env: {
+                    jest: true,
                 },
-            }, { insertAtTheEnd: false });
-            (0, eslint_file_1.updateOverrideInLintConfig)(host, options.appProjectRoot, (o) => Array.isArray(o.files) &&
-                o.files.some((f) => f.match(/\*\.ts$/)) &&
-                o.files.some((f) => f.match(/\*\.tsx$/)) &&
-                o.files.some((f) => f.match(/\*\.js$/)) &&
-                o.files.some((f) => f.match(/\*\.jsx$/)), (o) => (Object.assign(Object.assign({}, o), { rules: Object.assign(Object.assign({}, o.rules), { '@next/next/no-html-link-for-pages': [
-                        'error',
-                        `${options.appProjectRoot}/pages`,
-                    ] }) })));
-            // add jest specific config
-            if (options.unitTestRunner === 'jest') {
-                (0, eslint_file_1.addOverrideToLintConfig)(host, options.appProjectRoot, {
-                    files: ['*.spec.ts', '*.spec.tsx', '*.spec.js', '*.spec.jsx'],
-                    env: {
-                        jest: true,
-                    },
-                });
-            }
-            (0, eslint_file_1.addIgnoresToLintConfig)(host, options.appProjectRoot, ['.next/**/*']);
+            });
         }
-        const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
-        return (0, devkit_1.runTasksInSerial)(lintTask, installTask);
-    });
+        (0, eslint_file_1.addIgnoresToLintConfig)(host, options.appProjectRoot, ['.next/**/*']);
+    }
+    const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
+    return (0, devkit_1.runTasksInSerial)(lintTask, installTask);
 }
 exports.addLinting = addLinting;