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

package/src/generators/library/lib/normalize-options.js

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = 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 normalizeOptions(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { projectRoot, importPath, projectNameAndRootFormat } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
-            name: options.name,
-            projectType: 'library',
-            directory: options.directory,
-            importPath: options.importPath,
-            projectNameAndRootFormat: options.projectNameAndRootFormat,
-            callingGenerator: '@nx/next:library',
-        });
-        options.projectNameAndRootFormat = projectNameAndRootFormat;
-        return Object.assign(Object.assign({}, options), { importPath,
-            projectRoot });
+async function normalizeOptions(host, options) {
+    const { projectRoot, importPath, projectNameAndRootFormat } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+        name: options.name,
+        projectType: 'library',
+        directory: options.directory,
+        importPath: options.importPath,
+        projectNameAndRootFormat: options.projectNameAndRootFormat,
+        callingGenerator: '@nx/next:library',
     });
+    options.projectNameAndRootFormat = projectNameAndRootFormat;
+    return {
+        ...options,
+        importPath,
+        projectRoot,
+    };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/library/library.js

@@ -1,68 +1,73 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.librarySchematic = exports.libraryGeneratorInternal = exports.libraryGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const library_1 = require("@nx/react/src/generators/library/library");
 const js_1 = require("@nx/js");
 const init_1 = require("../init/init");
 const normalize_options_1 = require("./lib/normalize-options");
-function libraryGenerator(host, rawOptions) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield libraryGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, rawOptions));
+async function libraryGenerator(host, rawOptions) {
+    return await libraryGeneratorInternal(host, {
+        projectNameAndRootFormat: 'derived',
+        ...rawOptions,
     });
 }
 exports.libraryGenerator = libraryGenerator;
-function libraryGeneratorInternal(host, rawOptions) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = yield (0, normalize_options_1.normalizeOptions)(host, rawOptions);
-        const tasks = [];
-        const initTask = yield (0, init_1.nextInitGenerator)(host, Object.assign(Object.assign({}, options), { skipFormat: true }));
-        tasks.push(initTask);
-        const libTask = yield (0, library_1.libraryGenerator)(host, Object.assign(Object.assign({}, options), { compiler: 'swc', skipFormat: true }));
-        tasks.push(libTask);
-        const indexPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src', `index.${options.js ? 'js' : 'ts'}`);
-        const indexContent = host.read(indexPath, 'utf-8');
-        host.write(indexPath, `// Use this file to export React client components (e.g. those with 'use client' directive) or other non-server utilities\n${indexContent}`);
-        // Additional entry for Next.js libraries so React Server Components are exported from a separate entry point.
-        // This is needed because RSC exported from `src/index.ts` will mark the entire file as server-only and throw an error when used from a client component.
-        // See: https://github.com/nrwl/nx/issues/15830
-        const serverEntryPath = (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'server.' + (options.js ? 'js' : 'ts'));
-        host.write((0, devkit_1.joinPathFragments)(options.projectRoot, 'src', `server.${options.js ? 'js' : 'ts'}`), `// Use this file to export React server components
+async function libraryGeneratorInternal(host, rawOptions) {
+    const options = await (0, normalize_options_1.normalizeOptions)(host, rawOptions);
+    const tasks = [];
+    const initTask = await (0, init_1.nextInitGenerator)(host, {
+        ...options,
+        skipFormat: true,
+    });
+    tasks.push(initTask);
+    const libTask = await (0, library_1.libraryGenerator)(host, {
+        ...options,
+        compiler: 'swc',
+        skipFormat: true,
+    });
+    tasks.push(libTask);
+    const indexPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src', `index.${options.js ? 'js' : 'ts'}`);
+    const indexContent = host.read(indexPath, 'utf-8');
+    host.write(indexPath, `// Use this file to export React client components (e.g. those with 'use client' directive) or other non-server utilities\n${indexContent}`);
+    // Additional entry for Next.js libraries so React Server Components are exported from a separate entry point.
+    // This is needed because RSC exported from `src/index.ts` will mark the entire file as server-only and throw an error when used from a client component.
+    // See: https://github.com/nrwl/nx/issues/15830
+    const serverEntryPath = (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'server.' + (options.js ? 'js' : 'ts'));
+    host.write((0, devkit_1.joinPathFragments)(options.projectRoot, 'src', `server.${options.js ? 'js' : 'ts'}`), `// Use this file to export React server components
     export * from './lib/hello-server';`);
-        host.write((0, devkit_1.joinPathFragments)(options.projectRoot, 'src/lib', `hello-server.${options.js ? 'js' : 'tsx'}`), `// React server components are async so you make database or API calls.
+    host.write((0, devkit_1.joinPathFragments)(options.projectRoot, 'src/lib', `hello-server.${options.js ? 'js' : 'tsx'}`), `// React server components are async so you make database or API calls.
       export async function HelloServer() {
         return <h1>Hello Server</h1>
       }
     `);
-        (0, js_1.addTsConfigPath)(host, `${options.importPath}/server`, [serverEntryPath]);
-        (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json'), (json) => {
-            if (options.style === '@emotion/styled') {
-                json.compilerOptions.jsxImportSource = '@emotion/react';
-            }
-            return json;
-        });
-        (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'), (json) => {
-            if (!json.compilerOptions) {
-                json.compilerOptions = {
-                    types: [],
-                };
-            }
-            if (!json.compilerOptions.types) {
-                json.compilerOptions.types = [];
-            }
-            json.compilerOptions.types = [
-                ...json.compilerOptions.types,
-                'next',
-                '@nx/next/typings/image.d.ts',
-            ];
-            return json;
-        });
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
+    (0, js_1.addTsConfigPath)(host, `${options.importPath}/server`, [serverEntryPath]);
+    (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json'), (json) => {
+        if (options.style === '@emotion/styled') {
+            json.compilerOptions.jsxImportSource = '@emotion/react';
+        }
+        return json;
+    });
+    (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'), (json) => {
+        if (!json.compilerOptions) {
+            json.compilerOptions = {
+                types: [],
+            };
+        }
+        if (!json.compilerOptions.types) {
+            json.compilerOptions.types = [];
         }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
+        json.compilerOptions.types = [
+            ...json.compilerOptions.types,
+            'next',
+            '@nx/next/typings/image.d.ts',
+        ];
+        return json;
     });
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.libraryGeneratorInternal = libraryGeneratorInternal;
 exports.default = libraryGenerator;

package/src/generators/page/page.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pageSchematic = exports.pageGenerator = void 0;
-const tslib_1 = require("tslib");
 const react_1 = require("@nx/react");
 const devkit_1 = require("@nx/devkit");
 const styles_1 = require("../../utils/styles");
@@ -10,19 +9,27 @@ const styles_1 = require("../../utils/styles");
  * extra dependencies for css, sass, less, styl style options, and make sure
  * it is under `pages` folder.
  */
-function pageGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = normalizeOptions(host, schema);
-        const componentTask = yield (0, react_1.componentGenerator)(host, Object.assign(Object.assign({}, options), { project: schema.project, pascalCaseFiles: false, export: false, classComponent: false, routing: false, skipTests: !options.withTests, flat: !!options.flat, skipFormat: true }));
-        const styledTask = (0, styles_1.addStyleDependencies)(host, {
-            style: options.style,
-            swc: !host.exists((0, devkit_1.joinPathFragments)(options.project.root, '.babelrc')),
-        });
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-        return (0, devkit_1.runTasksInSerial)(componentTask, styledTask);
+async function pageGenerator(host, schema) {
+    const options = normalizeOptions(host, schema);
+    const componentTask = await (0, react_1.componentGenerator)(host, {
+        ...options,
+        project: schema.project,
+        pascalCaseFiles: false,
+        export: false,
+        classComponent: false,
+        routing: false,
+        skipTests: !options.withTests,
+        flat: !!options.flat,
+        skipFormat: true,
     });
+    const styledTask = (0, styles_1.addStyleDependencies)(host, {
+        style: options.style,
+        swc: !host.exists((0, devkit_1.joinPathFragments)(options.project.root, '.babelrc')),
+    });
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return (0, devkit_1.runTasksInSerial)(componentTask, styledTask);
 }
 exports.pageGenerator = pageGenerator;
 function normalizeOptions(host, options) {
@@ -34,7 +41,7 @@ function normalizeOptions(host, options) {
         ? `${routerDirectory}/${options.directory}`
         : `${routerDirectory}`;
     const fileName = isAppRouter ? 'page' : !options.flat ? 'index' : undefined;
-    return Object.assign(Object.assign({}, options), { project, directory, fileName });
+    return { ...options, project, directory, fileName };
 }
 exports.default = pageGenerator;
 exports.pageSchematic = (0, devkit_1.convertNxGenerator)(pageGenerator);

package/src/migrations/update-12-10-0/fix-page-dir-for-eslint.js

@@ -1,33 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fixPageDirForEslint = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function fixPageDirForEslint(host) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(host);
-        projects.forEach((project) => {
-            var _a, _b;
-            const eslintRcJson = (0, devkit_1.joinPathFragments)(project.root, '.eslintrc.json');
-            if (host.exists(eslintRcJson)) {
-                const config = (0, devkit_1.readJson)(host, eslintRcJson);
-                // Ignore non-nextjs projects
-                if (!((_a = config === null || config === void 0 ? void 0 : config.extends) === null || _a === void 0 ? void 0 : _a.includes('next')))
-                    return;
-                // Find the override that handles both TS and JS files.
-                const commonOverride = (_b = config.overrides) === null || _b === void 0 ? void 0 : _b.find((o) => ['*.ts', '*.tsx', '*.js', '*.jsx'].every((ext) => o.files.includes(ext)));
-                if (commonOverride &&
-                    !commonOverride.rules['@next/next/no-html-link-for-pages']) {
-                    commonOverride.rules = Object.assign(Object.assign({}, commonOverride.rules), { '@next/next/no-html-link-for-pages': [
-                            'error',
-                            `${project.root}/pages`,
-                        ] });
-                    (0, devkit_1.writeJson)(host, eslintRcJson, config);
-                }
+async function fixPageDirForEslint(host) {
+    const projects = (0, devkit_1.getProjects)(host);
+    projects.forEach((project) => {
+        const eslintRcJson = (0, devkit_1.joinPathFragments)(project.root, '.eslintrc.json');
+        if (host.exists(eslintRcJson)) {
+            const config = (0, devkit_1.readJson)(host, eslintRcJson);
+            // Ignore non-nextjs projects
+            if (!config?.extends?.includes('next'))
+                return;
+            // Find the override that handles both TS and JS files.
+            const commonOverride = config.overrides?.find((o) => ['*.ts', '*.tsx', '*.js', '*.jsx'].every((ext) => o.files.includes(ext)));
+            if (commonOverride &&
+                !commonOverride.rules['@next/next/no-html-link-for-pages']) {
+                commonOverride.rules = {
+                    ...commonOverride.rules,
+                    '@next/next/no-html-link-for-pages': [
+                        'error',
+                        `${project.root}/pages`,
+                    ],
+                };
+                (0, devkit_1.writeJson)(host, eslintRcJson, config);
             }
-        });
-        yield (0, devkit_1.formatFiles)(host);
+        }
     });
+    await (0, devkit_1.formatFiles)(host);
 }
 exports.fixPageDirForEslint = fixPageDirForEslint;
 exports.default = fixPageDirForEslint;

package/src/migrations/update-12-8-0/remove-styled-jsx-babel-plugin.js

@@ -1,25 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeStyledJsxBabelConfig = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function removeStyledJsxBabelConfig(host) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(host);
-        projects.forEach((project) => {
-            const babelRcPath = (0, devkit_1.joinPathFragments)(project.root, '.babelrc');
-            if (host.exists(babelRcPath)) {
-                const babelRcContent = (0, devkit_1.readJson)(host, babelRcPath);
-                // check whether next.js project
-                if (babelRcContent.presets.includes('next/babel')) {
-                    babelRcContent.plugins = babelRcContent.plugins.filter((x) => x !== 'styled-jsx/babel');
-                    // update .babelrc
-                    (0, devkit_1.writeJson)(host, babelRcPath, babelRcContent);
-                }
+async function removeStyledJsxBabelConfig(host) {
+    const projects = (0, devkit_1.getProjects)(host);
+    projects.forEach((project) => {
+        const babelRcPath = (0, devkit_1.joinPathFragments)(project.root, '.babelrc');
+        if (host.exists(babelRcPath)) {
+            const babelRcContent = (0, devkit_1.readJson)(host, babelRcPath);
+            // check whether next.js project
+            if (babelRcContent.presets.includes('next/babel')) {
+                babelRcContent.plugins = babelRcContent.plugins.filter((x) => x !== 'styled-jsx/babel');
+                // update .babelrc
+                (0, devkit_1.writeJson)(host, babelRcPath, babelRcContent);
             }
-        });
-        yield (0, devkit_1.formatFiles)(host);
+        }
     });
+    await (0, devkit_1.formatFiles)(host);
 }
 exports.removeStyledJsxBabelConfig = removeStyledJsxBabelConfig;
 exports.default = removeStyledJsxBabelConfig;

package/src/migrations/update-13-0-0/update-emotion-setup.js

@@ -1,38 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateEmotionSetup = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function updateEmotionSetup(host) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(host);
-        projects.forEach((p) => {
-            let hasEmotion = false;
-            const babelrcPath = `${p.root}/.babelrc`;
-            const tsConfigPath = `${p.root}/tsconfig.json`;
-            if (host.exists(babelrcPath)) {
-                const babelrc = (0, devkit_1.readJson)(host, babelrcPath);
-                if (babelrc.presets) {
-                    for (const [idx, preset] of babelrc.presets.entries()) {
-                        if (Array.isArray(preset)) {
-                            if (!preset[0].includes('@nrwl/next/babel'))
-                                continue;
-                            const emotionOptions = preset[1]['preset-react'];
-                            hasEmotion = (emotionOptions === null || emotionOptions === void 0 ? void 0 : emotionOptions.importSource) === '@emotion/react';
-                            break;
-                        }
+async function updateEmotionSetup(host) {
+    const projects = (0, devkit_1.getProjects)(host);
+    projects.forEach((p) => {
+        let hasEmotion = false;
+        const babelrcPath = `${p.root}/.babelrc`;
+        const tsConfigPath = `${p.root}/tsconfig.json`;
+        if (host.exists(babelrcPath)) {
+            const babelrc = (0, devkit_1.readJson)(host, babelrcPath);
+            if (babelrc.presets) {
+                for (const [idx, preset] of babelrc.presets.entries()) {
+                    if (Array.isArray(preset)) {
+                        if (!preset[0].includes('@nrwl/next/babel'))
+                            continue;
+                        const emotionOptions = preset[1]['preset-react'];
+                        hasEmotion = emotionOptions?.importSource === '@emotion/react';
+                        break;
                     }
                 }
             }
-            if (hasEmotion && host.exists(tsConfigPath)) {
-                (0, devkit_1.updateJson)(host, tsConfigPath, (json) => {
-                    json.compilerOptions.jsxImportSource = '@emotion/react';
-                    return json;
-                });
-            }
-        });
-        yield (0, devkit_1.formatFiles)(host);
+        }
+        if (hasEmotion && host.exists(tsConfigPath)) {
+            (0, devkit_1.updateJson)(host, tsConfigPath, (json) => {
+                json.compilerOptions.jsxImportSource = '@emotion/react';
+                return json;
+            });
+        }
     });
+    await (0, devkit_1.formatFiles)(host);
 }
 exports.updateEmotionSetup = updateEmotionSetup;
 exports.default = updateEmotionSetup;

package/src/migrations/update-13-0-0/update-to-webpack-5.js

@@ -1,31 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.update = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function update(host) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(host);
-        let task = undefined;
-        projects.forEach((project) => {
-            const configPath = (0, devkit_1.joinPathFragments)(project.root, 'next.config.js');
-            if (!host.exists(configPath))
-                return;
-            const content = host.read(configPath).toString();
-            let updated = content.replace(/webpack5: false/, 'webpack5: true');
-            if (content.match(/@zeit\/next-less/)) {
-                updated = updated.replace('@zeit/next-less', 'next-with-less');
-                task = (0, devkit_1.addDependenciesToPackageJson)(host, { 'next-with-less': '1.0.1' }, {});
-            }
-            if (content.match(/@zeit\/next-stylus/)) {
-                updated = updated.replace('@zeit/next-stylus', '@nrwl/next/plugins/with-stylus');
-                task = (0, devkit_1.addDependenciesToPackageJson)(host, { 'stylus-loader': '6.2.0' }, {});
-            }
-            host.write(configPath, updated);
-        });
-        yield (0, devkit_1.formatFiles)(host);
-        return task;
+async function update(host) {
+    const projects = (0, devkit_1.getProjects)(host);
+    let task = undefined;
+    projects.forEach((project) => {
+        const configPath = (0, devkit_1.joinPathFragments)(project.root, 'next.config.js');
+        if (!host.exists(configPath))
+            return;
+        const content = host.read(configPath).toString();
+        let updated = content.replace(/webpack5: false/, 'webpack5: true');
+        if (content.match(/@zeit\/next-less/)) {
+            updated = updated.replace('@zeit/next-less', 'next-with-less');
+            task = (0, devkit_1.addDependenciesToPackageJson)(host, { 'next-with-less': '1.0.1' }, {});
+        }
+        if (content.match(/@zeit\/next-stylus/)) {
+            updated = updated.replace('@zeit/next-stylus', '@nrwl/next/plugins/with-stylus');
+            task = (0, devkit_1.addDependenciesToPackageJson)(host, { 'stylus-loader': '6.2.0' }, {});
+        }
+        host.write(configPath, updated);
     });
+    await (0, devkit_1.formatFiles)(host);
+    return task;
 }
 exports.update = update;
 exports.default = update;

package/src/migrations/update-13-0-3/fix-less.js

@@ -1,26 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.update = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function update(host) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(host);
-        let task = undefined;
-        projects.forEach((project) => {
-            const configPath = (0, devkit_1.joinPathFragments)(project.root, 'next.config.js');
-            if (!host.exists(configPath))
-                return;
-            const content = host.read(configPath).toString();
-            if (content.match(/next-with-less/)) {
-                const updated = content.replace('next-with-less', '@nrwl/next/plugins/with-less');
-                task = (0, devkit_1.addDependenciesToPackageJson)(host, { 'less-loader': '10.2.0' }, {});
-                host.write(configPath, updated);
-            }
-        });
-        yield (0, devkit_1.formatFiles)(host);
-        return task;
+async function update(host) {
+    const projects = (0, devkit_1.getProjects)(host);
+    let task = undefined;
+    projects.forEach((project) => {
+        const configPath = (0, devkit_1.joinPathFragments)(project.root, 'next.config.js');
+        if (!host.exists(configPath))
+            return;
+        const content = host.read(configPath).toString();
+        if (content.match(/next-with-less/)) {
+            const updated = content.replace('next-with-less', '@nrwl/next/plugins/with-less');
+            task = (0, devkit_1.addDependenciesToPackageJson)(host, { 'less-loader': '10.2.0' }, {});
+            host.write(configPath, updated);
+        }
     });
+    await (0, devkit_1.formatFiles)(host);
+    return task;
 }
 exports.update = update;
 exports.default = update;

package/src/migrations/update-13-1-1/enable-swc.js

@@ -1,45 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.update = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function update(host) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(host);
-        projects.forEach((project) => {
-            const nextConfigPath = (0, devkit_1.joinPathFragments)(project.root, 'next.config.js');
-            const jestConfigPath = (0, devkit_1.joinPathFragments)(project.root, 'jest.config.js');
-            const babelConfigPath = (0, devkit_1.joinPathFragments)(project.root, '.babelrc');
-            const storybookMainPath = (0, devkit_1.joinPathFragments)(project.root, '.storybook/main.js');
-            if (!host.exists(nextConfigPath) || !host.exists(jestConfigPath))
-                return;
-            if (host.exists(babelConfigPath)) {
-                if (customBabelConfig(host, babelConfigPath)) {
-                    devkit_1.logger.info(`NX Custom .babelrc file detected, skipping deletion. You can delete this file yourself to enable SWC: ${babelConfigPath}`);
-                }
-                else if (host.exists(storybookMainPath)) {
-                    devkit_1.logger.info(`NX Storybook configuration for project "${project.name}" detected, skipping deletion of .babelrc`);
-                }
-                else {
-                    // Deleting custom babel config enables SWC
-                    host.delete(babelConfigPath);
-                }
+async function update(host) {
+    const projects = (0, devkit_1.getProjects)(host);
+    projects.forEach((project) => {
+        const nextConfigPath = (0, devkit_1.joinPathFragments)(project.root, 'next.config.js');
+        const jestConfigPath = (0, devkit_1.joinPathFragments)(project.root, 'jest.config.js');
+        const babelConfigPath = (0, devkit_1.joinPathFragments)(project.root, '.babelrc');
+        const storybookMainPath = (0, devkit_1.joinPathFragments)(project.root, '.storybook/main.js');
+        if (!host.exists(nextConfigPath) || !host.exists(jestConfigPath))
+            return;
+        if (host.exists(babelConfigPath)) {
+            if (customBabelConfig(host, babelConfigPath)) {
+                devkit_1.logger.info(`NX Custom .babelrc file detected, skipping deletion. You can delete this file yourself to enable SWC: ${babelConfigPath}`);
             }
-            const content = host.read(jestConfigPath).toString();
-            if (content.match(/:\s+'babel-jest'/)) {
-                const updated = content.replace(/:\s+'babel-jest'/, `: ['babel-jest', { presets: ['@nrwl/next/babel'] }]`);
-                host.write(jestConfigPath, updated);
+            else if (host.exists(storybookMainPath)) {
+                devkit_1.logger.info(`NX Storybook configuration for project "${project.name}" detected, skipping deletion of .babelrc`);
             }
-        });
-        yield (0, devkit_1.formatFiles)(host);
+            else {
+                // Deleting custom babel config enables SWC
+                host.delete(babelConfigPath);
+            }
+        }
+        const content = host.read(jestConfigPath).toString();
+        if (content.match(/:\s+'babel-jest'/)) {
+            const updated = content.replace(/:\s+'babel-jest'/, `: ['babel-jest', { presets: ['@nrwl/next/babel'] }]`);
+            host.write(jestConfigPath, updated);
+        }
     });
+    await (0, devkit_1.formatFiles)(host);
 }
 exports.update = update;
 function customBabelConfig(host, configPath) {
-    var _a, _b, _c;
     const json = (0, devkit_1.readJson)(host, configPath);
-    return !(((_a = json.presets) === null || _a === void 0 ? void 0 : _a.length) === 1 &&
-        ((_b = json.presets) === null || _b === void 0 ? void 0 : _b[0]) === '@nrwl/next/babel' &&
-        (((_c = json.plugins) === null || _c === void 0 ? void 0 : _c.length) === 0 || !json.plugins));
+    return !(json.presets?.length === 1 &&
+        json.presets?.[0] === '@nrwl/next/babel' &&
+        (json.plugins?.length === 0 || !json.plugins));
 }
 exports.default = update;

package/src/migrations/update-14-0-0/add-default-development-configurations.js

@@ -1,35 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.update = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(tree);
-        projects.forEach((config, name) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-            var _l, _m, _o, _p, _q, _r;
-            let shouldUpdate = false;
-            if (((_b = (_a = config.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.executor) === '@nrwl/next:build') {
-                shouldUpdate = true;
-                (_c = (_l = config.targets.build).defaultConfiguration) !== null && _c !== void 0 ? _c : (_l.defaultConfiguration = 'production');
-                (_d = (_m = config.targets.build).configurations) !== null && _d !== void 0 ? _d : (_m.configurations = {});
-                (_e = (_o = config.targets.build.configurations).development) !== null && _e !== void 0 ? _e : (_o.development = {});
-            }
-            if (((_g = (_f = config.targets) === null || _f === void 0 ? void 0 : _f.serve) === null || _g === void 0 ? void 0 : _g.executor) === '@nrwl/next:server') {
-                shouldUpdate = true;
-                (_h = (_p = config.targets.serve).defaultConfiguration) !== null && _h !== void 0 ? _h : (_p.defaultConfiguration = 'development');
-                (_j = (_q = config.targets.serve).configurations) !== null && _j !== void 0 ? _j : (_q.configurations = {});
-                (_k = (_r = config.targets.serve.configurations).development) !== null && _k !== void 0 ? _k : (_r.development = {
-                    buildTarget: `${name}:build:development`,
-                    dev: true,
-                });
-            }
-            if (shouldUpdate)
-                (0, devkit_1.updateProjectConfiguration)(tree, name, config);
-        });
-        yield (0, devkit_1.formatFiles)(tree);
+async function update(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    projects.forEach((config, name) => {
+        let shouldUpdate = false;
+        if (config.targets?.build?.executor === '@nrwl/next:build') {
+            shouldUpdate = true;
+            config.targets.build.defaultConfiguration ??= 'production';
+            config.targets.build.configurations ??= {};
+            config.targets.build.configurations.development ??= {};
+        }
+        if (config.targets?.serve?.executor === '@nrwl/next:server') {
+            shouldUpdate = true;
+            config.targets.serve.defaultConfiguration ??= 'development';
+            config.targets.serve.configurations ??= {};
+            config.targets.serve.configurations.development ??= {
+                buildTarget: `${name}:build:development`,
+                dev: true,
+            };
+        }
+        if (shouldUpdate)
+            (0, devkit_1.updateProjectConfiguration)(tree, name, config);
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.update = update;
 exports.default = update;