@nx/next 16.3.0-beta.0 → 16.3.0-beta.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "16.3.0-beta.0",
+  "version": "16.3.0-beta.11",
   "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,14 @@
   },
   "dependencies": {
     "@babel/plugin-proposal-decorators": "^7.14.5",
-    "@nrwl/next": "16.3.0-beta.0",
-    "@nx/devkit": "16.3.0-beta.0",
-    "@nx/js": "16.3.0-beta.0",
-    "@nx/linter": "16.3.0-beta.0",
-    "@nx/react": "16.3.0-beta.0",
-    "@nx/workspace": "16.3.0-beta.0",
-    "@svgr/webpack": "^6.1.2",
+    "@nrwl/next": "16.3.0-beta.11",
+    "@nx/devkit": "16.3.0-beta.11",
+    "@nx/js": "16.3.0-beta.11",
+    "@nx/linter": "16.3.0-beta.11",
+    "@nx/react": "16.3.0-beta.11",
+    "@nx/web": "16.3.0-beta.11",
+    "@nx/workspace": "16.3.0-beta.11",
+    "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
     "copy-webpack-plugin": "^10.2.4",
     "dotenv": "~10.0.0",
@@ -60,5 +61,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "74c5ad330622238c7f80df55454e9dbdc792cb22"
+  "gitHead": "6b9d24c7b65961c10ba21f1e62ffe06477d02394"
 }

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

@@ -36,7 +36,7 @@ function buildExecutor(options, context) {
         }
         const { experimentalAppOnly, profile, debug } = options;
         const args = (0, create_cli_options_1.createCliOptions)({ experimentalAppOnly, profile, debug });
-        const command = `npx next build ${args}`;
+        const command = `npx next build ${args.join(' ')}`;
         const execSyncOptions = {
             stdio: 'inherit',
             encoding: 'utf-8',

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

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

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

@@ -1,7 +1,14 @@
 import type { ExecutorContext } from '@nx/devkit';
 import type { NextBuildBuilderOptions } from '../../../utils/types';
 export declare function createNextConfigFile(options: NextBuildBuilderOptions, context: ExecutorContext): void;
-export declare function getWithNxContent({ withNxFile, withNxContent }?: {
-    withNxFile: string;
-    withNxContent: string;
+export declare function getWithNxContent({ file, content }?: {
+    file: string;
+    content: string;
 }): string;
+export declare function findNextConfigPath(dirname: string, userDefinedConfigPath?: string): string;
+export declare function getRelativeFilesToCopy(fileName: string, cwd: string): string[];
+export declare function getRelativeImports({ file, content, }: {
+    file: string;
+    content: string;
+}): string[];
+export declare function ensureFileExtensions(files: string[], absoluteDir: string): string[];

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

@@ -1,51 +1,57 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWithNxContent = exports.createNextConfigFile = void 0;
+exports.ensureFileExtensions = exports.getRelativeImports = exports.getRelativeFilesToCopy = exports.findNextConfigPath = exports.getWithNxContent = exports.createNextConfigFile = void 0;
 const devkit_1 = require("@nx/devkit");
 const ts = require("typescript");
-const fs_1 = require("fs");
+const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const typescript_1 = require("nx/src/utils/typescript");
 function createNextConfigFile(options, context) {
-    const nextConfigPath = options.nextConfig
-        ? (0, path_1.join)(context.root, options.nextConfig)
-        : (0, path_1.join)(context.root, options.root, 'next.config.js');
+    const configRelativeToProjectRoot = findNextConfigPath(options.root, 
+    // If user passed a config then it is relative to the workspace root, need to normalize it to be relative to the project root.
+    options.nextConfig ? (0, path_1.relative)(options.root, options.nextConfig) : undefined);
+    const configAbsolutePath = (0, path_1.join)(options.root, configRelativeToProjectRoot);
+    if (!(0, fs_extra_1.existsSync)(configAbsolutePath)) {
+        throw new Error('next.config.js not found');
+    }
     // Copy config file and our `.nx-helpers` folder to remove dependency on @nrwl/next for production build.
-    if ((0, fs_1.existsSync)(nextConfigPath)) {
-        const helpersPath = (0, path_1.join)(options.outputPath, '.nx-helpers');
-        (0, fs_1.mkdirSync)(helpersPath, { recursive: true });
-        (0, fs_1.copyFileSync)((0, path_1.join)(__dirname, '../../../utils/compose-plugins.js'), (0, path_1.join)(helpersPath, 'compose-plugins.js'));
-        (0, fs_1.writeFileSync)((0, path_1.join)(helpersPath, 'with-nx.js'), getWithNxContent());
-        (0, fs_1.writeFileSync)((0, path_1.join)(helpersPath, 'compiled.js'), `
+    const helpersPath = (0, path_1.join)(options.outputPath, '.nx-helpers');
+    (0, fs_extra_1.mkdirSync)(helpersPath, { recursive: true });
+    (0, fs_extra_1.copyFileSync)((0, path_1.join)(__dirname, '../../../utils/compose-plugins.js'), (0, path_1.join)(helpersPath, 'compose-plugins.js'));
+    (0, fs_extra_1.writeFileSync)((0, path_1.join)(helpersPath, 'with-nx.js'), getWithNxContent());
+    (0, fs_extra_1.writeFileSync)((0, path_1.join)(helpersPath, 'compiled.js'), `
         const withNx = require('./with-nx');
         module.exports = withNx;
         module.exports.withNx = withNx;
         module.exports.composePlugins = require('./compose-plugins').composePlugins;
       `);
-        (0, fs_1.writeFileSync)((0, path_1.join)(options.outputPath, 'next.config.js'), (0, fs_1.readFileSync)(nextConfigPath)
-            .toString()
-            .replace(/["']@nx\/next["']/, `'./.nx-helpers/compiled.js'`)
-            // TODO(v17): Remove this once users have all migrated to new @nx scope and import from '@nx/next' not the deep import paths.
-            .replace('@nx/next/plugins/with-nx', './.nx-helpers/compiled.js')
-            .replace('@nrwl/next/plugins/with-nx', './.nx-helpers/compiled.js'));
+    (0, fs_extra_1.writeFileSync)((0, path_1.join)(options.outputPath, configRelativeToProjectRoot), (0, fs_extra_1.readFileSync)(configAbsolutePath)
+        .toString()
+        .replace(/["']@nx\/next["']/, `'./.nx-helpers/compiled.js'`)
+        // TODO(v17): Remove this once users have all migrated to new @nx scope and import from '@nx/next' not the deep import paths.
+        .replace('@nx/next/plugins/with-nx', './.nx-helpers/compiled.js')
+        .replace('@nrwl/next/plugins/with-nx', './.nx-helpers/compiled.js'));
+    // Find all relative imports needed by next.config.js and copy them to the dist folder.
+    const moduleFilesToCopy = getRelativeFilesToCopy(configRelativeToProjectRoot, options.root);
+    for (const moduleFile of moduleFilesToCopy) {
+        (0, fs_extra_1.ensureDirSync)((0, path_1.dirname)((0, path_1.join)(context.root, options.outputPath, moduleFile)));
+        (0, fs_extra_1.copyFileSync)((0, path_1.join)(context.root, options.root, moduleFile), (0, path_1.join)(context.root, options.outputPath, moduleFile));
     }
 }
 exports.createNextConfigFile = createNextConfigFile;
-function readSource() {
-    const withNxFile = (0, path_1.join)(__dirname, '../../../../plugins/with-nx.js');
-    const withNxContent = (0, fs_1.readFileSync)(withNxFile).toString();
+function readSource(getFile) {
     return {
-        withNxFile,
-        withNxContent,
+        file: getFile(),
+        content: (0, fs_extra_1.readFileSync)(getFile()).toString(),
     };
 }
 // Exported for testing
-function getWithNxContent({ withNxFile, withNxContent } = readSource()) {
+function getWithNxContent({ file, content } = readSource(() => (0, path_1.join)(__dirname, '../../../../plugins/with-nx.js'))) {
     var _a;
-    const withNxSource = ts.createSourceFile(withNxFile, withNxContent, ts.ScriptTarget.Latest, true);
+    const withNxSource = ts.createSourceFile(file, content, ts.ScriptTarget.Latest, true);
     const getWithNxContextDeclaration = (_a = (0, typescript_1.findNodes)(withNxSource, ts.SyntaxKind.FunctionDeclaration)) === null || _a === void 0 ? void 0 : _a.find((node) => { var _a; return ((_a = node.name) === null || _a === void 0 ? void 0 : _a.text) === 'getWithNxContext'; });
     if (getWithNxContextDeclaration) {
-        withNxContent = (0, devkit_1.applyChangesToString)(withNxContent, [
+        content = (0, devkit_1.applyChangesToString)(content, [
             {
                 type: devkit_1.ChangeType.Delete,
                 start: getWithNxContextDeclaration.getStart(withNxSource),
@@ -63,7 +69,88 @@ function getWithNxContent({ withNxFile, withNxContent } = readSource()) {
             },
         ]);
     }
-    return withNxContent;
+    return content;
 }
 exports.getWithNxContent = getWithNxContent;
+function findNextConfigPath(dirname, userDefinedConfigPath) {
+    if (userDefinedConfigPath) {
+        const file = userDefinedConfigPath;
+        if ((0, fs_extra_1.existsSync)(file))
+            return file;
+        throw new Error(`Cannot find the Next.js config file: ${userDefinedConfigPath}. Is the path correct in project.json?`);
+    }
+    const candidates = ['next.config.js', 'next.config.cjs', 'next.config.mjs'];
+    for (const candidate of candidates) {
+        if ((0, fs_extra_1.existsSync)((0, path_1.join)(dirname, candidate)))
+            return candidate;
+    }
+    throw new Error(`Cannot find any of the following files in your project: ${candidates.join(', ')}. Is this a Next.js project?`);
+}
+exports.findNextConfigPath = findNextConfigPath;
+// Exported for testing
+function getRelativeFilesToCopy(fileName, cwd) {
+    const seen = new Set();
+    const collected = new Set();
+    function doCollect(currFile) {
+        // Prevent circular dependencies from causing infinite loop
+        if (seen.has(currFile))
+            return;
+        seen.add(currFile);
+        const absoluteFilePath = (0, path_1.join)(cwd, currFile);
+        const content = (0, fs_extra_1.readFileSync)(absoluteFilePath).toString();
+        const files = getRelativeImports({ file: currFile, content });
+        const modules = ensureFileExtensions(files, (0, path_1.dirname)(absoluteFilePath));
+        const relativeDirPath = (0, path_1.dirname)(currFile);
+        for (const moduleName of modules) {
+            const relativeModulePath = (0, path_1.join)(relativeDirPath, moduleName);
+            collected.add(relativeModulePath);
+            doCollect(relativeModulePath);
+        }
+    }
+    doCollect(fileName);
+    return Array.from(collected);
+}
+exports.getRelativeFilesToCopy = getRelativeFilesToCopy;
+// Exported for testing
+function getRelativeImports({ file, content, }) {
+    const source = ts.createSourceFile(file, content, ts.ScriptTarget.Latest, true);
+    const callExpressionsOrImportDeclarations = (0, typescript_1.findNodes)(source, [
+        ts.SyntaxKind.CallExpression,
+        ts.SyntaxKind.ImportDeclaration,
+    ]);
+    const modulePaths = [];
+    for (const node of callExpressionsOrImportDeclarations) {
+        if (node.kind === ts.SyntaxKind.ImportDeclaration) {
+            modulePaths.push(stripOuterQuotes(node.moduleSpecifier.getText(source)));
+        }
+        else {
+            if (node.expression.getText(source) === 'require') {
+                modulePaths.push(stripOuterQuotes(node.arguments[0].getText(source)));
+            }
+        }
+    }
+    return modulePaths.filter((path) => path.startsWith('.'));
+}
+exports.getRelativeImports = getRelativeImports;
+function stripOuterQuotes(str) {
+    var _a, _b;
+    return (_b = (_a = str.match(/^["'](.*)["']/)) === null || _a === void 0 ? void 0 : _a[1]) !== null && _b !== void 0 ? _b : str;
+}
+// Exported for testing
+function ensureFileExtensions(files, absoluteDir) {
+    const extensions = ['.js', '.cjs', '.mjs'];
+    return files.map((file) => {
+        const providedExt = (0, path_1.extname)(file);
+        if (providedExt && extensions.includes(providedExt))
+            return file;
+        const ext = extensions.find((ext) => (0, fs_extra_1.existsSync)((0, path_1.join)(absoluteDir, file + ext)));
+        if (ext) {
+            return file + ext;
+        }
+        else {
+            throw new Error(`Cannot find file "${file}" with any of the following extensions: ${extensions.join(', ')}`);
+        }
+    });
+}
+exports.ensureFileExtensions = ensureFileExtensions;
 //# sourceMappingURL=create-next-config-file.js.map

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

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

package/src/executors/build/schema.json

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "outputCapture": "direct-nodejs",
+  "outputCapture": "pipe",
   "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "title": "Next Build",

package/src/executors/export/schema.json

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "outputCapture": "direct-nodejs",
+  "outputCapture": "pipe",
   "cli": "nx",
   "title": "Next Export",
   "description": "Export a Next.js application. The exported application is located at `dist/$outputPath/exported`.",

package/src/executors/server/schema.json

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "outputCapture": "direct-nodejs",
+  "outputCapture": "pipe",
   "cli": "nx",
   "title": "Next Serve",
   "description": "Serve a Next.js app.",
@@ -54,6 +54,10 @@
     "keepAliveTimeout": {
       "type": "number",
       "description": "Max milliseconds to wait before closing inactive connection."
+    },
+    "turbo": {
+      "type": "boolean",
+      "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"]

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

@@ -2,18 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 require("dotenv/config");
-const net = require("net");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const child_process_1 = require("child_process");
 const custom_server_impl_1 = require("./custom-server.impl");
 const create_cli_options_1 = require("../../utils/create-cli-options");
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
+const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
 function serveExecutor(options, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* serveExecutor_1() {
         if (options.customServerTarget) {
             return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, custom_server_impl_1.default)(options, context)))));
         }
+        const buildOptions = (0, devkit_1.readTargetOptions)((0, devkit_1.parseTargetString)(options.buildTarget, context.projectGraph), context);
+        const root = (0, path_1.resolve)(context.root, buildOptions.root);
+        const { port, keepAliveTimeout, hostname } = options;
+        // This is required for the default custom server to work. See the @nx/next:app generator.
+        process.env.NX_NEXT_DIR = root;
         // Cast to any to overwrite NODE_ENV
         process.env.NODE_ENV = process.env.NODE_ENV
             ? process.env.NODE_ENV
@@ -21,52 +26,19 @@ function serveExecutor(options, context) {
                 ? 'development'
                 : '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 root = (0, path_1.resolve)(context.root, buildOptions.root);
-        const { port, keepAliveTimeout, hostname } = options;
+        process.env.PORT = `${options.port}`;
         const args = (0, create_cli_options_1.createCliOptions)({ port, keepAliveTimeout, hostname });
         const nextDir = (0, path_1.resolve)(context.root, buildOptions.outputPath);
-        const command = `npx next ${options.dev ? `dev ${args}` : `start ${args}`}`;
-        yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, async_iterable_1.createAsyncIterable)(({ done, next, error }) => {
-            // Client to check if server is ready.
-            const client = new net.Socket();
-            const cleanupClient = () => {
-                client.removeAllListeners('connect');
-                client.removeAllListeners('error');
-                client.end();
-                client.destroy();
-                client.unref();
-            };
-            const waitForServerReady = (retries = 30) => {
-                const allowedErrorCodes = ['ECONNREFUSED', 'ECONNRESET'];
-                client.once('connect', () => {
-                    var _a;
-                    cleanupClient();
-                    next({
-                        success: true,
-                        baseUrl: `http://${(_a = options.hostname) !== null && _a !== void 0 ? _a : 'localhost'}:${port}`,
-                    });
-                });
-                client.on('error', (err) => {
-                    if (retries === 0 || !allowedErrorCodes.includes(err['code'])) {
-                        cleanupClient();
-                        error(err);
-                    }
-                    else {
-                        setTimeout(() => waitForServerReady(retries - 1), 1000);
-                    }
-                });
-                client.connect({ port, host: '127.0.0.1' });
-            };
-            const server = (0, child_process_1.spawn)(command, {
+        const mode = options.dev ? 'dev' : 'start';
+        const turbo = options.turbo && options.dev ? '--turbo' : '';
+        const nextBin = require.resolve('next/dist/bin/next');
+        yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, async_iterable_1.createAsyncIterable)(({ done, next, error }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const server = (0, child_process_1.fork)(nextBin, [mode, ...args, turbo], {
                 cwd: options.dev ? root : nextDir,
                 stdio: 'inherit',
-                shell: true,
             });
-            waitForServerReady();
             server.once('exit', (code) => {
-                cleanupClient();
                 if (code === 0) {
                     done();
                 }
@@ -74,18 +46,21 @@ function serveExecutor(options, context) {
                     error(new Error(`Next.js app exited with code ${code}`));
                 }
             });
-            process.on('exit', (code) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                if (code === 128 + 2) {
-                    server.kill('SIGINT');
-                }
-                else if (code === 128 + 1) {
-                    server.kill('SIGHUP');
-                }
-                else {
+            const killServer = () => {
+                if (server.connected) {
                     server.kill('SIGTERM');
                 }
-            }));
-        }))));
+            };
+            process.on('exit', () => killServer());
+            process.on('SIGINT', () => killServer());
+            process.on('SIGTERM', () => killServer());
+            process.on('SIGHUP', () => killServer());
+            yield (0, wait_for_port_open_1.waitForPortOpen)(port);
+            next({
+                success: true,
+                baseUrl: `http://${(_a = options.hostname) !== null && _a !== void 0 ? _a : 'localhost'}:${port}`,
+            });
+        })))));
     });
 }
 exports.default = serveExecutor;

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/app/page.tsx__tmpl__

@@ -1,19 +1,20 @@
-<% if (styledModule && (styledModule === 'styled-jsx' || styledModule === 'styled-components'))  {%>
-'use client';
-<% }%> 
-<% if (styledModule && styledModule !== 'styled-jsx') {
-  var wrapper = 'StyledPage';
-%>import styled from '<%= styledModule %>';<% } else {
-  var wrapper = 'div';
-%>
-  <%- style !== 'styled-jsx' ? `import styles from './page.module.${style}';` : '' %>
-<% }
-%>
-
-<% if (styledModule && styledModule !== 'styled-jsx') { %>
-const StyledPage = styled.div`<%- pageStyleContent %>`;
-<% }%>
+<% if (style !== 'none') { %>
+  <% if (styledModule && (styledModule === 'styled-jsx' || styledModule === 'styled-components'))  {%>
+  'use client';
+  <% }%> 
+  <% if (styledModule && styledModule !== 'styled-jsx') {
+    var wrapper = 'StyledPage';
+  %>import styled from '<%= styledModule %>';<% } else {
+    var wrapper = 'div';
+  %>
+    <%- style !== 'styled-jsx' ? `import styles from './page.module.${style}';` : '' %>
+  <% }
+  %>
 
+  <% if (styledModule && styledModule !== 'styled-jsx') { %>
+  const StyledPage = styled.div`<%- pageStyleContent %>`;
+  <% }%>
+<% } %>
 export default async function Index() {
   /*
    * Replace the elements below with your own.
@@ -22,7 +23,7 @@ export default async function Index() {
    */
   return (
     <<%= wrapper %><% if (!styledModule) {%> className={styles.page}<% } %>>
-      <%- styledModule === 'styled-jsx' ? `<style jsx>{\`${pageStyleContent}\`}</style>` : `` %>
+      <%- styledModule === 'styled-jsx' && style !== 'none' ? `<style jsx>{\`${pageStyleContent}\`}</style>` : `` %>
       <%- appContent %>
     </<%= wrapper %>>
   );

package/src/generators/application/files/pages/__fileName__.tsx__tmpl__

@@ -1,15 +1,17 @@
-<% if (styledModule && styledModule !== 'styled-jsx') {
-  var wrapper = 'StyledPage';
-%>import styled from '<%= styledModule %>';<% } else {
-  var wrapper = 'div';
-%>
-  <%- style !== 'styled-jsx' ? `import styles from './${fileName}.module.${style}';` : '' %>
-<% }
-%>
+<% if (style !== 'none') { %>
+  <% if (styledModule && styledModule !== 'styled-jsx') {
+    var wrapper = 'StyledPage';
+  %>import styled from '<%= styledModule %>';<% } else {
+    var wrapper = 'div';
+  %>
+    <%- style !== 'styled-jsx' ? `import styles from './${fileName}.module.${style}';` : '' %>
+  <% }
+  %>
 
-<% if (styledModule && styledModule !== 'styled-jsx') { %>
-const StyledPage = styled.div`<%- pageStyleContent %>`;
-<% }%>
+  <% if (styledModule && styledModule !== 'styled-jsx') { %>
+  const StyledPage = styled.div`<%- pageStyleContent %>`;
+  <% }%>
+<% } %>
 
 export function Index() {
   /*
@@ -19,7 +21,7 @@ export function Index() {
    */
   return (
     <<%= wrapper %><% if (!styledModule) {%> className={styles.page}<% } %>>
-      <%- styledModule === 'styled-jsx' ? `<style jsx>{\`${pageStyleContent}\`}</style>` : `` %>
+      <%- styledModule === 'styled-jsx' && style !== 'none' ? `<style jsx>{\`${pageStyleContent}\`}</style>` : `` %>
       <%- appContent %>
     </<%= wrapper %>>
   );

package/src/utils/create-cli-options.d.ts

@@ -1,3 +1 @@
-export declare function createCliOptions(obj: {
-    [key: string]: any;
-}): string;
+export declare function createCliOptions(obj: Record<string, string | number | boolean>): string[];

package/src/utils/create-cli-options.js

@@ -2,17 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCliOptions = void 0;
 function createCliOptions(obj) {
-    return Object.entries(obj)
-        .reduce((arr, [key, value]) => {
+    return Object.entries(obj).reduce((arr, [key, value]) => {
         if (value !== undefined) {
             const kebabCase = key.replace(/[A-Z]/g, (m) => '-' + m.toLowerCase());
-            return `${arr}--${kebabCase}=${value} `;
+            arr.push(`--${kebabCase}=${value}`);
         }
-        else {
-            return arr;
-        }
-    }, '')
-        .trim();
+        return arr;
+    }, []);
 }
 exports.createCliOptions = createCliOptions;
 //# sourceMappingURL=create-cli-options.js.map

package/src/utils/create-cli-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-cli-options.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/create-cli-options.ts"],"names":[],"mappings":";;;AAAA,SAAgB,gBAAgB,CAAC,GAA2B;IAC1D,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;SACvB,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC5B,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;YACtE,OAAO,GAAG,GAAG,KAAK,SAAS,IAAI,KAAK,GAAG,CAAC;SACzC;aAAM;YACL,OAAO,GAAG,CAAC;SACZ;IACH,CAAC,EAAE,EAAE,CAAC;SACL,IAAI,EAAE,CAAC;AACZ,CAAC;AAXD,4CAWC"}
+{"version":3,"file":"create-cli-options.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/create-cli-options.ts"],"names":[],"mappings":";;;AAAA,SAAgB,gBAAgB,CAC9B,GAA8C;IAE9C,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACtD,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;YACtE,GAAG,CAAC,IAAI,CAAC,KAAK,SAAS,IAAI,KAAK,EAAE,CAAC,CAAC;SACrC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAVD,4CAUC"}

package/src/utils/types.d.ts

@@ -45,6 +45,7 @@ export interface NextServeBuilderOptions {
     proxyConfig?: string;
     buildLibsFromSource?: boolean;
     keepAliveTimeout?: number;
+    turbo?: boolean;
 }
 export interface NextExportBuilderOptions {
     buildTarget: string;