create-payload-app 3.0.0-canary.cee5702 → 3.0.0-canary.cf66341

package/dist/lib/wrap-next-config.js

@@ -1,16 +1,17 @@
+import { parse } from '@swc/core';
 import chalk from 'chalk';
 import { Syntax, parseModule } from 'esprima-next';
 import fs from 'fs';
-import { warning } from '../utils/log.js';
-import { log } from '../utils/log.js';
+import { log, warning } from '../utils/log.js';
 export const withPayloadStatement = {
-    cjs: `const { withPayload } = require('@payloadcms/next/withPayload')\n`,
-    esm: `import { withPayload } from '@payloadcms/next/withPayload'\n`
+    cjs: `const { withPayload } = require("@payloadcms/next/withPayload");`,
+    esm: `import { withPayload } from "@payloadcms/next/withPayload";`,
+    ts: `import { withPayload } from "@payloadcms/next/withPayload";`
 };
-export const wrapNextConfig = (args)=>{
+export const wrapNextConfig = async (args)=>{
     const { nextConfigPath, nextConfigType: configType } = args;
     const configContent = fs.readFileSync(nextConfigPath, 'utf8');
-    const { modifiedConfigContent: newConfig, success } = parseAndModifyConfigContent(configContent, configType);
+    const { modifiedConfigContent: newConfig, success } = await parseAndModifyConfigContent(configContent, configType);
     if (!success) {
         return;
     }
@@ -18,80 +19,103 @@ export const wrapNextConfig = (args)=>{
 };
 /**
  * Parses config content with AST and wraps it with withPayload function
- */ export function parseAndModifyConfigContent(content, configType) {
-    content = withPayloadStatement[configType] + content;
-    let ast;
-    try {
-        ast = parseModule(content, {
-            loc: true
-        });
-    } catch (error) {
-        if (error instanceof Error) {
-            warning(`Unable to parse Next config. Error: ${error.message} `);
-            warnUserWrapNotSuccessful(configType);
-        }
-        return {
-            modifiedConfigContent: content,
-            success: false
-        };
-    }
-    if (configType === 'esm') {
-        const exportDefaultDeclaration = ast.body.find((p)=>p.type === Syntax.ExportDefaultDeclaration);
-        const exportNamedDeclaration = ast.body.find((p)=>p.type === Syntax.ExportNamedDeclaration);
-        if (!exportDefaultDeclaration && !exportNamedDeclaration) {
-            throw new Error('Could not find ExportDefaultDeclaration in next.config.js');
-        }
-        if (exportDefaultDeclaration && exportDefaultDeclaration.declaration?.loc) {
-            const modifiedConfigContent = insertBeforeAndAfter(content, exportDefaultDeclaration.declaration.loc);
+ */ export async function parseAndModifyConfigContent(content, configType) {
+    content = withPayloadStatement[configType] + '\n' + content;
+    console.log({
+        configType,
+        content
+    });
+    if (configType === 'cjs' || configType === 'esm') {
+        try {
+            const ast = parseModule(content, {
+                loc: true
+            });
+            if (configType === 'cjs') {
+                // Find `module.exports = X`
+                const moduleExports = ast.body.find((p)=>p.type === Syntax.ExpressionStatement && p.expression?.type === Syntax.AssignmentExpression && p.expression.left?.type === Syntax.MemberExpression && p.expression.left.object?.type === Syntax.Identifier && p.expression.left.object.name === 'module' && p.expression.left.property?.type === Syntax.Identifier && p.expression.left.property.name === 'exports');
+                if (moduleExports && moduleExports.expression.right?.loc) {
+                    const modifiedConfigContent = insertBeforeAndAfter(content, moduleExports.expression.right.loc);
+                    return {
+                        modifiedConfigContent,
+                        success: true
+                    };
+                }
+                return Promise.resolve({
+                    modifiedConfigContent: content,
+                    success: false
+                });
+            } else if (configType === 'esm') {
+                const exportDefaultDeclaration = ast.body.find((p)=>p.type === Syntax.ExportDefaultDeclaration);
+                const exportNamedDeclaration = ast.body.find((p)=>p.type === Syntax.ExportNamedDeclaration);
+                if (!exportDefaultDeclaration && !exportNamedDeclaration) {
+                    throw new Error('Could not find ExportDefaultDeclaration in next.config.js');
+                }
+                if (exportDefaultDeclaration && exportDefaultDeclaration.declaration?.loc) {
+                    const modifiedConfigContent = insertBeforeAndAfter(content, exportDefaultDeclaration.declaration.loc);
+                    return {
+                        modifiedConfigContent,
+                        success: true
+                    };
+                } else if (exportNamedDeclaration) {
+                    const exportSpecifier = exportNamedDeclaration.specifiers.find((s)=>s.type === 'ExportSpecifier' && s.exported?.name === 'default' && s.local?.type === 'Identifier' && s.local?.name);
+                    if (exportSpecifier) {
+                        warning('Could not automatically wrap next.config.js with withPayload.');
+                        warning('Automatic wrapping of named exports as default not supported yet.');
+                        warnUserWrapNotSuccessful(configType);
+                        return {
+                            modifiedConfigContent: content,
+                            success: false
+                        };
+                    }
+                }
+                warning('Could not automatically wrap Next config with withPayload.');
+                warnUserWrapNotSuccessful(configType);
+                return Promise.resolve({
+                    modifiedConfigContent: content,
+                    success: false
+                });
+            }
+        } catch (error) {
+            if (error instanceof Error) {
+                warning(`Unable to parse Next config. Error: ${error.message} `);
+                warnUserWrapNotSuccessful(configType);
+            }
             return {
-                modifiedConfigContent,
-                success: true
+                modifiedConfigContent: content,
+                success: false
             };
-        } else if (exportNamedDeclaration) {
-            const exportSpecifier = exportNamedDeclaration.specifiers.find((s)=>s.type === 'ExportSpecifier' && s.exported?.name === 'default' && s.local?.type === 'Identifier' && s.local?.name);
-            if (exportSpecifier) {
-                warning('Could not automatically wrap next.config.js with withPayload.');
-                warning('Automatic wrapping of named exports as default not supported yet.');
+        }
+    } else if (configType === 'ts') {
+        const { moduleItems, parseOffset } = await compileTypeScriptFileToAST(content);
+        const exportDefaultDeclaration = moduleItems.find((m)=>m.type === 'ExportDefaultExpression' && (m.expression.type === 'Identifier' || m.expression.type === 'CallExpression'));
+        if (exportDefaultDeclaration) {
+            if (!('span' in exportDefaultDeclaration.expression)) {
+                warning('Could not automatically wrap Next config with withPayload.');
                 warnUserWrapNotSuccessful(configType);
-                return {
+                return Promise.resolve({
                     modifiedConfigContent: content,
                     success: false
-                };
+                });
             }
-        }
-        warning('Could not automatically wrap Next config with withPayload.');
-        warnUserWrapNotSuccessful(configType);
-        return {
-            modifiedConfigContent: content,
-            success: false
-        };
-    } else if (configType === 'cjs') {
-        // Find `module.exports = X`
-        const moduleExports = ast.body.find((p)=>p.type === Syntax.ExpressionStatement && p.expression?.type === Syntax.AssignmentExpression && p.expression.left?.type === Syntax.MemberExpression && p.expression.left.object?.type === Syntax.Identifier && p.expression.left.object.name === 'module' && p.expression.left.property?.type === Syntax.Identifier && p.expression.left.property.name === 'exports');
-        if (moduleExports && moduleExports.expression.right?.loc) {
-            const modifiedConfigContent = insertBeforeAndAfter(content, moduleExports.expression.right.loc);
+            const modifiedConfigContent = insertBeforeAndAfterSWC(content, exportDefaultDeclaration.expression.span, parseOffset);
             return {
                 modifiedConfigContent,
                 success: true
             };
         }
-        return {
-            modifiedConfigContent: content,
-            success: false
-        };
     }
     warning('Could not automatically wrap Next config with withPayload.');
     warnUserWrapNotSuccessful(configType);
-    return {
+    return Promise.resolve({
         modifiedConfigContent: content,
         success: false
-    };
+    });
 }
 function warnUserWrapNotSuccessful(configType) {
     // Output directions for user to update next.config.js
     const withPayloadMessage = `
 
-  ${chalk.bold(`Please manually wrap your existing next.config.js with the withPayload function. Here is an example:`)}
+  ${chalk.bold(`Please manually wrap your existing Next config with the withPayload function. Here is an example:`)}
 
   ${withPayloadStatement[configType]}
 
@@ -99,7 +123,7 @@ function warnUserWrapNotSuccessful(configType) {
     // Your Next.js config here
   }
 
-  ${configType === 'esm' ? 'export default withPayload(nextConfig)' : 'module.exports = withPayload(nextConfig)'}
+  ${configType === 'cjs' ? 'module.exports = withPayload(nextConfig)' : 'export default withPayload(nextConfig)'}
 
 `;
     log(withPayloadMessage);
@@ -120,5 +144,44 @@ function insertBeforeAndAfter(content, loc) {
     }
     return lines.join('\n');
 }
+function insertBeforeAndAfterSWC(content, span, /**
+   * WARNING: This is ONLY for unit tests. Defaults to 0 otherwise.
+   *
+   * @see compileTypeScriptFileToAST
+   */ parseOffset) {
+    const { end: preOffsetEnd, start: preOffsetStart } = span;
+    const start = preOffsetStart - parseOffset;
+    const end = preOffsetEnd - parseOffset;
+    const insert = (pos, text)=>{
+        return content.slice(0, pos) + text + content.slice(pos);
+    };
+    // insert ) after end
+    content = insert(end - 1, ')');
+    // insert withPayload before start
+    content = insert(start - 1, 'withPayload(');
+    return content;
+}
+/**
+ * Compile typescript to AST using the swc compiler
+ */ async function compileTypeScriptFileToAST(fileContent) {
+    let parseOffset = 0;
+    /**
+   * WARNING: This is ONLY for unit tests.
+   *
+   * Multiple instances of swc DO NOT reset the .span.end value.
+   * During unit tests, the .spawn.end value is read and accounted for.
+   *
+   * https://github.com/swc-project/swc/issues/1366
+   */ if (process.env.NODE_ENV === 'test') {
+        parseOffset = (await parse('')).span.end;
+    }
+    const module = await parse(fileContent, {
+        syntax: 'typescript'
+    });
+    return {
+        moduleItems: module.body,
+        parseOffset
+    };
+}
 
 //# sourceMappingURL=wrap-next-config.js.map

package/dist/lib/wrap-next-config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/wrap-next-config.ts"],"sourcesContent":["import type { Program } from 'esprima-next'\n\nimport chalk from 'chalk'\nimport { Syntax, parseModule } from 'esprima-next'\nimport fs from 'fs'\n\nimport { warning } from '../utils/log.js'\nimport { log } from '../utils/log.js'\n\nexport const withPayloadStatement = {\n  cjs: `const { withPayload } = require('@payloadcms/next/withPayload')\\n`,\n  esm: `import { withPayload } from '@payloadcms/next/withPayload'\\n`,\n}\n\ntype NextConfigType = 'cjs' | 'esm'\n\nexport const wrapNextConfig = (args: {\n  nextConfigPath: string\n  nextConfigType: NextConfigType\n}) => {\n  const { nextConfigPath, nextConfigType: configType } = args\n  const configContent = fs.readFileSync(nextConfigPath, 'utf8')\n  const { modifiedConfigContent: newConfig, success } = parseAndModifyConfigContent(\n    configContent,\n    configType,\n  )\n\n  if (!success) {\n    return\n  }\n\n  fs.writeFileSync(nextConfigPath, newConfig)\n}\n\n/**\n * Parses config content with AST and wraps it with withPayload function\n */\nexport function parseAndModifyConfigContent(\n  content: string,\n  configType: NextConfigType,\n): { modifiedConfigContent: string; success: boolean } {\n  content = withPayloadStatement[configType] + content\n\n  let ast: Program | undefined\n  try {\n    ast = parseModule(content, { loc: true })\n  } catch (error: unknown) {\n    if (error instanceof Error) {\n      warning(`Unable to parse Next config. Error: ${error.message} `)\n      warnUserWrapNotSuccessful(configType)\n    }\n    return {\n      modifiedConfigContent: content,\n      success: false,\n    }\n  }\n\n  if (configType === 'esm') {\n    const exportDefaultDeclaration = ast.body.find(\n      (p) => p.type === Syntax.ExportDefaultDeclaration,\n    ) as Directive | undefined\n\n    const exportNamedDeclaration = ast.body.find(\n      (p) => p.type === Syntax.ExportNamedDeclaration,\n    ) as ExportNamedDeclaration | undefined\n\n    if (!exportDefaultDeclaration && !exportNamedDeclaration) {\n      throw new Error('Could not find ExportDefaultDeclaration in next.config.js')\n    }\n\n    if (exportDefaultDeclaration && exportDefaultDeclaration.declaration?.loc) {\n      const modifiedConfigContent = insertBeforeAndAfter(\n        content,\n        exportDefaultDeclaration.declaration.loc,\n      )\n      return { modifiedConfigContent, success: true }\n    } else if (exportNamedDeclaration) {\n      const exportSpecifier = exportNamedDeclaration.specifiers.find(\n        (s) =>\n          s.type === 'ExportSpecifier' &&\n          s.exported?.name === 'default' &&\n          s.local?.type === 'Identifier' &&\n          s.local?.name,\n      )\n\n      if (exportSpecifier) {\n        warning('Could not automatically wrap next.config.js with withPayload.')\n        warning('Automatic wrapping of named exports as default not supported yet.')\n\n        warnUserWrapNotSuccessful(configType)\n        return {\n          modifiedConfigContent: content,\n          success: false,\n        }\n      }\n    }\n\n    warning('Could not automatically wrap Next config with withPayload.')\n    warnUserWrapNotSuccessful(configType)\n    return {\n      modifiedConfigContent: content,\n      success: false,\n    }\n  } else if (configType === 'cjs') {\n    // Find `module.exports = X`\n    const moduleExports = ast.body.find(\n      (p) =>\n        p.type === Syntax.ExpressionStatement &&\n        p.expression?.type === Syntax.AssignmentExpression &&\n        p.expression.left?.type === Syntax.MemberExpression &&\n        p.expression.left.object?.type === Syntax.Identifier &&\n        p.expression.left.object.name === 'module' &&\n        p.expression.left.property?.type === Syntax.Identifier &&\n        p.expression.left.property.name === 'exports',\n      // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    ) as any\n\n    if (moduleExports && moduleExports.expression.right?.loc) {\n      const modifiedConfigContent = insertBeforeAndAfter(\n        content,\n        moduleExports.expression.right.loc,\n      )\n      return { modifiedConfigContent, success: true }\n    }\n\n    return {\n      modifiedConfigContent: content,\n      success: false,\n    }\n  }\n\n  warning('Could not automatically wrap Next config with withPayload.')\n  warnUserWrapNotSuccessful(configType)\n  return {\n    modifiedConfigContent: content,\n    success: false,\n  }\n}\n\nfunction warnUserWrapNotSuccessful(configType: NextConfigType) {\n  // Output directions for user to update next.config.js\n  const withPayloadMessage = `\n\n  ${chalk.bold(`Please manually wrap your existing next.config.js with the withPayload function. Here is an example:`)}\n\n  ${withPayloadStatement[configType]}\n\n  const nextConfig = {\n    // Your Next.js config here\n  }\n\n  ${configType === 'esm' ? 'export default withPayload(nextConfig)' : 'module.exports = withPayload(nextConfig)'}\n\n`\n\n  log(withPayloadMessage)\n}\n\ntype Directive = {\n  declaration?: {\n    loc: Loc\n  }\n}\n\ntype ExportNamedDeclaration = {\n  declaration: null\n  loc: Loc\n  specifiers: {\n    exported: {\n      loc: Loc\n      name: string\n      type: string\n    }\n    loc: Loc\n    local: {\n      loc: Loc\n      name: string\n      type: string\n    }\n    type: string\n  }[]\n  type: string\n}\n\ntype Loc = {\n  end: { column: number; line: number }\n  start: { column: number; line: number }\n}\n\nfunction insertBeforeAndAfter(content: string, loc: Loc) {\n  const { end, start } = loc\n  const lines = content.split('\\n')\n\n  const insert = (line: string, column: number, text: string) => {\n    return line.slice(0, column) + text + line.slice(column)\n  }\n\n  // insert ) after end\n  lines[end.line - 1] = insert(lines[end.line - 1], end.column, ')')\n  // insert withPayload before start\n  if (start.line === end.line) {\n    lines[end.line - 1] = insert(lines[end.line - 1], start.column, 'withPayload(')\n  } else {\n    lines[start.line - 1] = insert(lines[start.line - 1], start.column, 'withPayload(')\n  }\n\n  return lines.join('\\n')\n}\n"],"names":["chalk","Syntax","parseModule","fs","warning","log","withPayloadStatement","cjs","esm","wrapNextConfig","args","nextConfigPath","nextConfigType","configType","configContent","readFileSync","modifiedConfigContent","newConfig","success","parseAndModifyConfigContent","writeFileSync","content","ast","loc","error","Error","message","warnUserWrapNotSuccessful","exportDefaultDeclaration","body","find","p","type","ExportDefaultDeclaration","exportNamedDeclaration","ExportNamedDeclaration","declaration","insertBeforeAndAfter","exportSpecifier","specifiers","s","exported","name","local","moduleExports","ExpressionStatement","expression","AssignmentExpression","left","MemberExpression","object","Identifier","property","right","withPayloadMessage","bold","end","start","lines","split","insert","line","column","text","slice","join"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../src/lib/wrap-next-config.ts"],"sourcesContent":["import type { ExportDefaultExpression, ModuleItem } from '@swc/core'\n\nimport { parse } from '@swc/core'\nimport chalk from 'chalk'\nimport { Syntax, parseModule } from 'esprima-next'\nimport fs from 'fs'\n\nimport type { NextConfigType } from '../types.js'\n\nimport { log, warning } from '../utils/log.js'\n\nexport const withPayloadStatement = {\n  cjs: `const { withPayload } = require(\"@payloadcms/next/withPayload\");`,\n  esm: `import { withPayload } from \"@payloadcms/next/withPayload\";`,\n  ts: `import { withPayload } from \"@payloadcms/next/withPayload\";`,\n}\n\nexport const wrapNextConfig = async (args: {\n  nextConfigPath: string\n  nextConfigType: NextConfigType\n}) => {\n  const { nextConfigPath, nextConfigType: configType } = args\n  const configContent = fs.readFileSync(nextConfigPath, 'utf8')\n  const { modifiedConfigContent: newConfig, success } = await parseAndModifyConfigContent(\n    configContent,\n    configType,\n  )\n\n  if (!success) {\n    return\n  }\n\n  fs.writeFileSync(nextConfigPath, newConfig)\n}\n\n/**\n * Parses config content with AST and wraps it with withPayload function\n */\nexport async function parseAndModifyConfigContent(\n  content: string,\n  configType: NextConfigType,\n): Promise<{ modifiedConfigContent: string; success: boolean }> {\n  content = withPayloadStatement[configType] + '\\n' + content\n\n  console.log({ configType, content })\n\n  if (configType === 'cjs' || configType === 'esm') {\n    try {\n      const ast = parseModule(content, { loc: true })\n\n      if (configType === 'cjs') {\n        // Find `module.exports = X`\n        const moduleExports = ast.body.find(\n          (p) =>\n            p.type === Syntax.ExpressionStatement &&\n            p.expression?.type === Syntax.AssignmentExpression &&\n            p.expression.left?.type === Syntax.MemberExpression &&\n            p.expression.left.object?.type === Syntax.Identifier &&\n            p.expression.left.object.name === 'module' &&\n            p.expression.left.property?.type === Syntax.Identifier &&\n            p.expression.left.property.name === 'exports',\n          // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        ) as any\n\n        if (moduleExports && moduleExports.expression.right?.loc) {\n          const modifiedConfigContent = insertBeforeAndAfter(\n            content,\n            moduleExports.expression.right.loc,\n          )\n          return { modifiedConfigContent, success: true }\n        }\n\n        return Promise.resolve({\n          modifiedConfigContent: content,\n          success: false,\n        })\n      } else if (configType === 'esm') {\n        const exportDefaultDeclaration = ast.body.find(\n          (p) => p.type === Syntax.ExportDefaultDeclaration,\n        ) as Directive | undefined\n\n        const exportNamedDeclaration = ast.body.find(\n          (p) => p.type === Syntax.ExportNamedDeclaration,\n        ) as ExportNamedDeclaration | undefined\n\n        if (!exportDefaultDeclaration && !exportNamedDeclaration) {\n          throw new Error('Could not find ExportDefaultDeclaration in next.config.js')\n        }\n\n        if (exportDefaultDeclaration && exportDefaultDeclaration.declaration?.loc) {\n          const modifiedConfigContent = insertBeforeAndAfter(\n            content,\n            exportDefaultDeclaration.declaration.loc,\n          )\n          return { modifiedConfigContent, success: true }\n        } else if (exportNamedDeclaration) {\n          const exportSpecifier = exportNamedDeclaration.specifiers.find(\n            (s) =>\n              s.type === 'ExportSpecifier' &&\n              s.exported?.name === 'default' &&\n              s.local?.type === 'Identifier' &&\n              s.local?.name,\n          )\n\n          if (exportSpecifier) {\n            warning('Could not automatically wrap next.config.js with withPayload.')\n            warning('Automatic wrapping of named exports as default not supported yet.')\n\n            warnUserWrapNotSuccessful(configType)\n            return {\n              modifiedConfigContent: content,\n              success: false,\n            }\n          }\n        }\n\n        warning('Could not automatically wrap Next config with withPayload.')\n        warnUserWrapNotSuccessful(configType)\n        return Promise.resolve({\n          modifiedConfigContent: content,\n          success: false,\n        })\n      }\n    } catch (error: unknown) {\n      if (error instanceof Error) {\n        warning(`Unable to parse Next config. Error: ${error.message} `)\n        warnUserWrapNotSuccessful(configType)\n      }\n      return {\n        modifiedConfigContent: content,\n        success: false,\n      }\n    }\n  } else if (configType === 'ts') {\n    const { moduleItems, parseOffset } = await compileTypeScriptFileToAST(content)\n\n    const exportDefaultDeclaration = moduleItems.find(\n      (m) =>\n        m.type === 'ExportDefaultExpression' &&\n        (m.expression.type === 'Identifier' || m.expression.type === 'CallExpression'),\n    ) as ExportDefaultExpression | undefined\n\n    if (exportDefaultDeclaration) {\n      if (!('span' in exportDefaultDeclaration.expression)) {\n        warning('Could not automatically wrap Next config with withPayload.')\n        warnUserWrapNotSuccessful(configType)\n        return Promise.resolve({\n          modifiedConfigContent: content,\n          success: false,\n        })\n      }\n\n      const modifiedConfigContent = insertBeforeAndAfterSWC(\n        content,\n        exportDefaultDeclaration.expression.span,\n        parseOffset,\n      )\n      return { modifiedConfigContent, success: true }\n    }\n  }\n\n  warning('Could not automatically wrap Next config with withPayload.')\n  warnUserWrapNotSuccessful(configType)\n  return Promise.resolve({\n    modifiedConfigContent: content,\n    success: false,\n  })\n}\n\nfunction warnUserWrapNotSuccessful(configType: NextConfigType) {\n  // Output directions for user to update next.config.js\n  const withPayloadMessage = `\n\n  ${chalk.bold(`Please manually wrap your existing Next config with the withPayload function. Here is an example:`)}\n\n  ${withPayloadStatement[configType]}\n\n  const nextConfig = {\n    // Your Next.js config here\n  }\n\n  ${configType === 'cjs' ? 'module.exports = withPayload(nextConfig)' : 'export default withPayload(nextConfig)'}\n\n`\n\n  log(withPayloadMessage)\n}\n\ntype Directive = {\n  declaration?: {\n    loc: Loc\n  }\n}\n\ntype ExportNamedDeclaration = {\n  declaration: null\n  loc: Loc\n  specifiers: {\n    exported: {\n      loc: Loc\n      name: string\n      type: string\n    }\n    loc: Loc\n    local: {\n      loc: Loc\n      name: string\n      type: string\n    }\n    type: string\n  }[]\n  type: string\n}\n\ntype Loc = {\n  end: { column: number; line: number }\n  start: { column: number; line: number }\n}\n\nfunction insertBeforeAndAfter(content: string, loc: Loc): string {\n  const { end, start } = loc\n  const lines = content.split('\\n')\n\n  const insert = (line: string, column: number, text: string) => {\n    return line.slice(0, column) + text + line.slice(column)\n  }\n\n  // insert ) after end\n  lines[end.line - 1] = insert(lines[end.line - 1], end.column, ')')\n  // insert withPayload before start\n  if (start.line === end.line) {\n    lines[end.line - 1] = insert(lines[end.line - 1], start.column, 'withPayload(')\n  } else {\n    lines[start.line - 1] = insert(lines[start.line - 1], start.column, 'withPayload(')\n  }\n\n  return lines.join('\\n')\n}\n\nfunction insertBeforeAndAfterSWC(\n  content: string,\n  span: ModuleItem['span'],\n  /**\n   * WARNING: This is ONLY for unit tests. Defaults to 0 otherwise.\n   *\n   * @see compileTypeScriptFileToAST\n   */\n  parseOffset: number,\n): string {\n  const { end: preOffsetEnd, start: preOffsetStart } = span\n\n  const start = preOffsetStart - parseOffset\n  const end = preOffsetEnd - parseOffset\n\n  const insert = (pos: number, text: string): string => {\n    return content.slice(0, pos) + text + content.slice(pos)\n  }\n\n  // insert ) after end\n  content = insert(end - 1, ')')\n  // insert withPayload before start\n  content = insert(start - 1, 'withPayload(')\n\n  return content\n}\n\n/**\n * Compile typescript to AST using the swc compiler\n */\nasync function compileTypeScriptFileToAST(\n  fileContent: string,\n): Promise<{ moduleItems: ModuleItem[]; parseOffset: number }> {\n  let parseOffset = 0\n\n  /**\n   * WARNING: This is ONLY for unit tests.\n   *\n   * Multiple instances of swc DO NOT reset the .span.end value.\n   * During unit tests, the .spawn.end value is read and accounted for.\n   *\n   * https://github.com/swc-project/swc/issues/1366\n   */\n  if (process.env.NODE_ENV === 'test') {\n    parseOffset = (await parse('')).span.end\n  }\n\n  const module = await parse(fileContent, {\n    syntax: 'typescript',\n  })\n\n  return { moduleItems: module.body, parseOffset }\n}\n"],"names":["parse","chalk","Syntax","parseModule","fs","log","warning","withPayloadStatement","cjs","esm","ts","wrapNextConfig","args","nextConfigPath","nextConfigType","configType","configContent","readFileSync","modifiedConfigContent","newConfig","success","parseAndModifyConfigContent","writeFileSync","content","console","ast","loc","moduleExports","body","find","p","type","ExpressionStatement","expression","AssignmentExpression","left","MemberExpression","object","Identifier","name","property","right","insertBeforeAndAfter","Promise","resolve","exportDefaultDeclaration","ExportDefaultDeclaration","exportNamedDeclaration","ExportNamedDeclaration","Error","declaration","exportSpecifier","specifiers","s","exported","local","warnUserWrapNotSuccessful","error","message","moduleItems","parseOffset","compileTypeScriptFileToAST","m","insertBeforeAndAfterSWC","span","withPayloadMessage","bold","end","start","lines","split","insert","line","column","text","slice","join","preOffsetEnd","preOffsetStart","pos","fileContent","process","env","NODE_ENV","module","syntax"],"mappings":"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"}

package/dist/lib/wrap-next-config.spec.js

@@ -1,9 +1,41 @@
-import { parseAndModifyConfigContent, withPayloadStatement } from './wrap-next-config.js';
 import * as p from '@clack/prompts';
+import { jest } from '@jest/globals';
+import { parseAndModifyConfigContent, withPayloadStatement } from './wrap-next-config.js';
+const tsConfigs = {
+    defaultNextConfig: `import type { NextConfig } from "next";
+
+const nextConfig: NextConfig = {};
+export default nextConfig;`,
+    nextConfigExportNamedDefault: `import type { NextConfig } from "next";
+const nextConfig: NextConfig = {};
+const wrapped = someFunc(asdf);
+export { wrapped as default };
+`,
+    nextConfigWithFunc: `import type { NextConfig } from "next";
+const nextConfig: NextConfig = {};
+export default someFunc(nextConfig);
+`,
+    nextConfigWithFuncMultiline: `import type { NextConfig } from "next";
+const nextConfig: NextConfig = {};
+export default someFunc(
+  nextConfig
+);
+`,
+    nextConfigWithSpread: `import type { NextConfig } from "next";
+const nextConfig: NextConfig = {
+  ...someConfig,
+};
+export default nextConfig;
+`
+};
 const esmConfigs = {
     defaultNextConfig: `/** @type {import('next').NextConfig} */
 const nextConfig = {};
 export default nextConfig;
+`,
+    nextConfigExportNamedDefault: `const nextConfig = {};
+const wrapped = someFunc(asdf);
+export { wrapped as default };
 `,
     nextConfigWithFunc: `const nextConfig = {};
 export default someFunc(nextConfig);
@@ -12,10 +44,6 @@ export default someFunc(nextConfig);
 export default someFunc(
   nextConfig
 );
-`,
-    nextConfigExportNamedDefault: `const nextConfig = {};
-const wrapped = someFunc(asdf);
-export { wrapped as default };
 `,
     nextConfigWithSpread: `const nextConfig = {
   ...someConfig,
@@ -24,12 +52,16 @@ export default nextConfig;
 `
 };
 const cjsConfigs = {
+    anonConfig: `module.exports = {};`,
     defaultNextConfig: `
   /** @type {import('next').NextConfig} */
 const nextConfig = {};
 module.exports = nextConfig;
 `,
-    anonConfig: `module.exports = {};`,
+    nextConfigExportNamedDefault: `const nextConfig = {};
+const wrapped = someFunc(asdf);
+module.exports = wrapped;
+`,
     nextConfigWithFunc: `const nextConfig = {};
 module.exports = someFunc(nextConfig);
 `,
@@ -37,42 +69,61 @@ module.exports = someFunc(nextConfig);
 module.exports = someFunc(
   nextConfig
 );
-`,
-    nextConfigExportNamedDefault: `const nextConfig = {};
-const wrapped = someFunc(asdf);
-module.exports = wrapped;
 `,
     nextConfigWithSpread: `const nextConfig = { ...someConfig };
 module.exports = nextConfig;
 `
 };
 describe('parseAndInsertWithPayload', ()=>{
+    describe('ts', ()=>{
+        const configType = 'ts';
+        const importStatement = withPayloadStatement[configType];
+        it('should parse the default next config', async ()=>{
+            const { modifiedConfigContent } = await parseAndModifyConfigContent(tsConfigs.defaultNextConfig, configType);
+            expect(modifiedConfigContent).toContain(importStatement);
+            expect(modifiedConfigContent).toContain('withPayload(nextConfig)');
+        });
+        it('should parse the config with a function', async ()=>{
+            const { modifiedConfigContent: modifiedConfigContent2 } = await parseAndModifyConfigContent(tsConfigs.nextConfigWithFunc, configType);
+            expect(modifiedConfigContent2).toContain('withPayload(someFunc(nextConfig))');
+        });
+        it('should parse the config with a multi-lined function', async ()=>{
+            const { modifiedConfigContent } = await parseAndModifyConfigContent(tsConfigs.nextConfigWithFuncMultiline, configType);
+            expect(modifiedConfigContent).toContain(importStatement);
+            expect(modifiedConfigContent).toMatch(/withPayload\(someFunc\(\n {2}nextConfig\n\)\)/);
+        });
+        it('should parse the config with a spread', async ()=>{
+            const { modifiedConfigContent } = await parseAndModifyConfigContent(tsConfigs.nextConfigWithSpread, configType);
+            expect(modifiedConfigContent).toContain(importStatement);
+            expect(modifiedConfigContent).toContain('withPayload(nextConfig)');
+        });
+    });
     describe('esm', ()=>{
         const configType = 'esm';
         const importStatement = withPayloadStatement[configType];
-        it('should parse the default next config', ()=>{
-            const { modifiedConfigContent } = parseAndModifyConfigContent(esmConfigs.defaultNextConfig, configType);
+        it('should parse the default next config', async ()=>{
+            const { modifiedConfigContent } = await parseAndModifyConfigContent(esmConfigs.defaultNextConfig, configType);
             expect(modifiedConfigContent).toContain(importStatement);
             expect(modifiedConfigContent).toContain('withPayload(nextConfig)');
         });
-        it('should parse the config with a function', ()=>{
-            const { modifiedConfigContent } = parseAndModifyConfigContent(esmConfigs.nextConfigWithFunc, configType);
+        it('should parse the config with a function', async ()=>{
+            const { modifiedConfigContent } = await parseAndModifyConfigContent(esmConfigs.nextConfigWithFunc, configType);
             expect(modifiedConfigContent).toContain('withPayload(someFunc(nextConfig))');
         });
-        it('should parse the config with a function on a new line', ()=>{
-            const { modifiedConfigContent } = parseAndModifyConfigContent(esmConfigs.nextConfigWithFuncMultiline, configType);
+        it('should parse the config with a multi-lined function', async ()=>{
+            const { modifiedConfigContent } = await parseAndModifyConfigContent(esmConfigs.nextConfigWithFuncMultiline, configType);
             expect(modifiedConfigContent).toContain(importStatement);
-            expect(modifiedConfigContent).toMatch(/withPayload\(someFunc\(\n  nextConfig\n\)\)/);
+            expect(modifiedConfigContent).toMatch(/withPayload\(someFunc\(\n {2}nextConfig\n\)\)/);
         });
-        it('should parse the config with a spread', ()=>{
-            const { modifiedConfigContent } = parseAndModifyConfigContent(esmConfigs.nextConfigWithSpread, configType);
+        it('should parse the config with a spread', async ()=>{
+            const { modifiedConfigContent } = await parseAndModifyConfigContent(esmConfigs.nextConfigWithSpread, configType);
             expect(modifiedConfigContent).toContain(importStatement);
             expect(modifiedConfigContent).toContain('withPayload(nextConfig)');
         });
         // Unsupported: export { wrapped as default }
-        it('should give warning with a named export as default', ()=>{
+        it('should give warning with a named export as default', async ()=>{
             const warnLogSpy = jest.spyOn(p.log, 'warn').mockImplementation(()=>{});
-            const { modifiedConfigContent, success } = parseAndModifyConfigContent(esmConfigs.nextConfigExportNamedDefault, configType);
+            const { modifiedConfigContent, success } = await parseAndModifyConfigContent(esmConfigs.nextConfigExportNamedDefault, configType);
             expect(modifiedConfigContent).toContain(importStatement);
             expect(success).toBe(false);
             expect(warnLogSpy).toHaveBeenCalledWith(expect.stringContaining('Could not automatically wrap'));
@@ -81,32 +132,32 @@ describe('parseAndInsertWithPayload', ()=>{
     describe('cjs', ()=>{
         const configType = 'cjs';
         const requireStatement = withPayloadStatement[configType];
-        it('should parse the default next config', ()=>{
-            const { modifiedConfigContent } = parseAndModifyConfigContent(cjsConfigs.defaultNextConfig, configType);
+        it('should parse the default next config', async ()=>{
+            const { modifiedConfigContent } = await parseAndModifyConfigContent(cjsConfigs.defaultNextConfig, configType);
             expect(modifiedConfigContent).toContain(requireStatement);
             expect(modifiedConfigContent).toContain('withPayload(nextConfig)');
         });
-        it('should parse anonymous default config', ()=>{
-            const { modifiedConfigContent } = parseAndModifyConfigContent(cjsConfigs.anonConfig, configType);
+        it('should parse anonymous default config', async ()=>{
+            const { modifiedConfigContent } = await parseAndModifyConfigContent(cjsConfigs.anonConfig, configType);
             expect(modifiedConfigContent).toContain(requireStatement);
             expect(modifiedConfigContent).toContain('withPayload({})');
         });
-        it('should parse the config with a function', ()=>{
-            const { modifiedConfigContent } = parseAndModifyConfigContent(cjsConfigs.nextConfigWithFunc, configType);
+        it('should parse the config with a function', async ()=>{
+            const { modifiedConfigContent } = await parseAndModifyConfigContent(cjsConfigs.nextConfigWithFunc, configType);
             expect(modifiedConfigContent).toContain('withPayload(someFunc(nextConfig))');
         });
-        it('should parse the config with a function on a new line', ()=>{
-            const { modifiedConfigContent } = parseAndModifyConfigContent(cjsConfigs.nextConfigWithFuncMultiline, configType);
+        it('should parse the config with a multi-lined function', async ()=>{
+            const { modifiedConfigContent } = await parseAndModifyConfigContent(cjsConfigs.nextConfigWithFuncMultiline, configType);
             expect(modifiedConfigContent).toContain(requireStatement);
-            expect(modifiedConfigContent).toMatch(/withPayload\(someFunc\(\n  nextConfig\n\)\)/);
+            expect(modifiedConfigContent).toMatch(/withPayload\(someFunc\(\n {2}nextConfig\n\)\)/);
         });
-        it('should parse the config with a named export as default', ()=>{
-            const { modifiedConfigContent } = parseAndModifyConfigContent(cjsConfigs.nextConfigExportNamedDefault, configType);
+        it('should parse the config with a named export as default', async ()=>{
+            const { modifiedConfigContent } = await parseAndModifyConfigContent(cjsConfigs.nextConfigExportNamedDefault, configType);
             expect(modifiedConfigContent).toContain(requireStatement);
             expect(modifiedConfigContent).toContain('withPayload(wrapped)');
         });
-        it('should parse the config with a spread', ()=>{
-            const { modifiedConfigContent } = parseAndModifyConfigContent(cjsConfigs.nextConfigWithSpread, configType);
+        it('should parse the config with a spread', async ()=>{
+            const { modifiedConfigContent } = await parseAndModifyConfigContent(cjsConfigs.nextConfigWithSpread, configType);
             expect(modifiedConfigContent).toContain(requireStatement);
             expect(modifiedConfigContent).toContain('withPayload(nextConfig)');
         });

package/dist/lib/wrap-next-config.spec.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/wrap-next-config.spec.ts"],"sourcesContent":["import { parseAndModifyConfigContent, withPayloadStatement } from './wrap-next-config.js'\nimport * as p from '@clack/prompts'\n\nconst esmConfigs = {\n  defaultNextConfig: `/** @type {import('next').NextConfig} */\nconst nextConfig = {};\nexport default nextConfig;\n`,\n  nextConfigWithFunc: `const nextConfig = {};\nexport default someFunc(nextConfig);\n`,\n  nextConfigWithFuncMultiline: `const nextConfig = {};;\nexport default someFunc(\n  nextConfig\n);\n`,\n  nextConfigExportNamedDefault: `const nextConfig = {};\nconst wrapped = someFunc(asdf);\nexport { wrapped as default };\n`,\n  nextConfigWithSpread: `const nextConfig = {\n  ...someConfig,\n};\nexport default nextConfig;\n`,\n}\n\nconst cjsConfigs = {\n  defaultNextConfig: `\n  /** @type {import('next').NextConfig} */\nconst nextConfig = {};\nmodule.exports = nextConfig;\n`,\n  anonConfig: `module.exports = {};`,\n  nextConfigWithFunc: `const nextConfig = {};\nmodule.exports = someFunc(nextConfig);\n`,\n  nextConfigWithFuncMultiline: `const nextConfig = {};\nmodule.exports = someFunc(\n  nextConfig\n);\n`,\n  nextConfigExportNamedDefault: `const nextConfig = {};\nconst wrapped = someFunc(asdf);\nmodule.exports = wrapped;\n`,\n  nextConfigWithSpread: `const nextConfig = { ...someConfig };\nmodule.exports = nextConfig;\n`,\n}\n\ndescribe('parseAndInsertWithPayload', () => {\n  describe('esm', () => {\n    const configType = 'esm'\n    const importStatement = withPayloadStatement[configType]\n    it('should parse the default next config', () => {\n      const { modifiedConfigContent } = parseAndModifyConfigContent(\n        esmConfigs.defaultNextConfig,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain(importStatement)\n      expect(modifiedConfigContent).toContain('withPayload(nextConfig)')\n    })\n    it('should parse the config with a function', () => {\n      const { modifiedConfigContent } = parseAndModifyConfigContent(\n        esmConfigs.nextConfigWithFunc,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain('withPayload(someFunc(nextConfig))')\n    })\n\n    it('should parse the config with a function on a new line', () => {\n      const { modifiedConfigContent } = parseAndModifyConfigContent(\n        esmConfigs.nextConfigWithFuncMultiline,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain(importStatement)\n      expect(modifiedConfigContent).toMatch(/withPayload\\(someFunc\\(\\n  nextConfig\\n\\)\\)/)\n    })\n\n    it('should parse the config with a spread', () => {\n      const { modifiedConfigContent } = parseAndModifyConfigContent(\n        esmConfigs.nextConfigWithSpread,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain(importStatement)\n      expect(modifiedConfigContent).toContain('withPayload(nextConfig)')\n    })\n\n    // Unsupported: export { wrapped as default }\n    it('should give warning with a named export as default', () => {\n      const warnLogSpy = jest.spyOn(p.log, 'warn').mockImplementation(() => {})\n\n      const { modifiedConfigContent, success } = parseAndModifyConfigContent(\n        esmConfigs.nextConfigExportNamedDefault,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain(importStatement)\n      expect(success).toBe(false)\n\n      expect(warnLogSpy).toHaveBeenCalledWith(\n        expect.stringContaining('Could not automatically wrap'),\n      )\n    })\n  })\n\n  describe('cjs', () => {\n    const configType = 'cjs'\n    const requireStatement = withPayloadStatement[configType]\n    it('should parse the default next config', () => {\n      const { modifiedConfigContent } = parseAndModifyConfigContent(\n        cjsConfigs.defaultNextConfig,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain(requireStatement)\n      expect(modifiedConfigContent).toContain('withPayload(nextConfig)')\n    })\n    it('should parse anonymous default config', () => {\n      const { modifiedConfigContent } = parseAndModifyConfigContent(\n        cjsConfigs.anonConfig,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain(requireStatement)\n      expect(modifiedConfigContent).toContain('withPayload({})')\n    })\n    it('should parse the config with a function', () => {\n      const { modifiedConfigContent } = parseAndModifyConfigContent(\n        cjsConfigs.nextConfigWithFunc,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain('withPayload(someFunc(nextConfig))')\n    })\n    it('should parse the config with a function on a new line', () => {\n      const { modifiedConfigContent } = parseAndModifyConfigContent(\n        cjsConfigs.nextConfigWithFuncMultiline,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain(requireStatement)\n      expect(modifiedConfigContent).toMatch(/withPayload\\(someFunc\\(\\n  nextConfig\\n\\)\\)/)\n    })\n    it('should parse the config with a named export as default', () => {\n      const { modifiedConfigContent } = parseAndModifyConfigContent(\n        cjsConfigs.nextConfigExportNamedDefault,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain(requireStatement)\n      expect(modifiedConfigContent).toContain('withPayload(wrapped)')\n    })\n\n    it('should parse the config with a spread', () => {\n      const { modifiedConfigContent } = parseAndModifyConfigContent(\n        cjsConfigs.nextConfigWithSpread,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain(requireStatement)\n      expect(modifiedConfigContent).toContain('withPayload(nextConfig)')\n    })\n  })\n})\n"],"names":["parseAndModifyConfigContent","withPayloadStatement","p","esmConfigs","defaultNextConfig","nextConfigWithFunc","nextConfigWithFuncMultiline","nextConfigExportNamedDefault","nextConfigWithSpread","cjsConfigs","anonConfig","describe","configType","importStatement","it","modifiedConfigContent","expect","toContain","toMatch","warnLogSpy","jest","spyOn","log","mockImplementation","success","toBe","toHaveBeenCalledWith","stringContaining","requireStatement"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../src/lib/wrap-next-config.spec.ts"],"sourcesContent":["import * as p from '@clack/prompts'\nimport { jest } from '@jest/globals'\n\nimport { parseAndModifyConfigContent, withPayloadStatement } from './wrap-next-config.js'\n\nconst tsConfigs = {\n  defaultNextConfig: `import type { NextConfig } from \"next\";\n\nconst nextConfig: NextConfig = {};\nexport default nextConfig;`,\n\n  nextConfigExportNamedDefault: `import type { NextConfig } from \"next\";\nconst nextConfig: NextConfig = {};\nconst wrapped = someFunc(asdf);\nexport { wrapped as default };\n`,\n  nextConfigWithFunc: `import type { NextConfig } from \"next\";\nconst nextConfig: NextConfig = {};\nexport default someFunc(nextConfig);\n`,\n  nextConfigWithFuncMultiline: `import type { NextConfig } from \"next\";\nconst nextConfig: NextConfig = {};\nexport default someFunc(\n  nextConfig\n);\n`,\n  nextConfigWithSpread: `import type { NextConfig } from \"next\";\nconst nextConfig: NextConfig = {\n  ...someConfig,\n};\nexport default nextConfig;\n`,\n}\n\nconst esmConfigs = {\n  defaultNextConfig: `/** @type {import('next').NextConfig} */\nconst nextConfig = {};\nexport default nextConfig;\n`,\n  nextConfigExportNamedDefault: `const nextConfig = {};\nconst wrapped = someFunc(asdf);\nexport { wrapped as default };\n`,\n  nextConfigWithFunc: `const nextConfig = {};\nexport default someFunc(nextConfig);\n`,\n  nextConfigWithFuncMultiline: `const nextConfig = {};;\nexport default someFunc(\n  nextConfig\n);\n`,\n  nextConfigWithSpread: `const nextConfig = {\n  ...someConfig,\n};\nexport default nextConfig;\n`,\n}\n\nconst cjsConfigs = {\n  anonConfig: `module.exports = {};`,\n  defaultNextConfig: `\n  /** @type {import('next').NextConfig} */\nconst nextConfig = {};\nmodule.exports = nextConfig;\n`,\n  nextConfigExportNamedDefault: `const nextConfig = {};\nconst wrapped = someFunc(asdf);\nmodule.exports = wrapped;\n`,\n  nextConfigWithFunc: `const nextConfig = {};\nmodule.exports = someFunc(nextConfig);\n`,\n  nextConfigWithFuncMultiline: `const nextConfig = {};\nmodule.exports = someFunc(\n  nextConfig\n);\n`,\n  nextConfigWithSpread: `const nextConfig = { ...someConfig };\nmodule.exports = nextConfig;\n`,\n}\n\ndescribe('parseAndInsertWithPayload', () => {\n  describe('ts', () => {\n    const configType = 'ts'\n    const importStatement = withPayloadStatement[configType]\n\n    it('should parse the default next config', async () => {\n      const { modifiedConfigContent } = await parseAndModifyConfigContent(\n        tsConfigs.defaultNextConfig,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain(importStatement)\n      expect(modifiedConfigContent).toContain('withPayload(nextConfig)')\n    })\n\n    it('should parse the config with a function', async () => {\n      const { modifiedConfigContent: modifiedConfigContent2 } = await parseAndModifyConfigContent(\n        tsConfigs.nextConfigWithFunc,\n        configType,\n      )\n      expect(modifiedConfigContent2).toContain('withPayload(someFunc(nextConfig))')\n    })\n\n    it('should parse the config with a multi-lined function', async () => {\n      const { modifiedConfigContent } = await parseAndModifyConfigContent(\n        tsConfigs.nextConfigWithFuncMultiline,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain(importStatement)\n      expect(modifiedConfigContent).toMatch(/withPayload\\(someFunc\\(\\n {2}nextConfig\\n\\)\\)/)\n    })\n\n    it('should parse the config with a spread', async () => {\n      const { modifiedConfigContent } = await parseAndModifyConfigContent(\n        tsConfigs.nextConfigWithSpread,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain(importStatement)\n      expect(modifiedConfigContent).toContain('withPayload(nextConfig)')\n    })\n  })\n  describe('esm', () => {\n    const configType = 'esm'\n    const importStatement = withPayloadStatement[configType]\n    it('should parse the default next config', async () => {\n      const { modifiedConfigContent } = await parseAndModifyConfigContent(\n        esmConfigs.defaultNextConfig,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain(importStatement)\n      expect(modifiedConfigContent).toContain('withPayload(nextConfig)')\n    })\n    it('should parse the config with a function', async () => {\n      const { modifiedConfigContent } = await parseAndModifyConfigContent(\n        esmConfigs.nextConfigWithFunc,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain('withPayload(someFunc(nextConfig))')\n    })\n\n    it('should parse the config with a multi-lined function', async () => {\n      const { modifiedConfigContent } = await parseAndModifyConfigContent(\n        esmConfigs.nextConfigWithFuncMultiline,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain(importStatement)\n      expect(modifiedConfigContent).toMatch(/withPayload\\(someFunc\\(\\n {2}nextConfig\\n\\)\\)/)\n    })\n\n    it('should parse the config with a spread', async () => {\n      const { modifiedConfigContent } = await parseAndModifyConfigContent(\n        esmConfigs.nextConfigWithSpread,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain(importStatement)\n      expect(modifiedConfigContent).toContain('withPayload(nextConfig)')\n    })\n\n    // Unsupported: export { wrapped as default }\n    it('should give warning with a named export as default', async () => {\n      const warnLogSpy = jest.spyOn(p.log, 'warn').mockImplementation(() => {})\n\n      const { modifiedConfigContent, success } = await parseAndModifyConfigContent(\n        esmConfigs.nextConfigExportNamedDefault,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain(importStatement)\n      expect(success).toBe(false)\n\n      expect(warnLogSpy).toHaveBeenCalledWith(\n        expect.stringContaining('Could not automatically wrap'),\n      )\n    })\n  })\n\n  describe('cjs', () => {\n    const configType = 'cjs'\n    const requireStatement = withPayloadStatement[configType]\n    it('should parse the default next config', async () => {\n      const { modifiedConfigContent } = await parseAndModifyConfigContent(\n        cjsConfigs.defaultNextConfig,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain(requireStatement)\n      expect(modifiedConfigContent).toContain('withPayload(nextConfig)')\n    })\n    it('should parse anonymous default config', async () => {\n      const { modifiedConfigContent } = await parseAndModifyConfigContent(\n        cjsConfigs.anonConfig,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain(requireStatement)\n      expect(modifiedConfigContent).toContain('withPayload({})')\n    })\n    it('should parse the config with a function', async () => {\n      const { modifiedConfigContent } = await parseAndModifyConfigContent(\n        cjsConfigs.nextConfigWithFunc,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain('withPayload(someFunc(nextConfig))')\n    })\n    it('should parse the config with a multi-lined function', async () => {\n      const { modifiedConfigContent } = await parseAndModifyConfigContent(\n        cjsConfigs.nextConfigWithFuncMultiline,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain(requireStatement)\n      expect(modifiedConfigContent).toMatch(/withPayload\\(someFunc\\(\\n {2}nextConfig\\n\\)\\)/)\n    })\n    it('should parse the config with a named export as default', async () => {\n      const { modifiedConfigContent } = await parseAndModifyConfigContent(\n        cjsConfigs.nextConfigExportNamedDefault,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain(requireStatement)\n      expect(modifiedConfigContent).toContain('withPayload(wrapped)')\n    })\n\n    it('should parse the config with a spread', async () => {\n      const { modifiedConfigContent } = await parseAndModifyConfigContent(\n        cjsConfigs.nextConfigWithSpread,\n        configType,\n      )\n      expect(modifiedConfigContent).toContain(requireStatement)\n      expect(modifiedConfigContent).toContain('withPayload(nextConfig)')\n    })\n  })\n})\n"],"names":["p","jest","parseAndModifyConfigContent","withPayloadStatement","tsConfigs","defaultNextConfig","nextConfigExportNamedDefault","nextConfigWithFunc","nextConfigWithFuncMultiline","nextConfigWithSpread","esmConfigs","cjsConfigs","anonConfig","describe","configType","importStatement","it","modifiedConfigContent","expect","toContain","modifiedConfigContent2","toMatch","warnLogSpy","spyOn","log","mockImplementation","success","toBe","toHaveBeenCalledWith","stringContaining","requireStatement"],"mappings":"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"}

package/dist/lib/write-env-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"write-env-file.d.ts","sourceRoot":"","sources":["../../src/lib/write-env-file.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAI3D,wDAAwD;AACxD,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,OAAO,EAAE,OAAO,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB,aAAa,EAAE,MAAM,CAAA;IACrB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,eAAe,CAAA;CAC3B,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDhB"}
+{"version":3,"file":"write-env-file.d.ts","sourceRoot":"","sources":["../../src/lib/write-env-file.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAI3D,wDAAwD;AACxD,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,OAAO,EAAE,OAAO,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB,aAAa,EAAE,MAAM,CAAA;IACrB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,eAAe,CAAA;CAC3B,GAAG,OAAO,CAAC,IAAI,CAAC,CA0DhB"}

package/dist/lib/write-env-file.js

@@ -9,33 +9,33 @@ import { debug, error } from '../utils/log.js';
     }
     const envOutputPath = path.join(projectDir, '.env');
     try {
+        let fileContents;
+        if (template?.type === 'starter') {
+            // Parse .env file into key/value pairs
+            const envExample = path.join(projectDir, '.env.example');
+            const envFile = await fs.readFile(envExample, 'utf8');
+            fileContents = `# Added by Payload\n` + envFile.split('\n').filter((e)=>e).map((line)=>{
+                if (line.startsWith('#') || !line.includes('=')) return line;
+                const split = line.split('=');
+                const key = split[0];
+                let value = split[1];
+                if (key === 'MONGODB_URI' || key === 'MONGO_URL' || key === 'DATABASE_URI') {
+                    value = databaseUri;
+                }
+                if (key === 'PAYLOAD_SECRET' || key === 'PAYLOAD_SECRET_KEY') {
+                    value = payloadSecret;
+                }
+                return `${key}=${value}`;
+            }).join('\n');
+        } else {
+            fileContents = `# Added by Payload\nDATABASE_URI=${databaseUri}\nPAYLOAD_SECRET=${payloadSecret}\n`;
+        }
         if (fs.existsSync(envOutputPath)) {
-            if (template?.type === 'starter') {
-                // Parse .env file into key/value pairs
-                const envFile = await fs.readFile(path.join(projectDir, '.env.example'), 'utf8');
-                const envWithValues = envFile.split('\n').filter((e)=>e).map((line)=>{
-                    if (line.startsWith('#') || !line.includes('=')) return line;
-                    const split = line.split('=');
-                    const key = split[0];
-                    let value = split[1];
-                    if (key === 'MONGODB_URI' || key === 'MONGO_URL' || key === 'DATABASE_URI') {
-                        value = databaseUri;
-                    }
-                    if (key === 'PAYLOAD_SECRET' || key === 'PAYLOAD_SECRET_KEY') {
-                        value = payloadSecret;
-                    }
-                    return `${key}=${value}`;
-                });
-                // Write new .env file
-                await fs.writeFile(envOutputPath, envWithValues.join('\n'));
-            } else {
-                const existingEnv = await fs.readFile(envOutputPath, 'utf8');
-                const newEnv = existingEnv + `\nDATABASE_URI=${databaseUri}\nPAYLOAD_SECRET=${payloadSecret}\n`;
-                await fs.writeFile(envOutputPath, newEnv);
-            }
+            const existingEnv = await fs.readFile(envOutputPath, 'utf8');
+            const newEnv = existingEnv + '\n# Added by Payload' + fileContents;
+            await fs.writeFile(envOutputPath, newEnv);
         } else {
-            const content = `DATABASE_URI=${databaseUri}\nPAYLOAD_SECRET=${payloadSecret}`;
-            await fs.outputFile(`${projectDir}/.env`, content);
+            await fs.writeFile(envOutputPath, fileContents);
         }
     } catch (err) {
         error('Unable to write .env file');