@nx/next 16.4.0-beta.1 → 16.4.0-beta.13

package/migrations.json

@@ -71,6 +71,12 @@
       "version": "16.3.0-beta.9",
       "description": "Remove root build option from project configurations since it is not needed.",
       "implementation": "./src/migrations/update-16-3-0/remove-root-build-option"
+    },
+    "update-16-4-0-update-next-dependency": {
+      "cli": "nx",
+      "version": "16.4.0-beta.3",
+      "description": "Update package.json moving @nx/next from dependency to devDependency",
+      "implementation": "./src/migrations/update-16-4-0/update-nx-next-dependency"
     }
   },
   "packageJsonUpdates": {
@@ -322,6 +328,15 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "16.4.0-beta.4": {
+      "version": "16.4.0-beta.4",
+      "packages": {
+        "stylus": {
+          "version": "^0.59.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "16.4.0-beta.1",
+  "version": "16.4.0-beta.13",
   "private": false,
   "description": "The Next.js plugin for Nx contains executors and generators for managing Next.js applications and libraries within an Nx workspace. It provides:\n\n\n- Scaffolding for creating, building, serving, linting, and testing Next.js applications.\n\n- Integration with building, serving, and exporting a Next.js application.\n\n- Integration with React libraries within the workspace. \n\nWhen using Next.js in Nx, you get the out-of-the-box support for TypeScript, Cypress, and Jest. No need to configure anything: watch mode, source maps, and typings just work.",
   "repository": {
@@ -35,13 +35,13 @@
   },
   "dependencies": {
     "@babel/plugin-proposal-decorators": "^7.14.5",
-    "@nrwl/next": "16.4.0-beta.1",
-    "@nx/devkit": "16.4.0-beta.1",
-    "@nx/js": "16.4.0-beta.1",
-    "@nx/linter": "16.4.0-beta.1",
-    "@nx/react": "16.4.0-beta.1",
-    "@nx/web": "16.4.0-beta.1",
-    "@nx/workspace": "16.4.0-beta.1",
+    "@nrwl/next": "16.4.0-beta.13",
+    "@nx/devkit": "16.4.0-beta.13",
+    "@nx/js": "16.4.0-beta.13",
+    "@nx/linter": "16.4.0-beta.13",
+    "@nx/react": "16.4.0-beta.13",
+    "@nx/web": "16.4.0-beta.13",
+    "@nx/workspace": "16.4.0-beta.13",
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
     "copy-webpack-plugin": "^10.2.4",
@@ -61,5 +61,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "1c4fb934b607f0d93bb23bff2cf0f39b31a8fa43"
+  "gitHead": "d81afedfcc8d07db8cdb9b0e9286de0321ee184e"
 }

package/src/executors/build/build.impl.js

@@ -58,6 +58,10 @@ function buildExecutor(options, context) {
             root: context.root,
             isProduction: !options.includeDevDependenciesInPackageJson, // By default we remove devDependencies since this is a production build.
         });
+        // Update `package.json` to reflect how users should run the build artifacts
+        builtPackageJson.scripts = {
+            start: 'next start',
+        };
         (0, update_package_json_1.updatePackageJson)(builtPackageJson, context);
         (0, devkit_1.writeJsonFile)(`${options.outputPath}/package.json`, builtPackageJson);
         if (options.generateLockfile) {

package/src/executors/build/lib/create-next-config-file.js

@@ -139,7 +139,7 @@ function stripOuterQuotes(str) {
 }
 // Exported for testing
 function ensureFileExtensions(files, absoluteDir) {
-    const extensions = ['.js', '.cjs', '.mjs'];
+    const extensions = ['.js', '.cjs', '.mjs', '.json'];
     return files.map((file) => {
         const providedExt = (0, path_1.extname)(file);
         if (providedExt && extensions.includes(providedExt))

package/src/executors/build/schema.json

@@ -71,5 +71,6 @@
       "description": "Only build 'app' routes"
     }
   },
-  "required": ["outputPath"]
+  "required": ["outputPath"],
+  "examplesFile": "../../../docs/build-next-executor-examples.md"
 }

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

@@ -14,7 +14,6 @@ function serveExecutor(options, context) {
                 : 'production';
         // Setting port that the custom server should use.
         process.env.PORT = options.port;
-        const buildOptions = (0, devkit_1.readTargetOptions)((0, devkit_1.parseTargetString)(options.buildTarget, context.projectGraph), context);
         const projectRoot = context.projectGraph.nodes[context.projectName].data.root;
         yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(runCustomServer(projectRoot, options, context))));
     });
@@ -30,22 +29,17 @@ function runCustomServer(root, options, context) {
             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;) {
+            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;
-                try {
-                    const result = _c;
-                    if (!result.success) {
-                        return yield tslib_1.__await(result);
-                    }
-                    yield yield tslib_1.__await({
-                        success: true,
-                        baseUrl,
-                    });
-                }
-                finally {
-                    _d = true;
+                const result = _c;
+                if (!result.success) {
+                    return yield tslib_1.__await(result);
                 }
+                yield yield tslib_1.__await({
+                    success: true,
+                    baseUrl,
+                });
             }
         }
         catch (e_1_1) { e_1 = { error: e_1_1 }; }

package/src/executors/server/schema.json

@@ -40,12 +40,6 @@
       "type": "string",
       "description": "Hostname on which the application is served."
     },
-    "proxyConfig": {
-      "type": "string",
-      "description": "Path to the proxy configuration file.",
-      "x-completion-type": "file",
-      "x-deprecated": "Use the built-in rewrite feature from Next.js. See: https://nextjs.org/docs/api-reference/next.config.js/rewrites"
-    },
     "buildLibsFromSource": {
       "type": "boolean",
       "description": "Read buildable libraries from source instead of building them separately.",
@@ -60,5 +54,6 @@
       "description": "Activate the incremental bundler for Next.js, which is implemented in Rust. Please note, this feature is exclusively available in development mode."
     }
   },
-  "required": ["buildTarget"]
+  "required": ["buildTarget"],
+  "examplesFile": "../../../docs/server-next-executor-examples.md"
 }

package/src/generators/init/init.js

@@ -10,12 +10,12 @@ const versions_2 = require("../../utils/versions");
 const add_gitignore_entry_1 = require("../../utils/add-gitignore-entry");
 function updateDependencies(host) {
     return (0, devkit_1.addDependenciesToPackageJson)(host, {
-        '@nx/next': versions_2.nxVersion,
         next: versions_2.nextVersion,
         react: versions_1.reactVersion,
         'react-dom': versions_1.reactDomVersion,
         tslib: versions_2.tsLibVersion,
     }, {
+        '@nx/next': versions_2.nxVersion,
         'eslint-config-next': versions_2.eslintConfigNextVersion,
     });
 }
@@ -33,7 +33,7 @@ function nextInitGenerator(host, schema) {
             const cypressTask = yield cypressInitGenerator(host, {});
             tasks.push(cypressTask);
         }
-        const reactTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, schema), { skipFormat: true, skipBabelConfig: true }));
+        const reactTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, schema), { skipFormat: true }));
         tasks.push(reactTask);
         if (!schema.skipPackageJson) {
             const installTask = updateDependencies(host);

package/src/generators/library/library.js

@@ -30,31 +30,6 @@ function libraryGenerator(host, rawOptions) {
       }
     `);
         (0, js_1.addTsConfigPath)(host, `${options.importPath}/server`, [serverEntryPath]);
-        (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, '.babelrc'), (json) => {
-            if (options.style === '@emotion/styled') {
-                json.presets = [
-                    [
-                        '@nx/next/babel',
-                        {
-                            'preset-react': {
-                                runtime: 'automatic',
-                                importSource: '@emotion/react',
-                            },
-                        },
-                    ],
-                ];
-            }
-            else if (options.style === 'styled-jsx') {
-                // next.js doesn't require the `styled-jsx/babel' plugin as it is already
-                // built-into the `next/babel` preset
-                json.presets = ['@nx/next/babel'];
-                json.plugins = (json.plugins || []).filter((x) => x !== 'styled-jsx/babel');
-            }
-            else {
-                json.presets = ['@nx/next/babel'];
-            }
-            return json;
-        });
         (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json'), (json) => {
             if (options.style === '@emotion/styled') {
                 json.compilerOptions.jsxImportSource = '@emotion/react';
@@ -71,6 +46,15 @@ function libraryGenerator(host, rawOptions) {
                 }
                 return path;
             });
+            if (!json.compilerOptions) {
+                json.compilerOptions = {
+                    types: [],
+                };
+            }
+            if (!json.compilerOptions.types) {
+                json.compilerOptions.types = [];
+            }
+            json.compilerOptions.types.push('next');
             return json;
         });
         if (!options.skipFormat) {

package/src/generators/library/schema.json

@@ -72,9 +72,8 @@
     },
     "unitTestRunner": {
       "type": "string",
-      "enum": ["jest", "none"],
-      "description": "Test runner to use for unit tests.",
-      "default": "jest"
+      "enum": ["jest", "vitest", "none"],
+      "description": "Test runner to use for unit tests."
     },
     "tags": {
       "type": "string",

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

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export default function update(tree: Tree): Promise<void>;

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

@@ -0,0 +1,20 @@
+"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);
+    });
+}
+exports.default = update;

package/src/utils/config.js

@@ -11,7 +11,7 @@ function createWebpackConfig(workspaceRoot, projectRoot, fileReplacements = [],
         const extensions = ['.ts', '.tsx', '.mjs', '.js', '.jsx'];
         let tsConfigPath = (0, path_1.join)(workspaceRoot, projectRoot, 'tsconfig.json');
         if (dependencies.length > 0) {
-            tsConfigPath = (0, buildable_libs_utils_1.createTmpTsConfig)((0, path_1.join)(workspaceRoot, tsConfigPath), workspaceRoot, projectRoot, dependencies);
+            tsConfigPath = (0, buildable_libs_utils_1.createTmpTsConfig)(tsConfigPath, workspaceRoot, projectRoot, dependencies);
         }
         config.resolve.plugins = [
             new tsconfig_paths_webpack_plugin_1.TsconfigPathsPlugin({

package/src/utils/types.d.ts

@@ -41,7 +41,6 @@ export interface NextServeBuilderOptions {
     buildTarget: string;
     customServerTarget?: string;
     hostname?: string;
-    proxyConfig?: string;
     buildLibsFromSource?: boolean;
     keepAliveTimeout?: number;
     turbo?: boolean;