@nrwl/next 14.5.1 → 14.5.4

package/CHANGELOG.md

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [14.5.1](https://github.com/nrwl/nx/compare/14.5.0...14.5.1) (2022-07-28)
+## [14.5.4](https://github.com/nrwl/nx/compare/14.5.3...14.5.4) (2022-08-04)
 
 **Note:** Version bump only for package @nrwl/next

package/generators.json

@@ -25,6 +25,11 @@
       "factory": "./src/generators/component/component#componentSchematic",
       "schema": "./src/generators/component/schema.json",
       "description": "Create a React component."
+    },
+    "custom-server": {
+      "factory": "./src/generators/custom-server/custom-server#customServerSchematic",
+      "schema": "./src/generators/custom-server/schema.json",
+      "description": "Set up a custom server."
     }
   },
   "generators": {
@@ -57,6 +62,11 @@
       "aliases": ["lib"],
       "x-type": "library",
       "description": "Create a library."
+    },
+    "custom-server": {
+      "factory": "./src/generators/custom-server/custom-server#customServerGenerator",
+      "schema": "./src/generators/custom-server/schema.json",
+      "description": "Set up a custom server."
     }
   }
 }

package/migrations.json

@@ -90,6 +90,18 @@
       "version": "14.4.3-beta.0",
       "description": "Add a development outputPath to avoid conflict with the production build.",
       "factory": "./src/migrations/update-14-4-3/add-dev-output-path"
+    },
+    "add-gitignore-entry": {
+      "cli": "nx",
+      "version": "14.5.3-beta.0",
+      "description": "Add .next folder to gitignore.",
+      "factory": "./src/migrations/update-14-5-3/add-gitignore-entry"
+    },
+    "update-dev-output-path": {
+      "cli": "nx",
+      "version": "14.5.3-beta.0",
+      "description": "Update development outputPath to the project root.",
+      "factory": "./src/migrations/update-14-5-3/update-dev-output-path"
     }
   },
   "packageJsonUpdates": {
@@ -321,6 +333,15 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "14.5.3": {
+      "version": "14.5.3-beta.0",
+      "packages": {
+        "@emotion/server": {
+          "version": "11.10.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/next",
-  "version": "14.5.1",
+  "version": "14.5.4",
   "description": "When 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.\n\nThe Next.js plugin 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.",
   "repository": {
     "type": "git",
@@ -34,22 +34,23 @@
   },
   "dependencies": {
     "@babel/plugin-proposal-decorators": "^7.14.5",
-    "@nrwl/cypress": "14.5.1",
-    "@nrwl/devkit": "14.5.1",
-    "@nrwl/jest": "14.5.1",
-    "@nrwl/linter": "14.5.1",
-    "@nrwl/react": "14.5.1",
-    "@nrwl/web": "14.5.1",
-    "@nrwl/workspace": "14.5.1",
+    "@nrwl/cypress": "14.5.4",
+    "@nrwl/devkit": "14.5.4",
+    "@nrwl/jest": "14.5.4",
+    "@nrwl/linter": "14.5.4",
+    "@nrwl/react": "14.5.4",
+    "@nrwl/web": "14.5.4",
+    "@nrwl/workspace": "14.5.4",
     "@svgr/webpack": "^6.1.2",
     "chalk": "4.1.0",
     "dotenv": "~10.0.0",
     "eslint-config-next": "^12.1.0",
     "fs-extra": "^10.1.0",
+    "ignore": "^5.0.4",
     "ts-node": "~10.8.0",
     "tsconfig-paths": "^3.9.0",
     "url-loader": "^4.1.1",
     "webpack-merge": "^5.8.0"
   },
-  "gitHead": "7f259493ac1f0bdb2ba7423d45ac9ec51c3f315c"
+  "gitHead": "bcc00c50e4e74ec991385d686493ff784817638c"
 }

package/src/executors/server/schema.json

@@ -28,9 +28,14 @@
       "description": "Hide error messages containing server information.",
       "default": false
     },
+    "customServerTarget": {
+      "type": "string",
+      "description": "Target which builds the custom server."
+    },
     "customServerPath": {
       "type": "string",
-      "description": "Use a custom server script."
+      "description": "Use a custom server script. (Use `customServerTarget` instead)",
+      "x-deprecated": true
     },
     "hostname": {
       "type": "string",

package/src/executors/server/server.impl.d.ts

@@ -2,6 +2,6 @@ import 'dotenv/config';
 import { ExecutorContext } from '@nrwl/devkit';
 import { NextServeBuilderOptions } from '../../utils/types';
 export default function serveExecutor(options: NextServeBuilderOptions, context: ExecutorContext): AsyncGenerator<{
-    baseUrl: string;
     success: boolean;
+    baseUrl: string;
 }, void, unknown>;

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

@@ -6,16 +6,12 @@ const devkit_1 = require("@nrwl/devkit");
 const chalk = require("chalk");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const devkit_2 = require("@nrwl/devkit");
 const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
-const devkit_3 = require("@nrwl/devkit");
 const config_1 = require("../../utils/config");
 const custom_server_1 = require("./lib/custom-server");
 const default_server_1 = require("./lib/default-server");
-const buildable_libs_1 = require("../../utils/buildable-libs");
 const constants_1 = require("../../utils/constants");
 const infoPrefix = `[ ${chalk.dim(chalk.cyan('info'))} ] `;
-const readyPrefix = `[ ${chalk.green('ready')} ]`;
 function serveExecutor(options, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* serveExecutor_1() {
         // Cast to any to overwrite NODE_ENV
@@ -24,19 +20,33 @@ function serveExecutor(options, context) {
             : options.dev
                 ? 'development'
                 : 'production';
-        let dependencies = [];
-        const buildTarget = (0, devkit_1.parseTargetString)(options.buildTarget);
-        const baseUrl = `http://${options.hostname || 'localhost'}:${options.port}`;
-        const buildOptions = (0, devkit_1.readTargetOptions)(buildTarget, context);
+        // 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);
         const root = (0, path_1.resolve)(context.root, buildOptions.root);
-        const libsDir = (0, path_1.join)(context.root, (0, devkit_3.workspaceLayout)().libsDir);
-        if (!options.buildLibsFromSource) {
-            const result = (0, buildable_libs_utils_1.calculateProjectDependencies)((0, devkit_2.readCachedProjectGraph)(), context.root, context.projectName, 'build', // should be generalized
-            context.configurationName);
-            dependencies = result.dependencies;
-            (0, buildable_libs_1.assertDependentProjectsHaveBeenBuilt)(dependencies, context);
+        const config = yield tslib_1.__await((0, config_1.prepareConfig)(options.dev ? constants_1.PHASE_DEVELOPMENT_SERVER : constants_1.PHASE_PRODUCTION_SERVER, buildOptions, context, getDependencies(options, context), (0, path_1.join)(context.root, (0, devkit_1.workspaceLayout)().libsDir)));
+        if (options.customServerTarget) {
+            yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(runCustomServer(root, config, options, buildOptions, context))));
+        }
+        else {
+            yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(runNextDevServer(root, config, options, buildOptions, context))));
         }
-        const config = yield tslib_1.__await((0, config_1.prepareConfig)(options.dev ? constants_1.PHASE_DEVELOPMENT_SERVER : constants_1.PHASE_PRODUCTION_SERVER, buildOptions, context, dependencies, libsDir));
+    });
+}
+exports.default = serveExecutor;
+function getDependencies(options, context) {
+    if (options.buildLibsFromSource) {
+        return [];
+    }
+    else {
+        const result = (0, buildable_libs_utils_1.calculateProjectDependencies)((0, devkit_1.readCachedProjectGraph)(), context.root, context.projectName, 'build', // should be generalized
+        context.configurationName);
+        return result.dependencies;
+    }
+}
+function runNextDevServer(root, config, options, buildOptions, context) {
+    return tslib_1.__asyncGenerator(this, arguments, function* runNextDevServer_1() {
+        const baseUrl = `http://${options.hostname || 'localhost'}:${options.port}`;
         const settings = {
             dev: options.dev,
             dir: root,
@@ -44,8 +54,10 @@ function serveExecutor(options, context) {
             quiet: options.quiet,
             conf: config,
             port: options.port,
-            path: options.customServerPath,
+            customServer: !!options.customServerTarget,
             hostname: options.hostname,
+            // TOOD(jack): Remove in Nx 15
+            path: options.customServerPath,
         };
         const server = options.customServerPath
             ? custom_server_1.customServer
@@ -61,7 +73,7 @@ function serveExecutor(options, context) {
         }
         try {
             yield tslib_1.__await(server(settings, proxyConfig));
-            devkit_1.logger.info(`${readyPrefix} on ${baseUrl}`);
+            devkit_1.logger.info(`[ ${chalk.green('ready')} ] on ${baseUrl}`);
             yield yield tslib_1.__await({
                 baseUrl,
                 success: true,
@@ -79,5 +91,35 @@ function serveExecutor(options, context) {
         }
     });
 }
-exports.default = serveExecutor;
+function runCustomServer(root, config, options, buildOptions, context) {
+    return tslib_1.__asyncGenerator(this, arguments, function* runCustomServer_1() {
+        var e_1, _a;
+        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), {
+            watch: true,
+        }, context));
+        try {
+            for (var customServerBuild_1 = tslib_1.__asyncValues(customServerBuild), customServerBuild_1_1; customServerBuild_1_1 = yield tslib_1.__await(customServerBuild_1.next()), !customServerBuild_1_1.done;) {
+                const result = customServerBuild_1_1.value;
+                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 }; }
+        finally {
+            try {
+                if (customServerBuild_1_1 && !customServerBuild_1_1.done && (_a = customServerBuild_1.return)) yield tslib_1.__await(_a.call(customServerBuild_1));
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        return yield tslib_1.__await({ success: true });
+    });
+}
 //# sourceMappingURL=server.impl.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"server.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/server/server.impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/server/server.impl.ts"],"names":[],"mappings":"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"}

package/src/generators/application/files/next.config.js__tmpl__

@@ -15,9 +15,6 @@ const nextConfig = {
     // See: https://github.com/gregberge/svgr
     svgr: false,
   },
-  // Set this to true if you use CSS modules.
-  // See: https://github.com/css-modules/css-modules
-  cssModules: false,
 };
 
 module.exports = withLess(withNx(nextConfig));
@@ -33,9 +30,6 @@ const nextConfig = {
     // See: https://github.com/gregberge/svgr
     svgr: false,
   },
-  // Set this to true if you use CSS modules.
-  // See: https://github.com/css-modules/css-modules
-  cssModules: false,
 };
 
 module.exports = withStylus(withNx(nextConfig));

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

@@ -14,7 +14,7 @@ function addProject(host, options) {
         },
         configurations: {
             development: {
-                outputPath: (0, devkit_1.joinPathFragments)('tmp', options.appProjectRoot),
+                outputPath: options.appProjectRoot,
             },
             production: {},
         },

package/src/generators/application/lib/add-project.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-project.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AAEtB,SAAgB,UAAU,CAAC,IAAU,EAAE,OAAyB;IAC9D,MAAM,OAAO,GAAwB,EAAE,CAAC;IAExC,OAAO,CAAC,KAAK,GAAG;QACd,OAAO,EAAE,kBAAkB;QAC3B,OAAO,EAAE,CAAC,sBAAsB,CAAC;QACjC,oBAAoB,EAAE,YAAY;QAClC,OAAO,EAAE;YACP,IAAI,EAAE,OAAO,CAAC,cAAc;YAC5B,UAAU,EAAE,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC;SAC9D;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,UAAU,EAAE,IAAA,0BAAiB,EAAC,KAAK,EAAE,OAAO,CAAC,cAAc,CAAC;aAC7D;YACD,UAAU,EAAE,EAAE;SACf;KACF,CAAC;IAEF,OAAO,CAAC,KAAK,GAAG;QACd,OAAO,EAAE,mBAAmB;QAC5B,oBAAoB,EAAE,aAAa;QACnC,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,QAAQ;YAC3C,GAAG,EAAE,IAAI;SACV;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB;gBACvD,GAAG,EAAE,IAAI;aACV;YACD,UAAU,EAAE;gBACV,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,mBAAmB;gBACtD,GAAG,EAAE,KAAK;aACX;SACF;KACF,CAAC;IAEF,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,OAAO,CAAC,KAAK,CAAC,OAAO,mCAChB,OAAO,CAAC,KAAK,CAAC,OAAO,KACxB,gBAAgB,EAAE,OAAO,CAAC,MAAM,GACjC,CAAC;KACH;IAED,OAAO,CAAC,MAAM,GAAG;QACf,OAAO,EAAE,mBAAmB;QAC5B,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,mBAAmB;SACvD;KACF,CAAC;IAEF,MAAM,OAAO,GAAyB;QACpC,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,UAAU,EAAE,OAAO,CAAC,cAAc;QAClC,WAAW,EAAE,aAAa;QAC1B,OAAO;QACP,IAAI,EAAE,OAAO,CAAC,UAAU;KACzB,CAAC;IAEF,IAAA,gCAAuB,EACrB,IAAI,EACJ,OAAO,CAAC,WAAW,oBAEd,OAAO,GAEZ,OAAO,CAAC,gBAAgB,CACzB,CAAC;AACJ,CAAC;AApED,gCAoEC"}
+{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-project.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AAEtB,SAAgB,UAAU,CAAC,IAAU,EAAE,OAAyB;IAC9D,MAAM,OAAO,GAAwB,EAAE,CAAC;IAExC,OAAO,CAAC,KAAK,GAAG;QACd,OAAO,EAAE,kBAAkB;QAC3B,OAAO,EAAE,CAAC,sBAAsB,CAAC;QACjC,oBAAoB,EAAE,YAAY;QAClC,OAAO,EAAE;YACP,IAAI,EAAE,OAAO,CAAC,cAAc;YAC5B,UAAU,EAAE,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC;SAC9D;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,UAAU,EAAE,OAAO,CAAC,cAAc;aACnC;YACD,UAAU,EAAE,EAAE;SACf;KACF,CAAC;IAEF,OAAO,CAAC,KAAK,GAAG;QACd,OAAO,EAAE,mBAAmB;QAC5B,oBAAoB,EAAE,aAAa;QACnC,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,QAAQ;YAC3C,GAAG,EAAE,IAAI;SACV;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB;gBACvD,GAAG,EAAE,IAAI;aACV;YACD,UAAU,EAAE;gBACV,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,mBAAmB;gBACtD,GAAG,EAAE,KAAK;aACX;SACF;KACF,CAAC;IAEF,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,OAAO,CAAC,KAAK,CAAC,OAAO,mCAChB,OAAO,CAAC,KAAK,CAAC,OAAO,KACxB,gBAAgB,EAAE,OAAO,CAAC,MAAM,GACjC,CAAC;KACH;IAED,OAAO,CAAC,MAAM,GAAG;QACf,OAAO,EAAE,mBAAmB;QAC5B,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,mBAAmB;SACvD;KACF,CAAC;IAEF,MAAM,OAAO,GAAyB;QACpC,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,UAAU,EAAE,OAAO,CAAC,cAAc;QAClC,WAAW,EAAE,aAAa;QAC1B,OAAO;QACP,IAAI,EAAE,OAAO,CAAC,UAAU;KACzB,CAAC;IAEF,IAAA,gCAAuB,EACrB,IAAI,EACJ,OAAO,CAAC,WAAW,oBAEd,OAAO,GAEZ,OAAO,CAAC,gBAAgB,CACzB,CAAC;AACJ,CAAC;AApED,gCAoEC"}

package/src/generators/custom-server/custom-server.d.ts

@@ -0,0 +1,4 @@
+import type { Tree } from '@nrwl/devkit';
+import { CustomServerSchema } from './schema';
+export declare function customServerGenerator(host: Tree, options: CustomServerSchema): Promise<void>;
+export declare const customServerSchematic: (generatorOptions: CustomServerSchema) => (tree: any, context: any) => Promise<any>;

package/src/generators/custom-server/custom-server.js

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.customServerSchematic = exports.customServerGenerator = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+function customServerGenerator(host, options) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const project = (0, devkit_1.readProjectConfiguration)(host, options.project);
+        if (((_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.executor) !== '@nrwl/next:build') {
+            devkit_1.logger.error(`Project ${options.project} is not a Next.js project. Did you generate it with "nx g @nrwl/next:app"?`);
+            return;
+        }
+        const outputPath = (_e = (_d = (_c = project.targets) === null || _c === void 0 ? void 0 : _c.build) === null || _d === void 0 ? void 0 : _d.options) === null || _e === void 0 ? void 0 : _e.outputPath;
+        const root = (_h = (_g = (_f = project.targets) === null || _f === void 0 ? void 0 : _f.build) === null || _g === void 0 ? void 0 : _g.options) === null || _h === void 0 ? void 0 : _h.root;
+        if (!root ||
+            !outputPath ||
+            !((_l = (_k = (_j = project.targets) === null || _j === void 0 ? void 0 : _j.build) === null || _k === void 0 ? void 0 : _k.configurations) === null || _l === void 0 ? void 0 : _l.development) ||
+            !((_p = (_o = (_m = project.targets) === null || _m === void 0 ? void 0 : _m.build) === null || _o === void 0 ? void 0 : _o.configurations) === null || _p === void 0 ? void 0 : _p.production)) {
+            devkit_1.logger.error(`Project ${options.project} has invalid config. Did you generate it with "nx g @nrwl/next:app"?`);
+            return;
+        }
+        if (((_q = project.targets) === null || _q === void 0 ? void 0 : _q['build-custom-server']) ||
+            ((_r = project.targets) === null || _r === void 0 ? void 0 : _r['serve-custom-server'])) {
+            devkit_1.logger.warn(`Project ${options.project} has custom server targets already: build-custom-server, serve-custom-server. Remove these targets from project and try again.`);
+            return;
+        }
+        (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, 'files'), project.root, Object.assign(Object.assign({}, options), { offsetFromRoot: (0, devkit_1.offsetFromRoot)(project.root), projectRoot: project.root, tmpl: '' }));
+        project.targets.build.dependsOn = ['build-custom-server'];
+        project.targets.serve.options.customServerTarget = `${options.project}:serve-custom-server`;
+        project.targets.serve.configurations.development.customServerTarget = `${options.project}:serve-custom-server:development`;
+        project.targets.serve.configurations.production.customServerTarget = `${options.project}:serve-custom-server:production`;
+        project.targets['build-custom-server'] = {
+            executor: '@nrwl/js:tsc',
+            defaultConfiguration: 'production',
+            options: {
+                outputPath,
+                main: `${root}/server/main.ts`,
+                tsConfig: `${root}/tsconfig.server.json`,
+                clean: false,
+                assets: [],
+            },
+            configurations: {
+                development: {},
+                production: {},
+            },
+        };
+        project.targets['serve-custom-server'] = {
+            executor: '@nrwl/js:node',
+            defaultConfiguration: 'development',
+            options: {
+                buildTarget: `${options.project}:build-custom-server`,
+            },
+            configurations: {
+                development: {
+                    buildTarget: `${options.project}:build-custom-server:development`,
+                },
+                production: {
+                    buildTarget: `${options.project}:build-custom-server:production`,
+                },
+            },
+        };
+        (0, devkit_1.updateProjectConfiguration)(host, options.project, project);
+        (0, devkit_1.updateJson)(host, 'nx.json', (json) => {
+            var _a, _b;
+            var _c;
+            (_a = json.tasksRunnerOptions) !== null && _a !== void 0 ? _a : (json.tasksRunnerOptions = {});
+            (_b = (_c = json.tasksRunnerOptions).default) !== null && _b !== void 0 ? _b : (_c.default = { options: {} });
+            json.tasksRunnerOptions.default.options.cacheableOperations = [
+                ...json.tasksRunnerOptions.default.options.cacheableOperations,
+                'build-custom-server',
+            ];
+            return json;
+        });
+    });
+}
+exports.customServerGenerator = customServerGenerator;
+exports.customServerSchematic = (0, devkit_1.convertNxGenerator)(customServerGenerator);
+//# sourceMappingURL=custom-server.js.map

package/src/generators/custom-server/custom-server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"custom-server.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/custom-server/custom-server.ts"],"names":[],"mappings":"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"}

package/src/generators/custom-server/files/server/main.ts__tmpl__

@@ -0,0 +1,56 @@
+/*
+ * This is only a minimal custom server to get started.
+ * You should customize this server with CORS and other security features.
+ */
+import express from 'express';
+import * as path from 'path';
+import next from 'next';
+
+// Next.js server options:
+// - The environment variable is set by `@nrwl/next:server` when running the dev server.
+// - The fallback `__dirname` is for production builds.
+// - Feel free to change this to suit your needs.
+const dir = process.env.NX_NEXT_DIR || path.join(__dirname, '..');
+const publicDir = process.env.NX_NEXT_PUBLIC_DIR || path.join(__dirname, '../public');
+const dev = process.env.NODE_ENV === 'development';
+
+// Express server options:
+// - Feel free to change this to suit your needs.
+const hostname = process.env.HOST || 'localhost';
+const port = process.env.PORT ? parseInt(process.env.PORT) : 4200;
+
+async function main() {
+  const nextApp = next({ dev, dir });
+  const handle = nextApp.getRequestHandler();
+
+  await nextApp.prepare();
+
+  const expressApp = express();
+
+  expressApp.get('/api', (req, res) => {
+    res.send({ message: 'Welcome!' });
+  });
+
+  // Serve static files from public folder.
+  expressApp.use(express.static(publicDir));
+
+  // Redirect requests to Next.js app.
+  expressApp.all('*', (req, res) => {
+    console.log('Forwarding request to Next.js: ', req.url);
+    handle(req, res)
+  });
+
+  return new Promise<void>((resolve, reject) => {
+    expressApp.on('error', (err) => reject(err));
+    expressApp.listen(port, () => {
+      console.log(`[ ready ] on http://${hostname}:${port}`)
+      resolve();
+    });
+  });
+}
+
+main().catch((err) => {
+  console.error(err);
+  process.exit(1);
+});
+

package/src/generators/custom-server/files/tsconfig.server.json__tmpl__

@@ -0,0 +1,15 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "noEmit": false,
+    "incremental": true,
+    "tsBuildInfoFile": "<%= offsetFromRoot %>/tmp/buildcache/<%= projectRoot %>/server",
+    "types": [
+      "node"
+    ]
+  },
+  "include": [
+    "server/**/*.ts"
+  ]
+}

package/src/generators/custom-server/schema.d.ts

@@ -0,0 +1,4 @@
+export interface CustomServerSchema {
+  project: string;
+  compiler?: 'tsc' | 'swc';
+}

package/src/generators/custom-server/schema.json

@@ -0,0 +1,34 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "cli": "nx",
+  "$id": "NxNextCustomServer",
+  "title": "Add custom server",
+  "description": "Add a custom server to existing Next.js application.",
+  "examples": [
+    {
+      "command": "nx g custom-server my-app",
+      "description": "Add a custom server to existing Next.js app."
+    }
+  ],
+  "type": "object",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "The name of the project.",
+      "alias": "p",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-dropdown": "project",
+      "x-prompt": "What is the name of the project to set up a custom server for?"
+    },
+    "compiler": {
+      "type": "string",
+      "enum": ["tsc", "swc"],
+      "default": "tsc",
+      "description": "The compiler used to build the custom server."
+    }
+  },
+  "required": ["project"]
+}

package/src/generators/init/init.js

@@ -8,6 +8,7 @@ const jest_1 = require("@nrwl/jest");
 const cypress_1 = require("@nrwl/cypress");
 const react_1 = require("@nrwl/react");
 const versions_1 = require("../../utils/versions");
+const add_gitignore_entry_1 = require("../../utils/add-gitignore-entry");
 function updateDependencies(host) {
     return (0, devkit_1.addDependenciesToPackageJson)(host, {
         '@nrwl/next': versions_1.nxVersion,
@@ -34,6 +35,7 @@ function nextInitGenerator(host, schema) {
         tasks.push(reactTask);
         const installTask = updateDependencies(host);
         tasks.push(installTask);
+        (0, add_gitignore_entry_1.addGitIgnoreEntry)(host);
         return (0, run_tasks_in_serial_1.runTasksInSerial)(...tasks);
     });
 }

package/src/generators/init/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AACtB,2FAAqF;AACrF,qCAA+C;AAC/C,2CAAqD;AACrD,uCAAgF;AAEhF,mDAK8B;AAG9B,SAAS,kBAAkB,CAAC,IAAU;IACpC,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,YAAY,EAAE,oBAAS;QACvB,IAAI,EAAE,sBAAW;QACjB,KAAK,EAAE,oBAAY;QACnB,WAAW,EAAE,uBAAe;QAC5B,KAAK,EAAE,uBAAY;KACpB,EACD;QACE,oBAAoB,EAAE,kCAAuB;KAC9C,CACF,CAAC;AACJ,CAAC;AAED,SAAsB,iBAAiB,CAAC,IAAU,EAAE,MAAkB;;QACpE,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,KAAK,MAAM,EAAE;YAC9D,MAAM,QAAQ,GAAG,IAAA,wBAAiB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACjD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACtB;QACD,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,KAAK,SAAS,EAAE;YAC/D,MAAM,WAAW,GAAG,IAAA,8BAAoB,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACnD,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,MAAM,SAAS,GAAG,MAAM,IAAA,0BAAkB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzD,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEtB,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC7C,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAExB,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAnBD,8CAmBC;AAED,kBAAe,iBAAiB,CAAC;AACpB,QAAA,iBAAiB,GAAG,IAAA,2BAAkB,EAAC,iBAAiB,CAAC,CAAC"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,2FAAqF;AACrF,qCAA+C;AAC/C,2CAAqD;AACrD,uCAAgF;AAEhF,mDAK8B;AAE9B,yEAAoE;AAEpE,SAAS,kBAAkB,CAAC,IAAU;IACpC,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,YAAY,EAAE,oBAAS;QACvB,IAAI,EAAE,sBAAW;QACjB,KAAK,EAAE,oBAAY;QACnB,WAAW,EAAE,uBAAe;QAC5B,KAAK,EAAE,uBAAY;KACpB,EACD;QACE,oBAAoB,EAAE,kCAAuB;KAC9C,CACF,CAAC;AACJ,CAAC;AAED,SAAsB,iBAAiB,CAAC,IAAU,EAAE,MAAkB;;QACpE,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,KAAK,MAAM,EAAE;YAC9D,MAAM,QAAQ,GAAG,IAAA,wBAAiB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACjD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACtB;QACD,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,KAAK,SAAS,EAAE;YAC/D,MAAM,WAAW,GAAG,IAAA,8BAAoB,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACnD,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,MAAM,SAAS,GAAG,MAAM,IAAA,0BAAkB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzD,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEtB,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC7C,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAExB,IAAA,uCAAiB,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AArBD,8CAqBC;AAED,kBAAe,iBAAiB,CAAC;AACpB,QAAA,iBAAiB,GAAG,IAAA,2BAAkB,EAAC,iBAAiB,CAAC,CAAC"}

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

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

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

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.update = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/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);
+    });
+}
+exports.update = update;
+exports.default = update;
+//# sourceMappingURL=add-gitignore-entry.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"add-gitignore-entry.js","sourceRoot":"","sources":["../../../../../../packages/next/src/migrations/update-14-5-3/add-gitignore-entry.ts"],"names":[],"mappings":";;;;AAAA,yCAAiD;AACjD,yEAAoE;AAEpE,SAAsB,MAAM,CAAC,IAAU;;QACrC,IAAA,uCAAiB,EAAC,IAAI,CAAC,CAAC;QACxB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAHD,wBAGC;AAED,kBAAe,MAAM,CAAC"}

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

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

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

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.update = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/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);
+                }
+            }
+        });
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.update = update;
+exports.default = update;
+//# sourceMappingURL=update-dev-output-path.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"update-dev-output-path.js","sourceRoot":"","sources":["../../../../../../packages/next/src/migrations/update-14-5-3/update-dev-output-path.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AAEtB,SAAsB,MAAM,CAAC,IAAU;;QACrC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;;;YAChC,IAAI,CAAA,MAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,KAAK,0CAAE,QAAQ,MAAK,kBAAkB,EAAE;gBAC1D,YAAA,MAAM,CAAC,OAAO,CAAC,KAAK,EAAC,cAAc,uCAAd,cAAc,GAAK,EAAE,EAAC;gBAC3C,YAAA,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,EAAC,WAAW,uCAAX,WAAW,GAAK,EAAE,EAAC;gBACvD,IACE,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,UAAU;oBAC3D,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,UAAU;wBACxD,IAAA,0BAAiB,EAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,EACvC;oBACA,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,UAAU;wBACxD,MAAM,CAAC,IAAI,CAAC;oBACd,IAAA,mCAA0B,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;iBAChD;aACF;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AApBD,wBAoBC;AAED,kBAAe,MAAM,CAAC"}

package/src/utils/add-gitignore-entry.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from 'nx/src/generators/tree';
+export declare function addGitIgnoreEntry(host: Tree): void;

package/src/utils/add-gitignore-entry.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addGitIgnoreEntry = void 0;
+const ignore_1 = require("ignore");
+function addGitIgnoreEntry(host) {
+    if (!host.exists('.gitignore')) {
+        return;
+    }
+    let content = host.read('.gitignore', 'utf-8').trimEnd();
+    const ig = (0, ignore_1.default)();
+    ig.add(host.read('.gitignore', 'utf-8'));
+    if (!ig.ignores('apps/example/.next')) {
+        content = `${content}\n\n# Next.js\n.next\n`;
+    }
+    host.write('.gitignore', content);
+}
+exports.addGitIgnoreEntry = addGitIgnoreEntry;
+//# sourceMappingURL=add-gitignore-entry.js.map

package/src/utils/add-gitignore-entry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-gitignore-entry.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/add-gitignore-entry.ts"],"names":[],"mappings":";;;AACA,mCAA4B;AAE5B,SAAgB,iBAAiB,CAAC,IAAU;IAC1C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;QAC9B,OAAO;KACR;IAED,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;IAEzD,MAAM,EAAE,GAAG,IAAA,gBAAM,GAAE,CAAC;IACpB,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;IAEzC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE;QACrC,OAAO,GAAG,GAAG,OAAO,wBAAwB,CAAC;KAC9C;IAED,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;AACpC,CAAC;AAfD,8CAeC"}

package/src/utils/types.d.ts

@@ -16,6 +16,7 @@ export interface NextServerOptions {
     port: number;
     path: string;
     hostname: string;
+    customServer?: boolean;
 }
 export interface FileReplacement {
     replace: string;
@@ -28,6 +29,7 @@ export interface NextBuildBuilderOptions {
     assets?: any[];
     nextConfig?: string;
     buildLibsFromSource?: boolean;
+    watch?: boolean;
 }
 export interface NextServeBuilderOptions {
     dev: boolean;
@@ -35,6 +37,9 @@ export interface NextServeBuilderOptions {
     staticMarkup: boolean;
     quiet: boolean;
     buildTarget: string;
+    customServerTarget?: string;
+    /** @deprecated Use customServerTarget
+     */
     customServerPath?: string;
     hostname?: string;
     proxyConfig?: string;

package/src/utils/versions.d.ts

@@ -4,6 +4,6 @@ export declare const eslintConfigNextVersion = "12.2.3";
 export declare const sassVersion = "1.54.0";
 export declare const lessLoader = "11.0.0";
 export declare const stylusLoader = "7.0.0";
-export declare const emotionServerVersion = "11.4.0";
+export declare const emotionServerVersion = "11.10.0";
 export declare const babelPluginStyledComponentsVersion = "1.10.7";
 export declare const tsLibVersion = "^2.3.0";

package/src/utils/versions.js

@@ -7,7 +7,7 @@ exports.eslintConfigNextVersion = '12.2.3';
 exports.sassVersion = '1.54.0';
 exports.lessLoader = '11.0.0';
 exports.stylusLoader = '7.0.0';
-exports.emotionServerVersion = '11.4.0';
+exports.emotionServerVersion = '11.10.0';
 exports.babelPluginStyledComponentsVersion = '1.10.7';
 exports.tsLibVersion = '^2.3.0';
 //# sourceMappingURL=versions.js.map

package/src/utils/versions.js.map

@@ -1 +1 @@
-{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,UAAU,GAAG,QAAQ,CAAC;AACtB,QAAA,YAAY,GAAG,OAAO,CAAC;AACvB,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,kCAAkC,GAAG,QAAQ,CAAC;AAC9C,QAAA,YAAY,GAAG,QAAQ,CAAC"}
+{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,UAAU,GAAG,QAAQ,CAAC;AACtB,QAAA,YAAY,GAAG,OAAO,CAAC;AACvB,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,kCAAkC,GAAG,QAAQ,CAAC;AAC9C,QAAA,YAAY,GAAG,QAAQ,CAAC"}