@nx/next 16.8.0-beta.3 → 16.8.0-beta.5

package/src/migrations/update-14-4-3/add-dev-output-path.js

@@ -1,23 +1,19 @@
 "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;
-            var _f, _g, _h;
-            if (((_b = (_a = config.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.executor) === '@nrwl/next:build') {
-                (_c = (_f = config.targets.build).configurations) !== null && _c !== void 0 ? _c : (_f.configurations = {});
-                (_d = (_g = config.targets.build.configurations).development) !== null && _d !== void 0 ? _d : (_g.development = {});
-                (_e = (_h = config.targets.build.configurations.development).outputPath) !== null && _e !== void 0 ? _e : (_h.outputPath = (0, devkit_1.joinPathFragments)('tmp', config.sourceRoot));
-                (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) => {
+        if (config.targets?.build?.executor === '@nrwl/next:build') {
+            config.targets.build.configurations ??= {};
+            config.targets.build.configurations.development ??= {};
+            config.targets.build.configurations.development.outputPath ??=
+                (0, devkit_1.joinPathFragments)('tmp', config.sourceRoot);
+            (0, devkit_1.updateProjectConfiguration)(tree, name, config);
+        }
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.update = update;
 exports.default = update;

package/src/migrations/update-14-5-3/add-gitignore-entry.js

@@ -1,14 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.update = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const add_gitignore_entry_1 = require("../../utils/add-gitignore-entry");
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, add_gitignore_entry_1.addGitIgnoreEntry)(tree);
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function update(tree) {
+    (0, add_gitignore_entry_1.addGitIgnoreEntry)(tree);
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.update = update;
 exports.default = update;

package/src/migrations/update-14-5-3/update-dev-output-path.js

@@ -1,28 +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(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;
-            var _e, _f;
-            if (((_b = (_a = config.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.executor) === '@nrwl/next:build') {
-                (_c = (_e = config.targets.build).configurations) !== null && _c !== void 0 ? _c : (_e.configurations = {});
-                (_d = (_f = config.targets.build.configurations).development) !== null && _d !== void 0 ? _d : (_f.development = {});
-                if (!config.targets.build.configurations.development.outputPath ||
-                    config.targets.build.configurations.development.outputPath ===
-                        (0, devkit_1.joinPathFragments)('tmp', config.root)) {
-                    config.targets.build.configurations.development.outputPath =
-                        config.root;
-                    (0, devkit_1.updateProjectConfiguration)(tree, name, config);
-                }
+async function update(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    projects.forEach((config, name) => {
+        if (config.targets?.build?.executor === '@nrwl/next:build') {
+            config.targets.build.configurations ??= {};
+            config.targets.build.configurations.development ??= {};
+            if (!config.targets.build.configurations.development.outputPath ||
+                config.targets.build.configurations.development.outputPath ===
+                    (0, devkit_1.joinPathFragments)('tmp', config.root)) {
+                config.targets.build.configurations.development.outputPath =
+                    config.root;
+                (0, devkit_1.updateProjectConfiguration)(tree, name, config);
             }
-        });
-        yield (0, devkit_1.formatFiles)(tree);
+        }
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.update = update;
 exports.default = update;

package/src/migrations/update-14-5-7/update-next-eslint.js

@@ -1,31 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateNextEslint = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function updateNextEslint(host) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(host);
-        projects.forEach((project) => {
-            var _a, _b;
-            if (((_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.executor) !== '@nrwl/next:build')
-                return;
-            const eslintPath = `${project.root}/.eslintrc.json`;
-            if (!host.exists(eslintPath))
-                return;
-            (0, devkit_1.updateJson)(host, eslintPath, (eslintConfig) => {
-                const nextIgnorePattern = '.next/**/*';
-                if (eslintConfig.ignorePatterns.indexOf(nextIgnorePattern) < 0) {
-                    eslintConfig.ignorePatterns = [
-                        ...eslintConfig.ignorePatterns,
-                        nextIgnorePattern,
-                    ];
-                }
-                return eslintConfig;
-            });
+async function updateNextEslint(host) {
+    const projects = (0, devkit_1.getProjects)(host);
+    projects.forEach((project) => {
+        if (project.targets?.build?.executor !== '@nrwl/next:build')
+            return;
+        const eslintPath = `${project.root}/.eslintrc.json`;
+        if (!host.exists(eslintPath))
+            return;
+        (0, devkit_1.updateJson)(host, eslintPath, (eslintConfig) => {
+            const nextIgnorePattern = '.next/**/*';
+            if (eslintConfig.ignorePatterns.indexOf(nextIgnorePattern) < 0) {
+                eslintConfig.ignorePatterns = [
+                    ...eslintConfig.ignorePatterns,
+                    nextIgnorePattern,
+                ];
+            }
+            return eslintConfig;
         });
-        yield (0, devkit_1.formatFiles)(host);
     });
+    await (0, devkit_1.formatFiles)(host);
 }
 exports.updateNextEslint = updateNextEslint;
 exports.default = updateNextEslint;

package/src/migrations/update-15-8-8/add-style-packages.js

@@ -1,27 +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(tree) {
-    var _a, _b;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(tree);
-        const missingDeps = {};
-        for (const [, config] of projects) {
-            if (((_b = (_a = config.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.executor) === '@nrwl/next:build' &&
-                tree.exists((0, devkit_1.joinPathFragments)(config.root, 'next.config.js'))) {
-                const nextConfigContent = tree.read((0, devkit_1.joinPathFragments)(config.root, 'next.config.js'), 'utf-8');
-                if (nextConfigContent.includes('@nrwl/next/plugins/with-less')) {
-                    missingDeps['less'] = '3.12.2';
-                }
-                if (nextConfigContent.includes('@nrwl/next/plugins/with-stylus')) {
-                    missingDeps['stylus'] = '^0.55.0';
-                }
+async function update(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    const missingDeps = {};
+    for (const [, config] of projects) {
+        if (config.targets?.build?.executor === '@nrwl/next:build' &&
+            tree.exists((0, devkit_1.joinPathFragments)(config.root, 'next.config.js'))) {
+            const nextConfigContent = tree.read((0, devkit_1.joinPathFragments)(config.root, 'next.config.js'), 'utf-8');
+            if (nextConfigContent.includes('@nrwl/next/plugins/with-less')) {
+                missingDeps['less'] = '3.12.2';
+            }
+            if (nextConfigContent.includes('@nrwl/next/plugins/with-stylus')) {
+                missingDeps['stylus'] = '^0.55.0';
             }
         }
-        return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, missingDeps);
-    });
+    }
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, missingDeps);
 }
 exports.update = update;
 exports.default = update;

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-function replacePackage(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/next', '@nx/next');
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function replacePackage(tree) {
+    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/next', '@nx/next');
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = replacePackage;

package/src/migrations/update-16-3-0/remove-root-build-option.js

@@ -1,20 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/next:build', (options, projectName, targetName) => {
-            const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-            delete projectConfig.targets[targetName].options.root;
-            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-        });
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/next:build', (options, projectName, targetName) => {
-            const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-            delete projectConfig.targets[targetName].options.root;
-            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-        });
+async function update(tree) {
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/next:build', (options, projectName, targetName) => {
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        delete projectConfig.targets[targetName].options.root;
+        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
+    });
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/next:build', (options, projectName, targetName) => {
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        delete projectConfig.targets[targetName].options.root;
+        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
     });
 }
 exports.default = update;

package/src/migrations/update-16-4-0/update-nx-next-dependency.js

@@ -1,20 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (tree.exists('./package.json')) {
-            (0, devkit_1.updateJson)(tree, 'package.json', (packageJson) => {
-                if (packageJson.dependencies['@nx/next']) {
-                    packageJson.devDependencies['@nx/next'] =
-                        packageJson.dependencies['@nx/next'];
-                    delete packageJson.dependencies['@nx/next'];
-                }
-                return packageJson;
-            });
-        }
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function update(tree) {
+    if (tree.exists('./package.json')) {
+        (0, devkit_1.updateJson)(tree, 'package.json', (packageJson) => {
+            if (packageJson.dependencies['@nx/next']) {
+                packageJson.devDependencies['@nx/next'] =
+                    packageJson.dependencies['@nx/next'];
+                delete packageJson.dependencies['@nx/next'];
+            }
+            return packageJson;
+        });
+    }
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = update;

package/src/utils/compose-plugins.js

@@ -1,24 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.composePlugins = void 0;
-const tslib_1 = require("tslib");
 function composePlugins(...plugins) {
     return function (baseConfig) {
-        return function combined(phase, context) {
-            return tslib_1.__awaiter(this, void 0, void 0, function* () {
-                let config = baseConfig;
-                for (const plugin of plugins) {
-                    const fn = yield plugin;
-                    const configOrFn = fn(config);
-                    if (typeof configOrFn === 'function') {
-                        config = yield configOrFn(phase, context);
-                    }
-                    else {
-                        config = configOrFn;
-                    }
+        return async function combined(phase, context) {
+            let config = baseConfig;
+            for (const plugin of plugins) {
+                const fn = await plugin;
+                const configOrFn = fn(config);
+                if (typeof configOrFn === 'function') {
+                    config = await configOrFn(phase, context);
                 }
-                return config;
-            });
+                else {
+                    config = configOrFn;
+                }
+            }
+            return config;
         };
     };
 }

package/src/utils/create-copy-plugin.js

@@ -32,16 +32,18 @@ function normalizeAssets(assets, root, sourceRoot) {
             }
             const assetPath = (0, path_1.normalizePath)(asset.input);
             const resolvedAssetPath = (0, path_2.resolve)(root, assetPath);
-            return Object.assign(Object.assign({}, asset), { input: resolvedAssetPath, 
+            return {
+                ...asset,
+                input: resolvedAssetPath,
                 // Now we remove starting slash to make Webpack place it from the output root.
-                output: asset.output.replace(/^\//, '') });
+                output: asset.output.replace(/^\//, ''),
+            };
         }
     });
 }
 function createCopyPlugin(assets, root, sourceRoot) {
     return new CopyWebpackPlugin({
         patterns: normalizeAssets(assets, root, sourceRoot).map((asset) => {
-            var _a;
             return {
                 context: asset.input,
                 to: (0, path_2.join)('../public', asset.output),
@@ -51,7 +53,7 @@ function createCopyPlugin(assets, root, sourceRoot) {
                         '.gitkeep',
                         '**/.DS_Store',
                         '**/Thumbs.db',
-                        ...((_a = asset.ignore) !== null && _a !== void 0 ? _a : []),
+                        ...(asset.ignore ?? []),
                     ],
                     dot: true,
                 },

package/src/utils/generate-globs.js

@@ -23,7 +23,7 @@ due to missing "sourceRoot" in the dependencies' project configuration
         return projectDirs.map((sourceDir) => (0, path_1.resolve)(devkit_2.workspaceRoot, (0, devkit_1.joinPathFragments)(sourceDir, fileGlobPattern)));
     }
     catch (e) {
-        throw new Error(`createGlobPatternsOfDependentProjects: Error when generating globs: ${e === null || e === void 0 ? void 0 : e.message}`);
+        throw new Error(`createGlobPatternsOfDependentProjects: Error when generating globs: ${e?.message}`);
     }
 }
 exports.createGlobPatternsOfDependentProjects = createGlobPatternsOfDependentProjects;

package/src/utils/styles.js

@@ -29,20 +29,40 @@ const nextSpecificStyleDependenciesCommon = {
         devDependencies: {},
     },
 };
-exports.nextSpecificStyleDependenciesBabel = Object.assign(Object.assign({}, nextSpecificStyleDependenciesCommon), { 'styled-components': {
+exports.nextSpecificStyleDependenciesBabel = {
+    ...nextSpecificStyleDependenciesCommon,
+    'styled-components': {
         dependencies: styled_1.cssInJsDependenciesBabel['styled-components'].dependencies,
-        devDependencies: Object.assign(Object.assign({}, styled_1.cssInJsDependenciesBabel['styled-components'].devDependencies), { 'babel-plugin-styled-components': versions_2.babelPluginStyledComponentsVersion }),
-    }, '@emotion/styled': {
-        dependencies: Object.assign(Object.assign({}, styled_1.cssInJsDependenciesBabel['@emotion/styled'].dependencies), { '@emotion/server': versions_2.emotionServerVersion }),
+        devDependencies: {
+            ...styled_1.cssInJsDependenciesBabel['styled-components'].devDependencies,
+            'babel-plugin-styled-components': versions_2.babelPluginStyledComponentsVersion,
+        },
+    },
+    '@emotion/styled': {
+        dependencies: {
+            ...styled_1.cssInJsDependenciesBabel['@emotion/styled'].dependencies,
+            '@emotion/server': versions_2.emotionServerVersion,
+        },
         devDependencies: styled_1.cssInJsDependenciesBabel['@emotion/styled'].devDependencies,
-    } });
-exports.nextSpecificStyleDependenciesSwc = Object.assign(Object.assign({}, nextSpecificStyleDependenciesCommon), { 'styled-components': {
+    },
+};
+exports.nextSpecificStyleDependenciesSwc = {
+    ...nextSpecificStyleDependenciesCommon,
+    'styled-components': {
         dependencies: styled_1.cssInJsDependenciesSwc['styled-components'].dependencies,
-        devDependencies: Object.assign(Object.assign({}, styled_1.cssInJsDependenciesSwc['styled-components'].devDependencies), { 'babel-plugin-styled-components': versions_2.babelPluginStyledComponentsVersion }),
-    }, '@emotion/styled': {
-        dependencies: Object.assign(Object.assign({}, styled_1.cssInJsDependenciesSwc['@emotion/styled'].dependencies), { '@emotion/server': versions_2.emotionServerVersion }),
+        devDependencies: {
+            ...styled_1.cssInJsDependenciesSwc['styled-components'].devDependencies,
+            'babel-plugin-styled-components': versions_2.babelPluginStyledComponentsVersion,
+        },
+    },
+    '@emotion/styled': {
+        dependencies: {
+            ...styled_1.cssInJsDependenciesSwc['@emotion/styled'].dependencies,
+            '@emotion/server': versions_2.emotionServerVersion,
+        },
         devDependencies: styled_1.cssInJsDependenciesSwc['@emotion/styled'].devDependencies,
-    } });
+    },
+};
 function addStyleDependencies(host, options) {
     const extraDependencies = options.swc
         ? exports.nextSpecificStyleDependenciesSwc[options.style]
@@ -55,7 +75,7 @@ function addStyleDependencies(host, options) {
     if (host.exists('pnpm-lock.yaml') &&
         (options.style === 'less' || options.style === 'styl')) {
         (0, devkit_1.updateJson)(host, `package.json`, (json) => {
-            json.resolutions = Object.assign(Object.assign({}, json.resolutions), { 'css-loader': '1.0.1' });
+            json.resolutions = { ...json.resolutions, 'css-loader': '1.0.1' };
             return json;
         });
     }