@nx/next 16.3.0-beta.4 → 16.3.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "16.3.0-beta.4",
+  "version": "16.3.0-beta.5",
   "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,12 +35,12 @@
   },
   "dependencies": {
     "@babel/plugin-proposal-decorators": "^7.14.5",
-    "@nrwl/next": "16.3.0-beta.4",
-    "@nx/devkit": "16.3.0-beta.4",
-    "@nx/js": "16.3.0-beta.4",
-    "@nx/linter": "16.3.0-beta.4",
-    "@nx/react": "16.3.0-beta.4",
-    "@nx/workspace": "16.3.0-beta.4",
+    "@nrwl/next": "16.3.0-beta.5",
+    "@nx/devkit": "16.3.0-beta.5",
+    "@nx/js": "16.3.0-beta.5",
+    "@nx/linter": "16.3.0-beta.5",
+    "@nx/react": "16.3.0-beta.5",
+    "@nx/workspace": "16.3.0-beta.5",
     "@svgr/webpack": "^6.1.2",
     "chalk": "^4.1.0",
     "copy-webpack-plugin": "^10.2.4",
@@ -60,5 +60,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "e6ddc5a525ca2a4e802deb0c3b0f99decca5a5a1"
+  "gitHead": "11bb99316d977adfc3e0599076a73461ec8c48a1"
 }

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,87 @@ 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) => {
+        if ((0, path_1.extname)(file))
+            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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"}