@nrwl/next 14.5.6 → 14.5.7

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.6](https://github.com/nrwl/nx/compare/14.5.5...14.5.6) (2022-08-14)
+## [14.5.7](https://github.com/nrwl/nx/compare/14.5.6...14.5.7) (2022-08-17)
 
 **Note:** Version bump only for package @nrwl/next

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/next",
-  "version": "14.5.6",
+  "version": "14.5.7",
   "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,13 +34,13 @@
   },
   "dependencies": {
     "@babel/plugin-proposal-decorators": "^7.14.5",
-    "@nrwl/cypress": "14.5.6",
-    "@nrwl/devkit": "14.5.6",
-    "@nrwl/jest": "14.5.6",
-    "@nrwl/linter": "14.5.6",
-    "@nrwl/react": "14.5.6",
-    "@nrwl/web": "14.5.6",
-    "@nrwl/workspace": "14.5.6",
+    "@nrwl/cypress": "14.5.7",
+    "@nrwl/devkit": "14.5.7",
+    "@nrwl/jest": "14.5.7",
+    "@nrwl/linter": "14.5.7",
+    "@nrwl/react": "14.5.7",
+    "@nrwl/web": "14.5.7",
+    "@nrwl/workspace": "14.5.7",
     "@svgr/webpack": "^6.1.2",
     "chalk": "4.1.0",
     "dotenv": "~10.0.0",
@@ -52,5 +52,5 @@
     "url-loader": "^4.1.1",
     "webpack-merge": "^5.8.0"
   },
-  "gitHead": "608141ec7c3f8718419fc869f506196180e2bf2c"
+  "gitHead": "f8085d094993a3999b41dca787ecfef0f2be7b83"
 }

package/src/generators/application/application.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationSchematic = exports.applicationGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
+const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
 const normalize_options_1 = require("./lib/normalize-options");
 const add_cypress_1 = require("./lib/add-cypress");
 const add_jest_1 = require("./lib/add-jest");
@@ -14,7 +15,7 @@ const update_jest_config_1 = require("./lib/update-jest-config");
 const init_1 = require("../init/init");
 const styles_1 = require("../../utils/styles");
 const add_linting_1 = require("./lib/add-linting");
-const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
+const custom_server_1 = require("../custom-server/custom-server");
 function applicationGenerator(host, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const options = (0, normalize_options_1.normalizeOptions)(host, schema);
@@ -28,6 +29,12 @@ function applicationGenerator(host, schema) {
         (0, update_jest_config_1.updateJestConfig)(host, options);
         const styledTask = (0, styles_1.addStyleDependencies)(host, options.style);
         (0, set_defaults_1.setDefaults)(host, options);
+        if (options.customServer) {
+            yield (0, custom_server_1.customServerGenerator)(host, {
+                project: options.name,
+                compiler: options.swc ? 'swc' : 'tsc',
+            });
+        }
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(host);
         }

package/src/generators/application/application.js.map

@@ -1 +1 @@
-{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/application/application.ts"],"names":[],"mappings":";;;;AAAA,yCAAqE;AAErE,+DAA2D;AAE3D,mDAA+C;AAC/C,6CAAyC;AACzC,mDAA+C;AAC/C,6EAAwE;AACxE,6EAAuE;AACvE,qDAAiD;AACjD,iEAA4D;AAC5D,uCAAiD;AACjD,+CAA0D;AAC1D,mDAA+C;AAC/C,2FAAqF;AAErF,SAAsB,oBAAoB,CAAC,IAAU,EAAE,MAAc;;QACnE,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAiB,EAAC,IAAI,kCACxC,OAAO,KACV,UAAU,EAAE,IAAI,IAChB,CAAC;QACH,IAAA,iDAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtC,IAAA,gDAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACrC,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1B,MAAM,WAAW,GAAG,MAAM,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpD,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAO,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjD,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChC,MAAM,UAAU,GAAG,IAAA,6BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QAC7D,IAAA,0BAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3B,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EACrB,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,UAAU,CACX,CAAC;IACJ,CAAC;CAAA;AA5BD,oDA4BC;AAEY,QAAA,oBAAoB,GAAG,IAAA,2BAAkB,EAAC,oBAAoB,CAAC,CAAC"}
+{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/application/application.ts"],"names":[],"mappings":";;;;AAAA,yCAAqE;AACrE,2FAAqF;AAErF,+DAA2D;AAE3D,mDAA+C;AAC/C,6CAAyC;AACzC,mDAA+C;AAC/C,6EAAwE;AACxE,6EAAuE;AACvE,qDAAiD;AACjD,iEAA4D;AAC5D,uCAAiD;AACjD,+CAA0D;AAC1D,mDAA+C;AAC/C,kEAAuE;AAEvE,SAAsB,oBAAoB,CAAC,IAAU,EAAE,MAAc;;QACnE,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAiB,EAAC,IAAI,kCACxC,OAAO,KACV,UAAU,EAAE,IAAI,IAChB,CAAC;QACH,IAAA,iDAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtC,IAAA,gDAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACrC,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1B,MAAM,WAAW,GAAG,MAAM,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpD,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAO,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjD,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChC,MAAM,UAAU,GAAG,IAAA,6BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QAC7D,IAAA,0BAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3B,IAAI,OAAO,CAAC,YAAY,EAAE;YACxB,MAAM,IAAA,qCAAqB,EAAC,IAAI,EAAE;gBAChC,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK;aACtC,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EACrB,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,UAAU,CACX,CAAC;IACJ,CAAC;CAAA;AAnCD,oDAmCC;AAEY,QAAA,oBAAoB,GAAG,IAAA,2BAAkB,EAAC,oBAAoB,CAAC,CAAC"}

package/src/generators/application/schema.d.ts

@@ -16,4 +16,5 @@ export interface Schema {
   setParserOptionsProject?: boolean;
   standaloneConfig?: boolean;
   swc?: boolean;
+  customServer?: boolean;
 }

package/src/generators/application/schema.json

@@ -119,6 +119,11 @@
       "description": "Enable the Rust-based compiler SWC to compile JS/TS files.",
       "type": "boolean",
       "default": true
+    },
+    "customServer": {
+      "description": "Use a custom Express server for the Next.js application.",
+      "type": "boolean",
+      "default": false
     }
   },
   "required": []

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

@@ -1,8 +1,13 @@
 /*
  * This is only a minimal custom server to get started.
- * You should customize this server with CORS and other security features.
+ * You may want to consider using Express or another server framework, and enable security features such as CORS.
+ *
+ * For more examples, see the Next.js repo:
+ * - Express: https://github.com/vercel/next.js/tree/canary/examples/custom-server-express
+ * - Hapi: https://github.com/vercel/next.js/tree/canary/examples/custom-server-hapi
  */
-import express from 'express';
+import { createServer } from 'http';
+import { parse } from 'url';
 import * as path from 'path';
 import next from 'next';
 
@@ -11,10 +16,9 @@ import next from 'next';
 // - 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:
+// HTTP 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;
@@ -25,28 +29,14 @@ async function main() {
 
   await nextApp.prepare();
 
-  const expressApp = express();
-
-  expressApp.get('/api', (req, res) => {
-    res.send({ message: 'Welcome!' });
+  const server = createServer((req, res) => {
+    const parsedUrl = parse(req.url, true);
+    handle(req, res, parsedUrl);
   });
 
-  // 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)
-  });
+  server.listen(port, hostname);
 
-  return new Promise<void>((resolve, reject) => {
-    expressApp.on('error', (err) => reject(err));
-    expressApp.listen(port, () => {
-      console.log(`[ ready ] on http://${hostname}:${port}`)
-      resolve();
-    });
-  });
+  console.log(`[ ready ] on http://${hostname}:${port}`)
 }
 
 main().catch((err) => {