create-payload-app 3.0.0-canary.fb81f02 → 3.0.0-canary.ff8c8fd

package/dist/lib/create-project.spec.js

@@ -29,7 +29,7 @@ describe('createProject', ()=>{
                 'project-name'
             ],
             '--db': 'mongodb',
-            '--local-template': 'blank-3.0',
+            '--local-template': 'blank',
             '--no-deps': true
         };
         const packageManager = 'yarn';
@@ -57,11 +57,11 @@ describe('createProject', ()=>{
             const templates = getValidTemplates();
             it.each([
                 [
-                    'blank-3.0',
+                    'blank',
                     'mongodb'
                 ],
                 [
-                    'blank-3.0',
+                    'blank',
                     'postgres'
                 ]
             ])('update config and deps: %s, %s', async (templateName, db)=>{

package/dist/lib/create-project.spec.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/create-project.spec.ts"],"sourcesContent":["import { jest } from '@jest/globals'\nimport fs from 'fs'\nimport fse from 'fs-extra'\nimport globby from 'globby'\nimport * as os from 'node:os'\nimport path from 'path'\n\nimport type { CliArgs, DbType, ProjectTemplate } from '../types.js'\n\nimport { createProject } from './create-project.js'\nimport { dbReplacements } from './replacements.js'\nimport { getValidTemplates } from './templates.js'\n\ndescribe('createProject', () => {\n  let projectDir: string\n  beforeAll(() => {\n    console.log = jest.fn()\n  })\n\n  beforeEach(() => {\n    const tempDirectory = fs.realpathSync(os.tmpdir())\n    projectDir = `${tempDirectory}/${Math.random().toString(36).substring(7)}`\n  })\n\n  afterEach(() => {\n    if (fse.existsSync(projectDir)) {\n      fse.rmSync(projectDir, { recursive: true })\n    }\n  })\n\n  describe('#createProject', () => {\n    const args = {\n      _: ['project-name'],\n      '--db': 'mongodb',\n      '--local-template': 'blank-3.0',\n      '--no-deps': true,\n    } as CliArgs\n    const packageManager = 'yarn'\n\n    it('creates plugin template', async () => {\n      const projectName = 'plugin'\n      const template: ProjectTemplate = {\n        name: 'plugin',\n        type: 'plugin',\n        description: 'Template for creating a Payload plugin',\n        url: 'https://github.com/payloadcms/payload-plugin-template',\n      }\n      await createProject({\n        cliArgs: args,\n        packageManager,\n        projectDir,\n        projectName,\n        template,\n      })\n\n      const packageJsonPath = path.resolve(projectDir, 'package.json')\n      const packageJson = fse.readJsonSync(packageJsonPath)\n\n      // Check package name and description\n      expect(packageJson.name).toEqual(projectName)\n    })\n\n    describe('creates project from template', () => {\n      const templates = getValidTemplates()\n\n      it.each([\n        ['blank-3.0', 'mongodb'],\n        ['blank-3.0', 'postgres'],\n\n        // TODO: Re-enable these once 3.0 is stable and templates updated\n        // ['website', 'mongodb'],\n        // ['website', 'postgres'],\n        // ['ecommerce', 'mongodb'],\n        // ['ecommerce', 'postgres'],\n      ])('update config and deps: %s, %s', async (templateName, db) => {\n        const projectName = 'starter-project'\n\n        const template = templates.find((t) => t.name === templateName)\n\n        const cliArgs = {\n          ...args,\n          '--db': db,\n          '--local-template': templateName,\n        } as CliArgs\n\n        await createProject({\n          cliArgs,\n          dbDetails: {\n            type: db as DbType,\n            dbUri: `${db}://localhost:27017/create-project-test`,\n          },\n          packageManager,\n          projectDir,\n          projectName,\n          template: template as ProjectTemplate,\n        })\n\n        const dbReplacement = dbReplacements[db as DbType]\n\n        const packageJsonPath = path.resolve(projectDir, 'package.json')\n        const packageJson = fse.readJsonSync(packageJsonPath)\n\n        // Verify git was initialized\n        expect(fse.existsSync(path.resolve(projectDir, '.git'))).toBe(true)\n\n        // Should only have one db adapter\n        expect(\n          Object.keys(packageJson.dependencies).filter((n) => n.startsWith('@payloadcms/db-')),\n        ).toHaveLength(1)\n\n        const payloadConfigPath = (\n          await globby('**/payload.config.ts', {\n            absolute: true,\n            cwd: projectDir,\n          })\n        )?.[0]\n\n        if (!payloadConfigPath) {\n          throw new Error(`Could not find payload.config.ts inside ${projectDir}`)\n        }\n\n        const content = fse.readFileSync(payloadConfigPath, 'utf-8')\n\n        // Check payload.config.ts\n        expect(content).not.toContain('// database-adapter-import')\n        expect(content).toContain(dbReplacement.importReplacement)\n\n        expect(content).not.toContain('// database-adapter-config-start')\n        expect(content).not.toContain('// database-adapter-config-end')\n        expect(content).toContain(dbReplacement.configReplacement().join('\\n'))\n      })\n    })\n  })\n})\n"],"names":["jest","fs","fse","globby","os","path","createProject","dbReplacements","getValidTemplates","describe","projectDir","beforeAll","console","log","fn","beforeEach","tempDirectory","realpathSync","tmpdir","Math","random","toString","substring","afterEach","existsSync","rmSync","recursive","args","_","packageManager","it","projectName","template","name","type","description","url","cliArgs","packageJsonPath","resolve","packageJson","readJsonSync","expect","toEqual","templates","each","templateName","db","find","t","dbDetails","dbUri","dbReplacement","toBe","Object","keys","dependencies","filter","n","startsWith","toHaveLength","payloadConfigPath","absolute","cwd","Error","content","readFileSync","not","toContain","importReplacement","configReplacement","join"],"mappings":"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"}
+{"version":3,"sources":["../../src/lib/create-project.spec.ts"],"sourcesContent":["import { jest } from '@jest/globals'\nimport fs from 'fs'\nimport fse from 'fs-extra'\nimport globby from 'globby'\nimport * as os from 'node:os'\nimport path from 'path'\n\nimport type { CliArgs, DbType, ProjectTemplate } from '../types.js'\n\nimport { createProject } from './create-project.js'\nimport { dbReplacements } from './replacements.js'\nimport { getValidTemplates } from './templates.js'\n\ndescribe('createProject', () => {\n  let projectDir: string\n  beforeAll(() => {\n    console.log = jest.fn()\n  })\n\n  beforeEach(() => {\n    const tempDirectory = fs.realpathSync(os.tmpdir())\n    projectDir = `${tempDirectory}/${Math.random().toString(36).substring(7)}`\n  })\n\n  afterEach(() => {\n    if (fse.existsSync(projectDir)) {\n      fse.rmSync(projectDir, { recursive: true })\n    }\n  })\n\n  describe('#createProject', () => {\n    const args = {\n      _: ['project-name'],\n      '--db': 'mongodb',\n      '--local-template': 'blank',\n      '--no-deps': true,\n    } as CliArgs\n    const packageManager = 'yarn'\n\n    it('creates plugin template', async () => {\n      const projectName = 'plugin'\n      const template: ProjectTemplate = {\n        name: 'plugin',\n        type: 'plugin',\n        description: 'Template for creating a Payload plugin',\n        url: 'https://github.com/payloadcms/payload-plugin-template',\n      }\n      await createProject({\n        cliArgs: args,\n        packageManager,\n        projectDir,\n        projectName,\n        template,\n      })\n\n      const packageJsonPath = path.resolve(projectDir, 'package.json')\n      const packageJson = fse.readJsonSync(packageJsonPath)\n\n      // Check package name and description\n      expect(packageJson.name).toEqual(projectName)\n    })\n\n    describe('creates project from template', () => {\n      const templates = getValidTemplates()\n\n      it.each([\n        ['blank', 'mongodb'],\n        ['blank', 'postgres'],\n\n        // TODO: Re-enable these once 3.0 is stable and templates updated\n        // ['website', 'mongodb'],\n        // ['website', 'postgres'],\n        // ['ecommerce', 'mongodb'],\n        // ['ecommerce', 'postgres'],\n      ])('update config and deps: %s, %s', async (templateName, db) => {\n        const projectName = 'starter-project'\n\n        const template = templates.find((t) => t.name === templateName)\n\n        const cliArgs = {\n          ...args,\n          '--db': db,\n          '--local-template': templateName,\n        } as CliArgs\n\n        await createProject({\n          cliArgs,\n          dbDetails: {\n            type: db as DbType,\n            dbUri: `${db}://localhost:27017/create-project-test`,\n          },\n          packageManager,\n          projectDir,\n          projectName,\n          template: template as ProjectTemplate,\n        })\n\n        const dbReplacement = dbReplacements[db as DbType]\n\n        const packageJsonPath = path.resolve(projectDir, 'package.json')\n        const packageJson = fse.readJsonSync(packageJsonPath)\n\n        // Verify git was initialized\n        expect(fse.existsSync(path.resolve(projectDir, '.git'))).toBe(true)\n\n        // Should only have one db adapter\n        expect(\n          Object.keys(packageJson.dependencies).filter((n) => n.startsWith('@payloadcms/db-')),\n        ).toHaveLength(1)\n\n        const payloadConfigPath = (\n          await globby('**/payload.config.ts', {\n            absolute: true,\n            cwd: projectDir,\n          })\n        )?.[0]\n\n        if (!payloadConfigPath) {\n          throw new Error(`Could not find payload.config.ts inside ${projectDir}`)\n        }\n\n        const content = fse.readFileSync(payloadConfigPath, 'utf-8')\n\n        // Check payload.config.ts\n        expect(content).not.toContain('// database-adapter-import')\n        expect(content).toContain(dbReplacement.importReplacement)\n\n        expect(content).not.toContain('// database-adapter-config-start')\n        expect(content).not.toContain('// database-adapter-config-end')\n        expect(content).toContain(dbReplacement.configReplacement().join('\\n'))\n      })\n    })\n  })\n})\n"],"names":["jest","fs","fse","globby","os","path","createProject","dbReplacements","getValidTemplates","describe","projectDir","beforeAll","console","log","fn","beforeEach","tempDirectory","realpathSync","tmpdir","Math","random","toString","substring","afterEach","existsSync","rmSync","recursive","args","_","packageManager","it","projectName","template","name","type","description","url","cliArgs","packageJsonPath","resolve","packageJson","readJsonSync","expect","toEqual","templates","each","templateName","db","find","t","dbDetails","dbUri","dbReplacement","toBe","Object","keys","dependencies","filter","n","startsWith","toHaveLength","payloadConfigPath","absolute","cwd","Error","content","readFileSync","not","toContain","importReplacement","configReplacement","join"],"mappings":"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"}

package/dist/lib/init-next.js

@@ -129,7 +129,7 @@ async function installAndConfigurePayload(args) {
             success: false
         };
     }
-    const templateFilesPath = dirname.endsWith('dist') || useDistFiles ? path.resolve(dirname, '../..', 'dist/template') : path.resolve(dirname, '../../../../templates/blank-3.0');
+    const templateFilesPath = dirname.endsWith('dist') || useDistFiles ? path.resolve(dirname, '../..', 'dist/template') : path.resolve(dirname, '../../../../templates/blank');
     logDebug(`Using template files from: ${templateFilesPath}`);
     if (!fs.existsSync(templateFilesPath)) {
         return {

package/dist/lib/init-next.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/init-next.ts"],"sourcesContent":["import type { CompilerOptions } from 'typescript'\n\nimport * as p from '@clack/prompts'\nimport { parse, stringify } from 'comment-json'\nimport execa from 'execa'\nimport fs from 'fs'\nimport fse from 'fs-extra'\nimport globby from 'globby'\nimport { fileURLToPath } from 'node:url'\nimport path from 'path'\nimport { promisify } from 'util'\n\nimport type { CliArgs, DbType, NextAppDetails, NextConfigType, PackageManager } from '../types.js'\n\nimport { copyRecursiveSync } from '../utils/copy-recursive-sync.js'\nimport { debug as origDebug, warning } from '../utils/log.js'\nimport { moveMessage } from '../utils/messages.js'\nimport { installPackages } from './install-packages.js'\nimport { wrapNextConfig } from './wrap-next-config.js'\n\nconst readFile = promisify(fs.readFile)\nconst writeFile = promisify(fs.writeFile)\n\nconst filename = fileURLToPath(import.meta.url)\nconst dirname = path.dirname(filename)\n\ntype InitNextArgs = {\n  dbType: DbType\n  nextAppDetails?: NextAppDetails\n  packageManager: PackageManager\n  projectDir: string\n  useDistFiles?: boolean\n} & Pick<CliArgs, '--debug'>\n\ntype InitNextResult =\n  | {\n      isSrcDir: boolean\n      nextAppDir: string\n      payloadConfigPath: string\n      success: true\n    }\n  | { isSrcDir: boolean; nextAppDir?: string; reason: string; success: false }\n\nexport async function initNext(args: InitNextArgs): Promise<InitNextResult> {\n  const { dbType: dbType, packageManager, projectDir } = args\n\n  const nextAppDetails = args.nextAppDetails || (await getNextAppDetails(projectDir))\n\n  if (!nextAppDetails.nextAppDir) {\n    warning(`Could not find app directory in ${projectDir}, creating...`)\n    const createdAppDir = path.resolve(projectDir, nextAppDetails.isSrcDir ? 'src/app' : 'app')\n    fse.mkdirSync(createdAppDir, { recursive: true })\n    nextAppDetails.nextAppDir = createdAppDir\n  }\n\n  const { hasTopLevelLayout, isPayloadInstalled, isSrcDir, nextAppDir, nextConfigType } =\n    nextAppDetails\n\n  if (!nextConfigType) {\n    return {\n      isSrcDir,\n      nextAppDir,\n      reason: `Could not determine Next Config type in ${projectDir}. Possibly try renaming next.config.js to next.config.cjs or next.config.mjs.`,\n      success: false,\n    }\n  }\n\n  if (hasTopLevelLayout) {\n    // Output directions for user to move all files from app to top-level directory named `(app)`\n    p.log.warn(moveMessage({ nextAppDir, projectDir }))\n    return {\n      isSrcDir,\n      nextAppDir,\n      reason: 'Found existing layout.tsx in app directory',\n      success: false,\n    }\n  }\n\n  const installSpinner = p.spinner()\n  installSpinner.start('Installing Payload and dependencies...')\n\n  const configurationResult = await installAndConfigurePayload({\n    ...args,\n    nextAppDetails,\n    nextConfigType,\n    useDistFiles: true, // Requires running 'pnpm pack-template-files' in cpa\n  })\n\n  if (configurationResult.success === false) {\n    installSpinner.stop(configurationResult.reason, 1)\n    return { ...configurationResult, isSrcDir, success: false }\n  }\n\n  const { success: installSuccess } = await installDeps(projectDir, packageManager, dbType)\n  if (!installSuccess) {\n    installSpinner.stop('Failed to install dependencies', 1)\n    return {\n      ...configurationResult,\n      isSrcDir,\n      reason: 'Failed to install dependencies',\n      success: false,\n    }\n  }\n\n  // Add `@payload-config` to tsconfig.json `paths`\n  await addPayloadConfigToTsConfig(projectDir, isSrcDir)\n  installSpinner.stop('Successfully installed Payload and dependencies')\n  return { ...configurationResult, isSrcDir, nextAppDir, success: true }\n}\n\nasync function addPayloadConfigToTsConfig(projectDir: string, isSrcDir: boolean) {\n  const tsConfigPath = path.resolve(projectDir, 'tsconfig.json')\n\n  // Check if tsconfig.json exists\n  if (!fs.existsSync(tsConfigPath)) {\n    warning(`Could not find tsconfig.json to add @payload-config path.`)\n    return\n  }\n  const userTsConfigContent = await readFile(tsConfigPath, {\n    encoding: 'utf8',\n  })\n  const userTsConfig = parse(userTsConfigContent) as {\n    compilerOptions?: CompilerOptions\n  }\n\n  const hasBaseUrl =\n    userTsConfig?.compilerOptions?.baseUrl && userTsConfig?.compilerOptions?.baseUrl !== '.'\n  const baseUrl = hasBaseUrl ? userTsConfig?.compilerOptions?.baseUrl : './'\n\n  if (!userTsConfig.compilerOptions && !('extends' in userTsConfig)) {\n    userTsConfig.compilerOptions = {}\n  }\n\n  if (\n    !userTsConfig.compilerOptions?.paths?.['@payload-config'] &&\n    userTsConfig.compilerOptions?.paths\n  ) {\n    userTsConfig.compilerOptions.paths = {\n      ...(userTsConfig.compilerOptions.paths || {}),\n      '@payload-config': [`${baseUrl}${isSrcDir ? 'src/' : ''}payload.config.ts`],\n    }\n    await writeFile(tsConfigPath, stringify(userTsConfig, null, 2), { encoding: 'utf8' })\n  }\n}\n\nasync function installAndConfigurePayload(\n  args: {\n    nextAppDetails: NextAppDetails\n    nextConfigType: NextConfigType\n    useDistFiles?: boolean\n  } & InitNextArgs,\n): Promise<\n  | { payloadConfigPath: string; success: true }\n  | { payloadConfigPath?: string; reason: string; success: false }\n> {\n  const {\n    '--debug': debug,\n    nextAppDetails: { isSrcDir, nextAppDir, nextConfigPath } = {},\n    nextConfigType,\n    projectDir,\n    useDistFiles,\n  } = args\n\n  if (!nextAppDir || !nextConfigPath) {\n    return {\n      reason: 'Could not find app directory or next.config.js',\n      success: false,\n    }\n  }\n\n  const logDebug = (message: string) => {\n    if (debug) origDebug(message)\n  }\n\n  if (!fs.existsSync(projectDir)) {\n    return {\n      reason: `Could not find specified project directory at ${projectDir}`,\n      success: false,\n    }\n  }\n\n  const templateFilesPath =\n    dirname.endsWith('dist') || useDistFiles\n      ? path.resolve(dirname, '../..', 'dist/template')\n      : path.resolve(dirname, '../../../../templates/blank-3.0')\n\n  logDebug(`Using template files from: ${templateFilesPath}`)\n\n  if (!fs.existsSync(templateFilesPath)) {\n    return {\n      reason: `Could not find template source files from ${templateFilesPath}`,\n      success: false,\n    }\n  } else {\n    logDebug('Found template source files')\n  }\n\n  logDebug(`Copying template files from ${templateFilesPath} to ${nextAppDir}`)\n\n  const templateSrcDir = path.resolve(templateFilesPath, isSrcDir ? '' : 'src')\n\n  logDebug(`templateSrcDir: ${templateSrcDir}`)\n  logDebug(`nextAppDir: ${nextAppDir}`)\n  logDebug(`projectDir: ${projectDir}`)\n  logDebug(`nextConfigPath: ${nextConfigPath}`)\n  logDebug(`payloadConfigPath: ${path.resolve(projectDir, 'payload.config.ts')}`)\n\n  logDebug(\n    `isSrcDir: ${isSrcDir}. source: ${templateSrcDir}. dest: ${path.dirname(nextConfigPath)}`,\n  )\n\n  // This is a little clunky and needs to account for isSrcDir\n  copyRecursiveSync(templateSrcDir, path.dirname(nextConfigPath), debug)\n\n  // Wrap next.config.js with withPayload\n  await wrapNextConfig({ nextConfigPath, nextConfigType })\n\n  return {\n    payloadConfigPath: path.resolve(nextAppDir, '../payload.config.ts'),\n    success: true,\n  }\n}\n\nasync function installDeps(projectDir: string, packageManager: PackageManager, dbType: DbType) {\n  const packagesToInstall = [\n    'payload',\n    '@payloadcms/next',\n    '@payloadcms/richtext-lexical',\n    '@payloadcms/plugin-cloud',\n  ].map((pkg) => `${pkg}@beta`)\n\n  packagesToInstall.push(`@payloadcms/db-${dbType}@beta`)\n\n  // Match graphql version of @payloadcms/next\n  packagesToInstall.push('graphql@^16.8.1')\n\n  return await installPackages({ packageManager, packagesToInstall, projectDir })\n}\n\nexport async function getNextAppDetails(projectDir: string): Promise<NextAppDetails> {\n  const isSrcDir = fs.existsSync(path.resolve(projectDir, 'src'))\n\n  // Match next.config.js, next.config.ts, next.config.mjs, next.config.cjs\n  const nextConfigPath: string | undefined = (\n    await globby('next.config.(\\\\w)?(t|j)s', { absolute: true, cwd: projectDir })\n  )?.[0]\n\n  if (!nextConfigPath || nextConfigPath.length === 0) {\n    return {\n      hasTopLevelLayout: false,\n      isSrcDir,\n      isSupportedNextVersion: false,\n      nextConfigPath: undefined,\n      nextVersion: null,\n    }\n  }\n\n  const packageObj = await fse.readJson(path.resolve(projectDir, 'package.json'))\n  // Check if Next.js version is new enough\n  let nextVersion = null\n  if (packageObj.dependencies?.next) {\n    nextVersion = packageObj.dependencies.next\n    // Match versions using regex matching groups\n    const versionMatch = /(?<major>\\d+)/.exec(nextVersion)\n    if (!versionMatch) {\n      p.log.warn(`Could not determine Next.js version from ${nextVersion}`)\n      return {\n        hasTopLevelLayout: false,\n        isSrcDir,\n        isSupportedNextVersion: false,\n        nextConfigPath,\n        nextVersion,\n      }\n    }\n\n    const { major } = versionMatch.groups as { major: string }\n    const majorVersion = parseInt(major)\n    if (majorVersion < 15) {\n      return {\n        hasTopLevelLayout: false,\n        isSrcDir,\n        isSupportedNextVersion: false,\n        nextConfigPath,\n        nextVersion,\n      }\n    }\n  }\n\n  const isSupportedNextVersion = true\n\n  // Check if Payload already installed\n  if (packageObj.dependencies?.payload) {\n    return {\n      hasTopLevelLayout: false,\n      isPayloadInstalled: true,\n      isSrcDir,\n      isSupportedNextVersion,\n      nextConfigPath,\n      nextVersion,\n    }\n  }\n\n  let nextAppDir: string | undefined = (\n    await globby(['**/app'], {\n      absolute: true,\n      cwd: projectDir,\n      ignore: ['**/node_modules/**'],\n      onlyDirectories: true,\n    })\n  )?.[0]\n\n  if (!nextAppDir || nextAppDir.length === 0) {\n    nextAppDir = undefined\n  }\n\n  const configType = getProjectType({ nextConfigPath, packageObj })\n\n  const hasTopLevelLayout = nextAppDir\n    ? fs.existsSync(path.resolve(nextAppDir, 'layout.tsx'))\n    : false\n\n  return {\n    hasTopLevelLayout,\n    isSrcDir,\n    isSupportedNextVersion,\n    nextAppDir,\n    nextConfigPath,\n    nextConfigType: configType,\n    nextVersion,\n  }\n}\n\nfunction getProjectType(args: {\n  nextConfigPath: string\n  packageObj: Record<string, unknown>\n}): NextConfigType {\n  const { nextConfigPath, packageObj } = args\n\n  if (nextConfigPath.endsWith('.ts')) {\n    return 'ts'\n  }\n\n  if (nextConfigPath.endsWith('.mjs')) {\n    return 'esm'\n  }\n  if (nextConfigPath.endsWith('.cjs')) {\n    return 'cjs'\n  }\n\n  const packageJsonType = packageObj.type\n  if (packageJsonType === 'module') {\n    return 'esm'\n  }\n  if (packageJsonType === 'commonjs') {\n    return 'cjs'\n  }\n\n  return 'cjs'\n}\n"],"names":["p","parse","stringify","fs","fse","globby","fileURLToPath","path","promisify","copyRecursiveSync","debug","origDebug","warning","moveMessage","installPackages","wrapNextConfig","readFile","writeFile","filename","url","dirname","initNext","args","dbType","packageManager","projectDir","nextAppDetails","getNextAppDetails","nextAppDir","createdAppDir","resolve","isSrcDir","mkdirSync","recursive","hasTopLevelLayout","isPayloadInstalled","nextConfigType","reason","success","log","warn","installSpinner","spinner","start","configurationResult","installAndConfigurePayload","useDistFiles","stop","installSuccess","installDeps","addPayloadConfigToTsConfig","tsConfigPath","existsSync","userTsConfigContent","encoding","userTsConfig","hasBaseUrl","compilerOptions","baseUrl","paths","nextConfigPath","logDebug","message","templateFilesPath","endsWith","templateSrcDir","payloadConfigPath","packagesToInstall","map","pkg","push","absolute","cwd","length","isSupportedNextVersion","undefined","nextVersion","packageObj","readJson","dependencies","next","versionMatch","exec","major","groups","majorVersion","parseInt","payload","ignore","onlyDirectories","configType","getProjectType","packageJsonType","type"],"mappings":"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"}
+{"version":3,"sources":["../../src/lib/init-next.ts"],"sourcesContent":["import type { CompilerOptions } from 'typescript'\n\nimport * as p from '@clack/prompts'\nimport { parse, stringify } from 'comment-json'\nimport execa from 'execa'\nimport fs from 'fs'\nimport fse from 'fs-extra'\nimport globby from 'globby'\nimport { fileURLToPath } from 'node:url'\nimport path from 'path'\nimport { promisify } from 'util'\n\nimport type { CliArgs, DbType, NextAppDetails, NextConfigType, PackageManager } from '../types.js'\n\nimport { copyRecursiveSync } from '../utils/copy-recursive-sync.js'\nimport { debug as origDebug, warning } from '../utils/log.js'\nimport { moveMessage } from '../utils/messages.js'\nimport { installPackages } from './install-packages.js'\nimport { wrapNextConfig } from './wrap-next-config.js'\n\nconst readFile = promisify(fs.readFile)\nconst writeFile = promisify(fs.writeFile)\n\nconst filename = fileURLToPath(import.meta.url)\nconst dirname = path.dirname(filename)\n\ntype InitNextArgs = {\n  dbType: DbType\n  nextAppDetails?: NextAppDetails\n  packageManager: PackageManager\n  projectDir: string\n  useDistFiles?: boolean\n} & Pick<CliArgs, '--debug'>\n\ntype InitNextResult =\n  | {\n      isSrcDir: boolean\n      nextAppDir: string\n      payloadConfigPath: string\n      success: true\n    }\n  | { isSrcDir: boolean; nextAppDir?: string; reason: string; success: false }\n\nexport async function initNext(args: InitNextArgs): Promise<InitNextResult> {\n  const { dbType: dbType, packageManager, projectDir } = args\n\n  const nextAppDetails = args.nextAppDetails || (await getNextAppDetails(projectDir))\n\n  if (!nextAppDetails.nextAppDir) {\n    warning(`Could not find app directory in ${projectDir}, creating...`)\n    const createdAppDir = path.resolve(projectDir, nextAppDetails.isSrcDir ? 'src/app' : 'app')\n    fse.mkdirSync(createdAppDir, { recursive: true })\n    nextAppDetails.nextAppDir = createdAppDir\n  }\n\n  const { hasTopLevelLayout, isPayloadInstalled, isSrcDir, nextAppDir, nextConfigType } =\n    nextAppDetails\n\n  if (!nextConfigType) {\n    return {\n      isSrcDir,\n      nextAppDir,\n      reason: `Could not determine Next Config type in ${projectDir}. Possibly try renaming next.config.js to next.config.cjs or next.config.mjs.`,\n      success: false,\n    }\n  }\n\n  if (hasTopLevelLayout) {\n    // Output directions for user to move all files from app to top-level directory named `(app)`\n    p.log.warn(moveMessage({ nextAppDir, projectDir }))\n    return {\n      isSrcDir,\n      nextAppDir,\n      reason: 'Found existing layout.tsx in app directory',\n      success: false,\n    }\n  }\n\n  const installSpinner = p.spinner()\n  installSpinner.start('Installing Payload and dependencies...')\n\n  const configurationResult = await installAndConfigurePayload({\n    ...args,\n    nextAppDetails,\n    nextConfigType,\n    useDistFiles: true, // Requires running 'pnpm pack-template-files' in cpa\n  })\n\n  if (configurationResult.success === false) {\n    installSpinner.stop(configurationResult.reason, 1)\n    return { ...configurationResult, isSrcDir, success: false }\n  }\n\n  const { success: installSuccess } = await installDeps(projectDir, packageManager, dbType)\n  if (!installSuccess) {\n    installSpinner.stop('Failed to install dependencies', 1)\n    return {\n      ...configurationResult,\n      isSrcDir,\n      reason: 'Failed to install dependencies',\n      success: false,\n    }\n  }\n\n  // Add `@payload-config` to tsconfig.json `paths`\n  await addPayloadConfigToTsConfig(projectDir, isSrcDir)\n  installSpinner.stop('Successfully installed Payload and dependencies')\n  return { ...configurationResult, isSrcDir, nextAppDir, success: true }\n}\n\nasync function addPayloadConfigToTsConfig(projectDir: string, isSrcDir: boolean) {\n  const tsConfigPath = path.resolve(projectDir, 'tsconfig.json')\n\n  // Check if tsconfig.json exists\n  if (!fs.existsSync(tsConfigPath)) {\n    warning(`Could not find tsconfig.json to add @payload-config path.`)\n    return\n  }\n  const userTsConfigContent = await readFile(tsConfigPath, {\n    encoding: 'utf8',\n  })\n  const userTsConfig = parse(userTsConfigContent) as {\n    compilerOptions?: CompilerOptions\n  }\n\n  const hasBaseUrl =\n    userTsConfig?.compilerOptions?.baseUrl && userTsConfig?.compilerOptions?.baseUrl !== '.'\n  const baseUrl = hasBaseUrl ? userTsConfig?.compilerOptions?.baseUrl : './'\n\n  if (!userTsConfig.compilerOptions && !('extends' in userTsConfig)) {\n    userTsConfig.compilerOptions = {}\n  }\n\n  if (\n    !userTsConfig.compilerOptions?.paths?.['@payload-config'] &&\n    userTsConfig.compilerOptions?.paths\n  ) {\n    userTsConfig.compilerOptions.paths = {\n      ...(userTsConfig.compilerOptions.paths || {}),\n      '@payload-config': [`${baseUrl}${isSrcDir ? 'src/' : ''}payload.config.ts`],\n    }\n    await writeFile(tsConfigPath, stringify(userTsConfig, null, 2), { encoding: 'utf8' })\n  }\n}\n\nasync function installAndConfigurePayload(\n  args: {\n    nextAppDetails: NextAppDetails\n    nextConfigType: NextConfigType\n    useDistFiles?: boolean\n  } & InitNextArgs,\n): Promise<\n  | { payloadConfigPath: string; success: true }\n  | { payloadConfigPath?: string; reason: string; success: false }\n> {\n  const {\n    '--debug': debug,\n    nextAppDetails: { isSrcDir, nextAppDir, nextConfigPath } = {},\n    nextConfigType,\n    projectDir,\n    useDistFiles,\n  } = args\n\n  if (!nextAppDir || !nextConfigPath) {\n    return {\n      reason: 'Could not find app directory or next.config.js',\n      success: false,\n    }\n  }\n\n  const logDebug = (message: string) => {\n    if (debug) origDebug(message)\n  }\n\n  if (!fs.existsSync(projectDir)) {\n    return {\n      reason: `Could not find specified project directory at ${projectDir}`,\n      success: false,\n    }\n  }\n\n  const templateFilesPath =\n    dirname.endsWith('dist') || useDistFiles\n      ? path.resolve(dirname, '../..', 'dist/template')\n      : path.resolve(dirname, '../../../../templates/blank')\n\n  logDebug(`Using template files from: ${templateFilesPath}`)\n\n  if (!fs.existsSync(templateFilesPath)) {\n    return {\n      reason: `Could not find template source files from ${templateFilesPath}`,\n      success: false,\n    }\n  } else {\n    logDebug('Found template source files')\n  }\n\n  logDebug(`Copying template files from ${templateFilesPath} to ${nextAppDir}`)\n\n  const templateSrcDir = path.resolve(templateFilesPath, isSrcDir ? '' : 'src')\n\n  logDebug(`templateSrcDir: ${templateSrcDir}`)\n  logDebug(`nextAppDir: ${nextAppDir}`)\n  logDebug(`projectDir: ${projectDir}`)\n  logDebug(`nextConfigPath: ${nextConfigPath}`)\n  logDebug(`payloadConfigPath: ${path.resolve(projectDir, 'payload.config.ts')}`)\n\n  logDebug(\n    `isSrcDir: ${isSrcDir}. source: ${templateSrcDir}. dest: ${path.dirname(nextConfigPath)}`,\n  )\n\n  // This is a little clunky and needs to account for isSrcDir\n  copyRecursiveSync(templateSrcDir, path.dirname(nextConfigPath), debug)\n\n  // Wrap next.config.js with withPayload\n  await wrapNextConfig({ nextConfigPath, nextConfigType })\n\n  return {\n    payloadConfigPath: path.resolve(nextAppDir, '../payload.config.ts'),\n    success: true,\n  }\n}\n\nasync function installDeps(projectDir: string, packageManager: PackageManager, dbType: DbType) {\n  const packagesToInstall = [\n    'payload',\n    '@payloadcms/next',\n    '@payloadcms/richtext-lexical',\n    '@payloadcms/plugin-cloud',\n  ].map((pkg) => `${pkg}@beta`)\n\n  packagesToInstall.push(`@payloadcms/db-${dbType}@beta`)\n\n  // Match graphql version of @payloadcms/next\n  packagesToInstall.push('graphql@^16.8.1')\n\n  return await installPackages({ packageManager, packagesToInstall, projectDir })\n}\n\nexport async function getNextAppDetails(projectDir: string): Promise<NextAppDetails> {\n  const isSrcDir = fs.existsSync(path.resolve(projectDir, 'src'))\n\n  // Match next.config.js, next.config.ts, next.config.mjs, next.config.cjs\n  const nextConfigPath: string | undefined = (\n    await globby('next.config.(\\\\w)?(t|j)s', { absolute: true, cwd: projectDir })\n  )?.[0]\n\n  if (!nextConfigPath || nextConfigPath.length === 0) {\n    return {\n      hasTopLevelLayout: false,\n      isSrcDir,\n      isSupportedNextVersion: false,\n      nextConfigPath: undefined,\n      nextVersion: null,\n    }\n  }\n\n  const packageObj = await fse.readJson(path.resolve(projectDir, 'package.json'))\n  // Check if Next.js version is new enough\n  let nextVersion = null\n  if (packageObj.dependencies?.next) {\n    nextVersion = packageObj.dependencies.next\n    // Match versions using regex matching groups\n    const versionMatch = /(?<major>\\d+)/.exec(nextVersion)\n    if (!versionMatch) {\n      p.log.warn(`Could not determine Next.js version from ${nextVersion}`)\n      return {\n        hasTopLevelLayout: false,\n        isSrcDir,\n        isSupportedNextVersion: false,\n        nextConfigPath,\n        nextVersion,\n      }\n    }\n\n    const { major } = versionMatch.groups as { major: string }\n    const majorVersion = parseInt(major)\n    if (majorVersion < 15) {\n      return {\n        hasTopLevelLayout: false,\n        isSrcDir,\n        isSupportedNextVersion: false,\n        nextConfigPath,\n        nextVersion,\n      }\n    }\n  }\n\n  const isSupportedNextVersion = true\n\n  // Check if Payload already installed\n  if (packageObj.dependencies?.payload) {\n    return {\n      hasTopLevelLayout: false,\n      isPayloadInstalled: true,\n      isSrcDir,\n      isSupportedNextVersion,\n      nextConfigPath,\n      nextVersion,\n    }\n  }\n\n  let nextAppDir: string | undefined = (\n    await globby(['**/app'], {\n      absolute: true,\n      cwd: projectDir,\n      ignore: ['**/node_modules/**'],\n      onlyDirectories: true,\n    })\n  )?.[0]\n\n  if (!nextAppDir || nextAppDir.length === 0) {\n    nextAppDir = undefined\n  }\n\n  const configType = getProjectType({ nextConfigPath, packageObj })\n\n  const hasTopLevelLayout = nextAppDir\n    ? fs.existsSync(path.resolve(nextAppDir, 'layout.tsx'))\n    : false\n\n  return {\n    hasTopLevelLayout,\n    isSrcDir,\n    isSupportedNextVersion,\n    nextAppDir,\n    nextConfigPath,\n    nextConfigType: configType,\n    nextVersion,\n  }\n}\n\nfunction getProjectType(args: {\n  nextConfigPath: string\n  packageObj: Record<string, unknown>\n}): NextConfigType {\n  const { nextConfigPath, packageObj } = args\n\n  if (nextConfigPath.endsWith('.ts')) {\n    return 'ts'\n  }\n\n  if (nextConfigPath.endsWith('.mjs')) {\n    return 'esm'\n  }\n  if (nextConfigPath.endsWith('.cjs')) {\n    return 'cjs'\n  }\n\n  const packageJsonType = packageObj.type\n  if (packageJsonType === 'module') {\n    return 'esm'\n  }\n  if (packageJsonType === 'commonjs') {\n    return 'cjs'\n  }\n\n  return 'cjs'\n}\n"],"names":["p","parse","stringify","fs","fse","globby","fileURLToPath","path","promisify","copyRecursiveSync","debug","origDebug","warning","moveMessage","installPackages","wrapNextConfig","readFile","writeFile","filename","url","dirname","initNext","args","dbType","packageManager","projectDir","nextAppDetails","getNextAppDetails","nextAppDir","createdAppDir","resolve","isSrcDir","mkdirSync","recursive","hasTopLevelLayout","isPayloadInstalled","nextConfigType","reason","success","log","warn","installSpinner","spinner","start","configurationResult","installAndConfigurePayload","useDistFiles","stop","installSuccess","installDeps","addPayloadConfigToTsConfig","tsConfigPath","existsSync","userTsConfigContent","encoding","userTsConfig","hasBaseUrl","compilerOptions","baseUrl","paths","nextConfigPath","logDebug","message","templateFilesPath","endsWith","templateSrcDir","payloadConfigPath","packagesToInstall","map","pkg","push","absolute","cwd","length","isSupportedNextVersion","undefined","nextVersion","packageObj","readJson","dependencies","next","versionMatch","exec","major","groups","majorVersion","parseInt","payload","ignore","onlyDirectories","configType","getProjectType","packageJsonType","type"],"mappings":"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"}

package/dist/lib/templates.js

@@ -14,7 +14,7 @@ export function getValidTemplates() {
             name: 'blank',
             type: 'starter',
             description: 'Blank 3.0 Template',
-            url: 'https://github.com/payloadcms/payload/templates/blank-3.0#beta'
+            url: 'https://github.com/payloadcms/payload/templates/blank#beta'
         },
         {
             name: 'website',

package/dist/lib/templates.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/templates.ts"],"sourcesContent":["import type { ProjectTemplate } from '../types.js'\n\nimport { error, info } from '../utils/log.js'\n\nexport function validateTemplate(templateName: string): boolean {\n  const validTemplates = getValidTemplates()\n  if (!validTemplates.map((t) => t.name).includes(templateName)) {\n    error(`'${templateName}' is not a valid template.`)\n    info(`Valid templates: ${validTemplates.map((t) => t.name).join(', ')}`)\n    return false\n  }\n  return true\n}\n\nexport function getValidTemplates(): ProjectTemplate[] {\n  return [\n    {\n      name: 'blank',\n      type: 'starter',\n      description: 'Blank 3.0 Template',\n      url: 'https://github.com/payloadcms/payload/templates/blank-3.0#beta',\n    },\n    {\n      name: 'website',\n      type: 'starter',\n      description: 'Website Template',\n      url: 'https://github.com/payloadcms/payload/templates/website#beta',\n    },\n\n    // Remove these until they have been updated for 3.0\n\n    // {\n    //   name: 'blank',\n    //   type: 'starter',\n    //   description: 'Blank Template',\n    //   url: 'https://github.com/payloadcms/payload/templates/blank',\n    // },\n    // {\n    //   name: 'ecommerce',\n    //   type: 'starter',\n    //   description: 'E-commerce Template',\n    //   url: 'https://github.com/payloadcms/payload/templates/ecommerce',\n    // },\n    // {\n    //   name: 'plugin',\n    //   type: 'plugin',\n    //   description: 'Template for creating a Payload plugin',\n    //   url: 'https://github.com/payloadcms/payload-plugin-template#beta',\n    // },\n    // {\n    //   name: 'payload-demo',\n    //   type: 'starter',\n    //   description: 'Payload demo site at https://demo.payloadcms.com',\n    //   url: 'https://github.com/payloadcms/public-demo',\n    // },\n    // {\n    //   name: 'payload-website',\n    //   type: 'starter',\n    //   description: 'Payload website CMS at https://payloadcms.com',\n    //   url: 'https://github.com/payloadcms/website-cms',\n    // },\n  ]\n}\n"],"names":["error","info","validateTemplate","templateName","validTemplates","getValidTemplates","map","t","name","includes","join","type","description","url"],"mappings":"AAEA,SAASA,KAAK,EAAEC,IAAI,QAAQ,kBAAiB;AAE7C,OAAO,SAASC,iBAAiBC,YAAoB;IACnD,MAAMC,iBAAiBC;IACvB,IAAI,CAACD,eAAeE,GAAG,CAAC,CAACC,IAAMA,EAAEC,IAAI,EAAEC,QAAQ,CAACN,eAAe;QAC7DH,MAAM,CAAC,CAAC,EAAEG,aAAa,0BAA0B,CAAC;QAClDF,KAAK,CAAC,iBAAiB,EAAEG,eAAeE,GAAG,CAAC,CAACC,IAAMA,EAAEC,IAAI,EAAEE,IAAI,CAAC,MAAM,CAAC;QACvE,OAAO;IACT;IACA,OAAO;AACT;AAEA,OAAO,SAASL;IACd,OAAO;QACL;YACEG,MAAM;YACNG,MAAM;YACNC,aAAa;YACbC,KAAK;QACP;QACA;YACEL,MAAM;YACNG,MAAM;YACNC,aAAa;YACbC,KAAK;QACP;KAkCD;AACH"}
+{"version":3,"sources":["../../src/lib/templates.ts"],"sourcesContent":["import type { ProjectTemplate } from '../types.js'\n\nimport { error, info } from '../utils/log.js'\n\nexport function validateTemplate(templateName: string): boolean {\n  const validTemplates = getValidTemplates()\n  if (!validTemplates.map((t) => t.name).includes(templateName)) {\n    error(`'${templateName}' is not a valid template.`)\n    info(`Valid templates: ${validTemplates.map((t) => t.name).join(', ')}`)\n    return false\n  }\n  return true\n}\n\nexport function getValidTemplates(): ProjectTemplate[] {\n  return [\n    {\n      name: 'blank',\n      type: 'starter',\n      description: 'Blank 3.0 Template',\n      url: 'https://github.com/payloadcms/payload/templates/blank#beta',\n    },\n    {\n      name: 'website',\n      type: 'starter',\n      description: 'Website Template',\n      url: 'https://github.com/payloadcms/payload/templates/website#beta',\n    },\n\n    // Remove these until they have been updated for 3.0\n\n    // {\n    //   name: 'blank',\n    //   type: 'starter',\n    //   description: 'Blank Template',\n    //   url: 'https://github.com/payloadcms/payload/templates/blank',\n    // },\n    // {\n    //   name: 'ecommerce',\n    //   type: 'starter',\n    //   description: 'E-commerce Template',\n    //   url: 'https://github.com/payloadcms/payload/templates/ecommerce',\n    // },\n    // {\n    //   name: 'plugin',\n    //   type: 'plugin',\n    //   description: 'Template for creating a Payload plugin',\n    //   url: 'https://github.com/payloadcms/payload-plugin-template#beta',\n    // },\n    // {\n    //   name: 'payload-demo',\n    //   type: 'starter',\n    //   description: 'Payload demo site at https://demo.payloadcms.com',\n    //   url: 'https://github.com/payloadcms/public-demo',\n    // },\n    // {\n    //   name: 'payload-website',\n    //   type: 'starter',\n    //   description: 'Payload website CMS at https://payloadcms.com',\n    //   url: 'https://github.com/payloadcms/website-cms',\n    // },\n  ]\n}\n"],"names":["error","info","validateTemplate","templateName","validTemplates","getValidTemplates","map","t","name","includes","join","type","description","url"],"mappings":"AAEA,SAASA,KAAK,EAAEC,IAAI,QAAQ,kBAAiB;AAE7C,OAAO,SAASC,iBAAiBC,YAAoB;IACnD,MAAMC,iBAAiBC;IACvB,IAAI,CAACD,eAAeE,GAAG,CAAC,CAACC,IAAMA,EAAEC,IAAI,EAAEC,QAAQ,CAACN,eAAe;QAC7DH,MAAM,CAAC,CAAC,EAAEG,aAAa,0BAA0B,CAAC;QAClDF,KAAK,CAAC,iBAAiB,EAAEG,eAAeE,GAAG,CAAC,CAACC,IAAMA,EAAEC,IAAI,EAAEE,IAAI,CAAC,MAAM,CAAC;QACvE,OAAO;IACT;IACA,OAAO;AACT;AAEA,OAAO,SAASL;IACd,OAAO;QACL;YACEG,MAAM;YACNG,MAAM;YACNC,aAAa;YACbC,KAAK;QACP;QACA;YACEL,MAAM;YACNG,MAAM;YACNC,aAAa;YACbC,KAAK;QACP;KAkCD;AACH"}

package/dist/lib/update-payload-in-project.js

@@ -59,7 +59,7 @@ export async function updatePayloadInProject(appDetails) {
     }
     info('Payload packages updated successfully.');
     info(`Updating Payload Next.js files...`);
-    const templateFilesPath = process.env.JEST_WORKER_ID !== undefined ? path.resolve(dirname, '../../../../templates/blank-3.0') : path.resolve(dirname, '../..', 'dist/template');
+    const templateFilesPath = process.env.JEST_WORKER_ID !== undefined ? path.resolve(dirname, '../../../../templates/blank') : path.resolve(dirname, '../..', 'dist/template');
     const templateSrcDir = path.resolve(templateFilesPath, 'src/app/(payload)');
     copyRecursiveSync(templateSrcDir, path.resolve(projectDir, appDetails.isSrcDir ? 'src/app' : 'app', '(payload)'));
     return {

package/dist/lib/update-payload-in-project.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/update-payload-in-project.ts"],"sourcesContent":["import execa from 'execa'\nimport fse from 'fs-extra'\nimport { fileURLToPath } from 'node:url'\nimport path from 'path'\n\nconst filename = fileURLToPath(import.meta.url)\nconst dirname = path.dirname(filename)\n\nimport type { NextAppDetails } from '../types.js'\n\nimport { copyRecursiveSync } from '../utils/copy-recursive-sync.js'\nimport { info } from '../utils/log.js'\nimport { getPackageManager } from './get-package-manager.js'\nimport { installPackages } from './install-packages.js'\n\nexport async function updatePayloadInProject(\n  appDetails: NextAppDetails,\n): Promise<{ message: string; success: boolean }> {\n  if (!appDetails.nextConfigPath) return { message: 'No Next.js config found', success: false }\n\n  const projectDir = path.dirname(appDetails.nextConfigPath)\n\n  const packageObj = (await fse.readJson(path.resolve(projectDir, 'package.json'))) as {\n    dependencies?: Record<string, string>\n  }\n  if (!packageObj?.dependencies) {\n    throw new Error('No package.json found in this project')\n  }\n\n  const payloadVersion = packageObj.dependencies?.payload\n  if (!payloadVersion) {\n    throw new Error('Payload is not installed in this project')\n  }\n\n  const packageManager = await getPackageManager({ projectDir })\n\n  // Fetch latest Payload version from npm\n  const { exitCode: getLatestVersionExitCode, stdout: latestPayloadVersion } = await execa('npm', [\n    'show',\n    'payload@beta',\n    'version',\n  ])\n  if (getLatestVersionExitCode !== 0) {\n    throw new Error('Failed to fetch latest Payload version')\n  }\n\n  if (payloadVersion === latestPayloadVersion) {\n    return { message: `Payload v${payloadVersion} is already up to date.`, success: true }\n  }\n\n  // Update all existing Payload packages\n  const payloadPackages = Object.keys(packageObj.dependencies).filter((dep) =>\n    dep.startsWith('@payloadcms/'),\n  )\n\n  const packageNames = ['payload', ...payloadPackages]\n\n  const packagesToUpdate = packageNames.map((pkg) => `${pkg}@${latestPayloadVersion}`)\n\n  info(`Using ${packageManager}.\\n`)\n  info(\n    `Updating ${packagesToUpdate.length} Payload packages to v${latestPayloadVersion}...\\n\\n${packageNames.map((p) => `  - ${p}`).join('\\n')}`,\n  )\n\n  const { success: updateSuccess } = await installPackages({\n    packageManager,\n    packagesToInstall: packagesToUpdate,\n    projectDir,\n  })\n\n  if (!updateSuccess) {\n    throw new Error('Failed to update Payload packages')\n  }\n  info('Payload packages updated successfully.')\n\n  info(`Updating Payload Next.js files...`)\n\n  const templateFilesPath =\n    process.env.JEST_WORKER_ID !== undefined\n      ? path.resolve(dirname, '../../../../templates/blank-3.0')\n      : path.resolve(dirname, '../..', 'dist/template')\n\n  const templateSrcDir = path.resolve(templateFilesPath, 'src/app/(payload)')\n\n  copyRecursiveSync(\n    templateSrcDir,\n    path.resolve(projectDir, appDetails.isSrcDir ? 'src/app' : 'app', '(payload)'),\n  )\n\n  return { message: 'Payload updated successfully.', success: true }\n}\n"],"names":["execa","fse","fileURLToPath","path","filename","url","dirname","copyRecursiveSync","info","getPackageManager","installPackages","updatePayloadInProject","appDetails","nextConfigPath","message","success","projectDir","packageObj","readJson","resolve","dependencies","Error","payloadVersion","payload","packageManager","exitCode","getLatestVersionExitCode","stdout","latestPayloadVersion","payloadPackages","Object","keys","filter","dep","startsWith","packageNames","packagesToUpdate","map","pkg","length","p","join","updateSuccess","packagesToInstall","templateFilesPath","process","env","JEST_WORKER_ID","undefined","templateSrcDir","isSrcDir"],"mappings":"AAAA,OAAOA,WAAW,QAAO;AACzB,OAAOC,SAAS,WAAU;AAC1B,SAASC,aAAa,QAAQ,WAAU;AACxC,OAAOC,UAAU,OAAM;AAEvB,MAAMC,WAAWF,cAAc,YAAYG,GAAG;AAC9C,MAAMC,UAAUH,KAAKG,OAAO,CAACF;AAI7B,SAASG,iBAAiB,QAAQ,kCAAiC;AACnE,SAASC,IAAI,QAAQ,kBAAiB;AACtC,SAASC,iBAAiB,QAAQ,2BAA0B;AAC5D,SAASC,eAAe,QAAQ,wBAAuB;AAEvD,OAAO,eAAeC,uBACpBC,UAA0B;IAE1B,IAAI,CAACA,WAAWC,cAAc,EAAE,OAAO;QAAEC,SAAS;QAA2BC,SAAS;IAAM;IAE5F,MAAMC,aAAab,KAAKG,OAAO,CAACM,WAAWC,cAAc;IAEzD,MAAMI,aAAc,MAAMhB,IAAIiB,QAAQ,CAACf,KAAKgB,OAAO,CAACH,YAAY;IAGhE,IAAI,CAACC,YAAYG,cAAc;QAC7B,MAAM,IAAIC,MAAM;IAClB;IAEA,MAAMC,iBAAiBL,WAAWG,YAAY,EAAEG;IAChD,IAAI,CAACD,gBAAgB;QACnB,MAAM,IAAID,MAAM;IAClB;IAEA,MAAMG,iBAAiB,MAAMf,kBAAkB;QAAEO;IAAW;IAE5D,wCAAwC;IACxC,MAAM,EAAES,UAAUC,wBAAwB,EAAEC,QAAQC,oBAAoB,EAAE,GAAG,MAAM5B,MAAM,OAAO;QAC9F;QACA;QACA;KACD;IACD,IAAI0B,6BAA6B,GAAG;QAClC,MAAM,IAAIL,MAAM;IAClB;IAEA,IAAIC,mBAAmBM,sBAAsB;QAC3C,OAAO;YAAEd,SAAS,CAAC,SAAS,EAAEQ,eAAe,uBAAuB,CAAC;YAAEP,SAAS;QAAK;IACvF;IAEA,uCAAuC;IACvC,MAAMc,kBAAkBC,OAAOC,IAAI,CAACd,WAAWG,YAAY,EAAEY,MAAM,CAAC,CAACC,MACnEA,IAAIC,UAAU,CAAC;IAGjB,MAAMC,eAAe;QAAC;WAAcN;KAAgB;IAEpD,MAAMO,mBAAmBD,aAAaE,GAAG,CAAC,CAACC,MAAQ,CAAC,EAAEA,IAAI,CAAC,EAAEV,qBAAqB,CAAC;IAEnFpB,KAAK,CAAC,MAAM,EAAEgB,eAAe,GAAG,CAAC;IACjChB,KACE,CAAC,SAAS,EAAE4B,iBAAiBG,MAAM,CAAC,sBAAsB,EAAEX,qBAAqB,OAAO,EAAEO,aAAaE,GAAG,CAAC,CAACG,IAAM,CAAC,IAAI,EAAEA,EAAE,CAAC,EAAEC,IAAI,CAAC,MAAM,CAAC;IAG5I,MAAM,EAAE1B,SAAS2B,aAAa,EAAE,GAAG,MAAMhC,gBAAgB;QACvDc;QACAmB,mBAAmBP;QACnBpB;IACF;IAEA,IAAI,CAAC0B,eAAe;QAClB,MAAM,IAAIrB,MAAM;IAClB;IACAb,KAAK;IAELA,KAAK,CAAC,iCAAiC,CAAC;IAExC,MAAMoC,oBACJC,QAAQC,GAAG,CAACC,cAAc,KAAKC,YAC3B7C,KAAKgB,OAAO,CAACb,SAAS,qCACtBH,KAAKgB,OAAO,CAACb,SAAS,SAAS;IAErC,MAAM2C,iBAAiB9C,KAAKgB,OAAO,CAACyB,mBAAmB;IAEvDrC,kBACE0C,gBACA9C,KAAKgB,OAAO,CAACH,YAAYJ,WAAWsC,QAAQ,GAAG,YAAY,OAAO;IAGpE,OAAO;QAAEpC,SAAS;QAAiCC,SAAS;IAAK;AACnE"}
+{"version":3,"sources":["../../src/lib/update-payload-in-project.ts"],"sourcesContent":["import execa from 'execa'\nimport fse from 'fs-extra'\nimport { fileURLToPath } from 'node:url'\nimport path from 'path'\n\nconst filename = fileURLToPath(import.meta.url)\nconst dirname = path.dirname(filename)\n\nimport type { NextAppDetails } from '../types.js'\n\nimport { copyRecursiveSync } from '../utils/copy-recursive-sync.js'\nimport { info } from '../utils/log.js'\nimport { getPackageManager } from './get-package-manager.js'\nimport { installPackages } from './install-packages.js'\n\nexport async function updatePayloadInProject(\n  appDetails: NextAppDetails,\n): Promise<{ message: string; success: boolean }> {\n  if (!appDetails.nextConfigPath) return { message: 'No Next.js config found', success: false }\n\n  const projectDir = path.dirname(appDetails.nextConfigPath)\n\n  const packageObj = (await fse.readJson(path.resolve(projectDir, 'package.json'))) as {\n    dependencies?: Record<string, string>\n  }\n  if (!packageObj?.dependencies) {\n    throw new Error('No package.json found in this project')\n  }\n\n  const payloadVersion = packageObj.dependencies?.payload\n  if (!payloadVersion) {\n    throw new Error('Payload is not installed in this project')\n  }\n\n  const packageManager = await getPackageManager({ projectDir })\n\n  // Fetch latest Payload version from npm\n  const { exitCode: getLatestVersionExitCode, stdout: latestPayloadVersion } = await execa('npm', [\n    'show',\n    'payload@beta',\n    'version',\n  ])\n  if (getLatestVersionExitCode !== 0) {\n    throw new Error('Failed to fetch latest Payload version')\n  }\n\n  if (payloadVersion === latestPayloadVersion) {\n    return { message: `Payload v${payloadVersion} is already up to date.`, success: true }\n  }\n\n  // Update all existing Payload packages\n  const payloadPackages = Object.keys(packageObj.dependencies).filter((dep) =>\n    dep.startsWith('@payloadcms/'),\n  )\n\n  const packageNames = ['payload', ...payloadPackages]\n\n  const packagesToUpdate = packageNames.map((pkg) => `${pkg}@${latestPayloadVersion}`)\n\n  info(`Using ${packageManager}.\\n`)\n  info(\n    `Updating ${packagesToUpdate.length} Payload packages to v${latestPayloadVersion}...\\n\\n${packageNames.map((p) => `  - ${p}`).join('\\n')}`,\n  )\n\n  const { success: updateSuccess } = await installPackages({\n    packageManager,\n    packagesToInstall: packagesToUpdate,\n    projectDir,\n  })\n\n  if (!updateSuccess) {\n    throw new Error('Failed to update Payload packages')\n  }\n  info('Payload packages updated successfully.')\n\n  info(`Updating Payload Next.js files...`)\n\n  const templateFilesPath =\n    process.env.JEST_WORKER_ID !== undefined\n      ? path.resolve(dirname, '../../../../templates/blank')\n      : path.resolve(dirname, '../..', 'dist/template')\n\n  const templateSrcDir = path.resolve(templateFilesPath, 'src/app/(payload)')\n\n  copyRecursiveSync(\n    templateSrcDir,\n    path.resolve(projectDir, appDetails.isSrcDir ? 'src/app' : 'app', '(payload)'),\n  )\n\n  return { message: 'Payload updated successfully.', success: true }\n}\n"],"names":["execa","fse","fileURLToPath","path","filename","url","dirname","copyRecursiveSync","info","getPackageManager","installPackages","updatePayloadInProject","appDetails","nextConfigPath","message","success","projectDir","packageObj","readJson","resolve","dependencies","Error","payloadVersion","payload","packageManager","exitCode","getLatestVersionExitCode","stdout","latestPayloadVersion","payloadPackages","Object","keys","filter","dep","startsWith","packageNames","packagesToUpdate","map","pkg","length","p","join","updateSuccess","packagesToInstall","templateFilesPath","process","env","JEST_WORKER_ID","undefined","templateSrcDir","isSrcDir"],"mappings":"AAAA,OAAOA,WAAW,QAAO;AACzB,OAAOC,SAAS,WAAU;AAC1B,SAASC,aAAa,QAAQ,WAAU;AACxC,OAAOC,UAAU,OAAM;AAEvB,MAAMC,WAAWF,cAAc,YAAYG,GAAG;AAC9C,MAAMC,UAAUH,KAAKG,OAAO,CAACF;AAI7B,SAASG,iBAAiB,QAAQ,kCAAiC;AACnE,SAASC,IAAI,QAAQ,kBAAiB;AACtC,SAASC,iBAAiB,QAAQ,2BAA0B;AAC5D,SAASC,eAAe,QAAQ,wBAAuB;AAEvD,OAAO,eAAeC,uBACpBC,UAA0B;IAE1B,IAAI,CAACA,WAAWC,cAAc,EAAE,OAAO;QAAEC,SAAS;QAA2BC,SAAS;IAAM;IAE5F,MAAMC,aAAab,KAAKG,OAAO,CAACM,WAAWC,cAAc;IAEzD,MAAMI,aAAc,MAAMhB,IAAIiB,QAAQ,CAACf,KAAKgB,OAAO,CAACH,YAAY;IAGhE,IAAI,CAACC,YAAYG,cAAc;QAC7B,MAAM,IAAIC,MAAM;IAClB;IAEA,MAAMC,iBAAiBL,WAAWG,YAAY,EAAEG;IAChD,IAAI,CAACD,gBAAgB;QACnB,MAAM,IAAID,MAAM;IAClB;IAEA,MAAMG,iBAAiB,MAAMf,kBAAkB;QAAEO;IAAW;IAE5D,wCAAwC;IACxC,MAAM,EAAES,UAAUC,wBAAwB,EAAEC,QAAQC,oBAAoB,EAAE,GAAG,MAAM5B,MAAM,OAAO;QAC9F;QACA;QACA;KACD;IACD,IAAI0B,6BAA6B,GAAG;QAClC,MAAM,IAAIL,MAAM;IAClB;IAEA,IAAIC,mBAAmBM,sBAAsB;QAC3C,OAAO;YAAEd,SAAS,CAAC,SAAS,EAAEQ,eAAe,uBAAuB,CAAC;YAAEP,SAAS;QAAK;IACvF;IAEA,uCAAuC;IACvC,MAAMc,kBAAkBC,OAAOC,IAAI,CAACd,WAAWG,YAAY,EAAEY,MAAM,CAAC,CAACC,MACnEA,IAAIC,UAAU,CAAC;IAGjB,MAAMC,eAAe;QAAC;WAAcN;KAAgB;IAEpD,MAAMO,mBAAmBD,aAAaE,GAAG,CAAC,CAACC,MAAQ,CAAC,EAAEA,IAAI,CAAC,EAAEV,qBAAqB,CAAC;IAEnFpB,KAAK,CAAC,MAAM,EAAEgB,eAAe,GAAG,CAAC;IACjChB,KACE,CAAC,SAAS,EAAE4B,iBAAiBG,MAAM,CAAC,sBAAsB,EAAEX,qBAAqB,OAAO,EAAEO,aAAaE,GAAG,CAAC,CAACG,IAAM,CAAC,IAAI,EAAEA,EAAE,CAAC,EAAEC,IAAI,CAAC,MAAM,CAAC;IAG5I,MAAM,EAAE1B,SAAS2B,aAAa,EAAE,GAAG,MAAMhC,gBAAgB;QACvDc;QACAmB,mBAAmBP;QACnBpB;IACF;IAEA,IAAI,CAAC0B,eAAe;QAClB,MAAM,IAAIrB,MAAM;IAClB;IACAb,KAAK;IAELA,KAAK,CAAC,iCAAiC,CAAC;IAExC,MAAMoC,oBACJC,QAAQC,GAAG,CAACC,cAAc,KAAKC,YAC3B7C,KAAKgB,OAAO,CAACb,SAAS,iCACtBH,KAAKgB,OAAO,CAACb,SAAS,SAAS;IAErC,MAAM2C,iBAAiB9C,KAAKgB,OAAO,CAACyB,mBAAmB;IAEvDrC,kBACE0C,gBACA9C,KAAKgB,OAAO,CAACH,YAAYJ,WAAWsC,QAAQ,GAAG,YAAY,OAAO;IAGpE,OAAO;QAAEpC,SAAS;QAAiCC,SAAS;IAAK;AACnE"}

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

@@ -1,4 +1,4 @@
-import swc from '@swc/core';
+import { parse } from '@swc/core';
 import chalk from 'chalk';
 import { Syntax, parseModule } from 'esprima-next';
 import fs from 'fs';
@@ -173,9 +173,9 @@ function insertBeforeAndAfterSWC(content, span, /**
    *
    * https://github.com/swc-project/swc/issues/1366
    */ if (process.env.NODE_ENV === 'test') {
-        parseOffset = (await swc.parse('')).span.end;
+        parseOffset = (await parse('')).span.end;
     }
-    const module = await swc.parse(fileContent, {
+    const module = await parse(fileContent, {
         syntax: 'typescript'
     });
     return {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/wrap-next-config.ts"],"sourcesContent":["import type { ExportDefaultExpression, ModuleItem } from '@swc/core'\n\nimport swc 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 swc.parse('')).span.end\n  }\n\n  const module = await swc.parse(fileContent, {\n    syntax: 'typescript',\n  })\n\n  return { moduleItems: module.body, parseOffset }\n}\n"],"names":["swc","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","parse","module","syntax"],"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/scripts/pack-template-files.js

@@ -7,13 +7,13 @@ const dirname = path.dirname(filename);
 // eslint-disable-next-line @typescript-eslint/no-floating-promises
 main();
 /**
- * Copy the necessary template files from `templates/blank-3.0` to `dist/template`
+ * Copy the necessary template files from `templates/blank` to `dist/template`
  *
  * Eventually, this should be replaced with using tar.x to stream from the git repo
  */ async function main() {
     const root = path.resolve(dirname, '../../../../');
     const outputPath = path.resolve(dirname, '../../dist/template');
-    const sourceTemplatePath = path.resolve(root, 'templates/blank-3.0');
+    const sourceTemplatePath = path.resolve(root, 'templates/blank');
     if (!fs.existsSync(sourceTemplatePath)) {
         throw new Error(`Source path does not exist: ${sourceTemplatePath}`);
     }
@@ -22,7 +22,7 @@ main();
             recursive: true
         });
     }
-    // Copy the src directory from `templates/blank-3.0` to `dist`
+    // Copy the src directory from `templates/blank` to `dist`
     const srcPath = path.resolve(sourceTemplatePath, 'src');
     const distSrcPath = path.resolve(outputPath, 'src');
     // Copy entire file structure from src to dist

package/dist/scripts/pack-template-files.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/scripts/pack-template-files.ts"],"sourcesContent":["import fs from 'fs'\nimport fsp from 'fs/promises'\nimport { fileURLToPath } from 'node:url'\nimport path from 'path'\nconst filename = fileURLToPath(import.meta.url)\nconst dirname = path.dirname(filename)\n\n// eslint-disable-next-line @typescript-eslint/no-floating-promises\nmain()\n\n/**\n * Copy the necessary template files from `templates/blank-3.0` to `dist/template`\n *\n * Eventually, this should be replaced with using tar.x to stream from the git repo\n */\n\nasync function main() {\n  const root = path.resolve(dirname, '../../../../')\n  const outputPath = path.resolve(dirname, '../../dist/template')\n  const sourceTemplatePath = path.resolve(root, 'templates/blank-3.0')\n\n  if (!fs.existsSync(sourceTemplatePath)) {\n    throw new Error(`Source path does not exist: ${sourceTemplatePath}`)\n  }\n\n  if (!fs.existsSync(outputPath)) {\n    fs.mkdirSync(outputPath, { recursive: true })\n  }\n\n  // Copy the src directory from `templates/blank-3.0` to `dist`\n  const srcPath = path.resolve(sourceTemplatePath, 'src')\n  const distSrcPath = path.resolve(outputPath, 'src')\n  // Copy entire file structure from src to dist\n  await fsp.cp(srcPath, distSrcPath, { recursive: true })\n}\n"],"names":["fs","fsp","fileURLToPath","path","filename","url","dirname","main","root","resolve","outputPath","sourceTemplatePath","existsSync","Error","mkdirSync","recursive","srcPath","distSrcPath","cp"],"mappings":"AAAA,OAAOA,QAAQ,KAAI;AACnB,OAAOC,SAAS,cAAa;AAC7B,SAASC,aAAa,QAAQ,WAAU;AACxC,OAAOC,UAAU,OAAM;AACvB,MAAMC,WAAWF,cAAc,YAAYG,GAAG;AAC9C,MAAMC,UAAUH,KAAKG,OAAO,CAACF;AAE7B,mEAAmE;AACnEG;AAEA;;;;CAIC,GAED,eAAeA;IACb,MAAMC,OAAOL,KAAKM,OAAO,CAACH,SAAS;IACnC,MAAMI,aAAaP,KAAKM,OAAO,CAACH,SAAS;IACzC,MAAMK,qBAAqBR,KAAKM,OAAO,CAACD,MAAM;IAE9C,IAAI,CAACR,GAAGY,UAAU,CAACD,qBAAqB;QACtC,MAAM,IAAIE,MAAM,CAAC,4BAA4B,EAAEF,mBAAmB,CAAC;IACrE;IAEA,IAAI,CAACX,GAAGY,UAAU,CAACF,aAAa;QAC9BV,GAAGc,SAAS,CAACJ,YAAY;YAAEK,WAAW;QAAK;IAC7C;IAEA,8DAA8D;IAC9D,MAAMC,UAAUb,KAAKM,OAAO,CAACE,oBAAoB;IACjD,MAAMM,cAAcd,KAAKM,OAAO,CAACC,YAAY;IAC7C,8CAA8C;IAC9C,MAAMT,IAAIiB,EAAE,CAACF,SAASC,aAAa;QAAEF,WAAW;IAAK;AACvD"}
+{"version":3,"sources":["../../src/scripts/pack-template-files.ts"],"sourcesContent":["import fs from 'fs'\nimport fsp from 'fs/promises'\nimport { fileURLToPath } from 'node:url'\nimport path from 'path'\nconst filename = fileURLToPath(import.meta.url)\nconst dirname = path.dirname(filename)\n\n// eslint-disable-next-line @typescript-eslint/no-floating-promises\nmain()\n\n/**\n * Copy the necessary template files from `templates/blank` to `dist/template`\n *\n * Eventually, this should be replaced with using tar.x to stream from the git repo\n */\n\nasync function main() {\n  const root = path.resolve(dirname, '../../../../')\n  const outputPath = path.resolve(dirname, '../../dist/template')\n  const sourceTemplatePath = path.resolve(root, 'templates/blank')\n\n  if (!fs.existsSync(sourceTemplatePath)) {\n    throw new Error(`Source path does not exist: ${sourceTemplatePath}`)\n  }\n\n  if (!fs.existsSync(outputPath)) {\n    fs.mkdirSync(outputPath, { recursive: true })\n  }\n\n  // Copy the src directory from `templates/blank` to `dist`\n  const srcPath = path.resolve(sourceTemplatePath, 'src')\n  const distSrcPath = path.resolve(outputPath, 'src')\n  // Copy entire file structure from src to dist\n  await fsp.cp(srcPath, distSrcPath, { recursive: true })\n}\n"],"names":["fs","fsp","fileURLToPath","path","filename","url","dirname","main","root","resolve","outputPath","sourceTemplatePath","existsSync","Error","mkdirSync","recursive","srcPath","distSrcPath","cp"],"mappings":"AAAA,OAAOA,QAAQ,KAAI;AACnB,OAAOC,SAAS,cAAa;AAC7B,SAASC,aAAa,QAAQ,WAAU;AACxC,OAAOC,UAAU,OAAM;AACvB,MAAMC,WAAWF,cAAc,YAAYG,GAAG;AAC9C,MAAMC,UAAUH,KAAKG,OAAO,CAACF;AAE7B,mEAAmE;AACnEG;AAEA;;;;CAIC,GAED,eAAeA;IACb,MAAMC,OAAOL,KAAKM,OAAO,CAACH,SAAS;IACnC,MAAMI,aAAaP,KAAKM,OAAO,CAACH,SAAS;IACzC,MAAMK,qBAAqBR,KAAKM,OAAO,CAACD,MAAM;IAE9C,IAAI,CAACR,GAAGY,UAAU,CAACD,qBAAqB;QACtC,MAAM,IAAIE,MAAM,CAAC,4BAA4B,EAAEF,mBAAmB,CAAC;IACrE;IAEA,IAAI,CAACX,GAAGY,UAAU,CAACF,aAAa;QAC9BV,GAAGc,SAAS,CAACJ,YAAY;YAAEK,WAAW;QAAK;IAC7C;IAEA,0DAA0D;IAC1D,MAAMC,UAAUb,KAAKM,OAAO,CAACE,oBAAoB;IACjD,MAAMM,cAAcd,KAAKM,OAAO,CAACC,YAAY;IAC7C,8CAA8C;IAC9C,MAAMT,IAAIiB,EAAE,CAACF,SAASC,aAAa;QAAEF,WAAW;IAAK;AACvD"}

package/dist/template/src/app/(payload)/admin/[[...segments]]/not-found.tsx

@@ -4,6 +4,7 @@ import type { Metadata } from 'next'
 import config from '@payload-config'
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import { NotFoundPage, generatePageMetadata } from '@payloadcms/next/views'
+import { importMap } from '../importMap'
 
 type Args = {
   params: {
@@ -17,6 +18,7 @@ type Args = {
 export const generateMetadata = ({ params, searchParams }: Args): Promise<Metadata> =>
   generatePageMetadata({ config, params, searchParams })
 
-const NotFound = ({ params, searchParams }: Args) => NotFoundPage({ config, params, searchParams })
+const NotFound = ({ params, searchParams }: Args) =>
+  NotFoundPage({ config, params, searchParams, importMap })
 
 export default NotFound

package/dist/template/src/app/(payload)/admin/[[...segments]]/page.tsx

@@ -4,6 +4,7 @@ import type { Metadata } from 'next'
 import config from '@payload-config'
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import { RootPage, generatePageMetadata } from '@payloadcms/next/views'
+import { importMap } from '../importMap'
 
 type Args = {
   params: {
@@ -17,6 +18,7 @@ type Args = {
 export const generateMetadata = ({ params, searchParams }: Args): Promise<Metadata> =>
   generatePageMetadata({ config, params, searchParams })
 
-const Page = ({ params, searchParams }: Args) => RootPage({ config, params, searchParams })
+const Page = ({ params, searchParams }: Args) =>
+  RootPage({ config, params, searchParams, importMap })
 
 export default Page

package/dist/template/src/app/(payload)/admin/importMap.js

@@ -0,0 +1 @@
+export const importMap = {}

package/dist/template/src/app/(payload)/layout.tsx

@@ -6,11 +6,16 @@ import { RootLayout } from '@payloadcms/next/layouts'
 import React from 'react'
 
 import './custom.scss'
+import { importMap } from './admin/importMap'
 
 type Args = {
   children: React.ReactNode
 }
 
-const Layout = ({ children }: Args) => <RootLayout config={configPromise}>{children}</RootLayout>
+const Layout = ({ children }: Args) => (
+  <RootLayout importMap={importMap} config={configPromise}>
+    {children}
+  </RootLayout>
+)
 
 export default Layout

package/dist/template/src/payload-types.ts

@@ -0,0 +1,127 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * This file was automatically generated by Payload.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {
+  auth: {
+    users: UserAuthOperations;
+  };
+  collections: {
+    users: User;
+    media: Media;
+    'payload-preferences': PayloadPreference;
+    'payload-migrations': PayloadMigration;
+  };
+  db: {
+    defaultIDType: string;
+  };
+  globals: {};
+  locale: null;
+  user: User & {
+    collection: 'users';
+  };
+}
+export interface UserAuthOperations {
+  forgotPassword: {
+    email: string;
+    password: string;
+  };
+  login: {
+    email: string;
+    password: string;
+  };
+  registerFirstUser: {
+    email: string;
+    password: string;
+  };
+  unlock: {
+    email: string;
+    password: string;
+  };
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  updatedAt: string;
+  createdAt: string;
+  email: string;
+  resetPasswordToken?: string | null;
+  resetPasswordExpiration?: string | null;
+  salt?: string | null;
+  hash?: string | null;
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "media".
+ */
+export interface Media {
+  id: string;
+  alt: string;
+  updatedAt: string;
+  createdAt: string;
+  url?: string | null;
+  thumbnailURL?: string | null;
+  filename?: string | null;
+  mimeType?: string | null;
+  filesize?: number | null;
+  width?: number | null;
+  height?: number | null;
+  focalX?: number | null;
+  focalY?: number | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "auth".
+ */
+export interface Auth {
+  [k: string]: unknown;
+}
+
+
+declare module 'payload' {
+  export interface GeneratedTypes extends Config {}
+}

package/dist/template/src/payload.config.ts

@@ -15,6 +15,9 @@ const dirname = path.dirname(filename)
 export default buildConfig({
   admin: {
     user: Users.slug,
+    importMap: {
+      baseDir: path.resolve(dirname),
+    },
   },
   collections: [Users, Media],
   editor: lexicalEditor(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-payload-app",
-  "version": "3.0.0-canary.fb81f02",
+  "version": "3.0.0-canary.ff8c8fd",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",
@@ -41,7 +41,7 @@
   "dependencies": {
     "@clack/prompts": "^0.7.0",
     "@sindresorhus/slugify": "^1.1.0",
-    "@swc/core": "^1.6.13",
+    "@swc/core": "1.7.10",
     "arg": "^5.0.0",
     "chalk": "^4.1.0",
     "comment-json": "^4.2.3",
@@ -64,7 +64,7 @@
     "build": "pnpm pack-template-files && pnpm typecheck && pnpm build:swc",
     "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths",
     "clean": "rimraf {dist,*.tsbuildinfo}",
-    "pack-template-files": "tsx src/scripts/pack-template-files.ts",
+    "pack-template-files": "node --no-deprecation --import @swc-node/register/esm-register src/scripts/pack-template-files.ts",
     "test": "jest",
     "typecheck": "tsc"
   }