create-payload-app 3.0.0-canary.5390729 → 3.0.0-canary.5624723

package/dist/lib/constants.d.ts

@@ -0,0 +1,2 @@
+export declare const PACKAGE_VERSION: any;
+//# sourceMappingURL=constants.d.ts.map

package/dist/lib/constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/lib/constants.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,eAAe,KAAsB,CAAA"}

package/dist/lib/constants.js

@@ -0,0 +1,9 @@
+import { readFileSync } from 'fs';
+import { fileURLToPath } from 'node:url';
+import path from 'path';
+const filename = fileURLToPath(import.meta.url);
+const dirname = path.dirname(filename);
+const packageJson = JSON.parse(readFileSync(path.resolve(dirname, '../../package.json'), 'utf-8'));
+export const PACKAGE_VERSION = packageJson.version;
+
+//# sourceMappingURL=constants.js.map

package/dist/lib/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/lib/constants.ts"],"sourcesContent":["import { readFileSync } from 'fs'\nimport { fileURLToPath } from 'node:url'\nimport path from 'path'\nconst filename = fileURLToPath(import.meta.url)\nconst dirname = path.dirname(filename)\n\nconst packageJson = JSON.parse(readFileSync(path.resolve(dirname, '../../package.json'), 'utf-8'))\nexport const PACKAGE_VERSION = packageJson.version\n"],"names":["readFileSync","fileURLToPath","path","filename","url","dirname","packageJson","JSON","parse","resolve","PACKAGE_VERSION","version"],"mappings":"AAAA,SAASA,YAAY,QAAQ,KAAI;AACjC,SAASC,aAAa,QAAQ,WAAU;AACxC,OAAOC,UAAU,OAAM;AACvB,MAAMC,WAAWF,cAAc,YAAYG,GAAG;AAC9C,MAAMC,UAAUH,KAAKG,OAAO,CAACF;AAE7B,MAAMG,cAAcC,KAAKC,KAAK,CAACR,aAAaE,KAAKO,OAAO,CAACJ,SAAS,uBAAuB;AACzF,OAAO,MAAMK,kBAAkBJ,YAAYK,OAAO,CAAA"}

package/dist/lib/create-project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-project.d.ts","sourceRoot":"","sources":["../../src/lib/create-project.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AA4CtF,wBAAsB,aAAa,CAAC,IAAI,EAAE;IACxC,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,cAAc,EAAE,cAAc,CAAA;IAC9B,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,eAAe,CAAA;CAC1B,GAAG,OAAO,CAAC,IAAI,CAAC,CA4DhB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;CACpB,GAAG,OAAO,CAAC,IAAI,CAAC,CAUhB"}
+{"version":3,"file":"create-project.d.ts","sourceRoot":"","sources":["../../src/lib/create-project.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AA+CtF,wBAAsB,aAAa,CAAC,IAAI,EAAE;IACxC,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,cAAc,EAAE,cAAc,CAAA;IAC9B,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,eAAe,CAAA;CAC1B,GAAG,OAAO,CAAC,IAAI,CAAC,CA8DhB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;CACpB,GAAG,OAAO,CAAC,IAAI,CAAC,CAUhB"}

package/dist/lib/create-project.js

@@ -1,6 +1,5 @@
 import * as p from '@clack/prompts';
 import chalk from 'chalk';
-import degit from 'degit';
 import execa from 'execa';
 import fse from 'fs-extra';
 import { fileURLToPath } from 'node:url';
@@ -8,6 +7,7 @@ import path from 'path';
 import { tryInitRepoAndCommit } from '../utils/git.js';
 import { debug, error, info, warning } from '../utils/log.js';
 import { configurePayloadConfig } from './configure-payload-config.js';
+import { downloadTemplate } from './download-template.js';
 const filename = fileURLToPath(import.meta.url);
 const dirname = path.dirname(filename);
 async function createOrFindProjectDir(projectDir) {
@@ -26,6 +26,8 @@ async function installDeps(args) {
         installCmd = 'yarn';
     } else if (packageManager === 'pnpm') {
         installCmd = 'pnpm install';
+    } else if (packageManager === 'bun') {
+        installCmd = 'bun install';
     }
     try {
         await execa.command(installCmd, {
@@ -49,13 +51,14 @@ export async function createProject(args) {
         const localTemplate = path.resolve(dirname, '../../../../templates/', cliArgs['--local-template']);
         await fse.copy(localTemplate, projectDir);
     } else if ('url' in template) {
-        let templateUrl = template.url;
         if (cliArgs['--template-branch']) {
-            templateUrl = `${template.url}#${cliArgs['--template-branch']}`;
-            debug(`Using template url: ${templateUrl}`);
+            template.url = `${template.url.split('#')?.[0]}#${cliArgs['--template-branch']}`;
         }
-        const emitter = degit(templateUrl);
-        await emitter.clone(projectDir);
+        await downloadTemplate({
+            debug: cliArgs['--debug'],
+            projectDir,
+            template
+        });
     }
     const spinner = p.spinner();
     spinner.start('Checking latest Payload version...');
@@ -71,7 +74,7 @@ export async function createProject(args) {
         }
     });
     // Remove yarn.lock file. This is only desired in Payload Cloud.
-    const lockPath = path.resolve(projectDir, 'yarn.lock');
+    const lockPath = path.resolve(projectDir, 'pnpm-lock.yaml');
     if (fse.existsSync(lockPath)) {
         await fse.remove(lockPath);
     }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/create-project.ts"],"sourcesContent":["import * as p from '@clack/prompts'\nimport chalk from 'chalk'\nimport degit from 'degit'\nimport execa from 'execa'\nimport fse from 'fs-extra'\nimport { fileURLToPath } from 'node:url'\nimport path from 'path'\n\nimport type { CliArgs, DbDetails, PackageManager, ProjectTemplate } from '../types.js'\n\nimport { tryInitRepoAndCommit } from '../utils/git.js'\nimport { debug, error, info, warning } from '../utils/log.js'\nimport { configurePayloadConfig } from './configure-payload-config.js'\n\nconst filename = fileURLToPath(import.meta.url)\nconst dirname = path.dirname(filename)\n\nasync function createOrFindProjectDir(projectDir: string): Promise<void> {\n  const pathExists = await fse.pathExists(projectDir)\n  if (!pathExists) {\n    await fse.mkdir(projectDir)\n  }\n}\n\nasync function installDeps(args: {\n  cliArgs: CliArgs\n  packageManager: PackageManager\n  projectDir: string\n}): Promise<boolean> {\n  const { cliArgs, packageManager, projectDir } = args\n  if (cliArgs['--no-deps']) {\n    return true\n  }\n  let installCmd = 'npm install --legacy-peer-deps'\n\n  if (packageManager === 'yarn') {\n    installCmd = 'yarn'\n  } else if (packageManager === 'pnpm') {\n    installCmd = 'pnpm install'\n  }\n\n  try {\n    await execa.command(installCmd, {\n      cwd: path.resolve(projectDir),\n    })\n    return true\n  } catch (err: unknown) {\n    error(`Error installing dependencies${err instanceof Error ? `: ${err.message}` : ''}.`)\n    return false\n  }\n}\n\nexport async function createProject(args: {\n  cliArgs: CliArgs\n  dbDetails?: DbDetails\n  packageManager: PackageManager\n  projectDir: string\n  projectName: string\n  template: ProjectTemplate\n}): Promise<void> {\n  const { cliArgs, dbDetails, packageManager, projectDir, projectName, template } = args\n\n  if (cliArgs['--dry-run']) {\n    debug(`Dry run: Creating project in ${chalk.green(projectDir)}`)\n    return\n  }\n\n  await createOrFindProjectDir(projectDir)\n\n  if (cliArgs['--local-template']) {\n    // Copy template from local path. For development purposes.\n    const localTemplate = path.resolve(\n      dirname,\n      '../../../../templates/',\n      cliArgs['--local-template'],\n    )\n    await fse.copy(localTemplate, projectDir)\n  } else if ('url' in template) {\n    let templateUrl = template.url\n    if (cliArgs['--template-branch']) {\n      templateUrl = `${template.url}#${cliArgs['--template-branch']}`\n      debug(`Using template url: ${templateUrl}`)\n    }\n    const emitter = degit(templateUrl)\n    await emitter.clone(projectDir)\n  }\n\n  const spinner = p.spinner()\n  spinner.start('Checking latest Payload version...')\n\n  await updatePackageJSON({ projectDir, projectName })\n  spinner.message('Configuring Payload...')\n  await configurePayloadConfig({\n    dbType: dbDetails?.type,\n    projectDirOrConfigPath: { projectDir },\n  })\n\n  // Remove yarn.lock file. This is only desired in Payload Cloud.\n  const lockPath = path.resolve(projectDir, 'yarn.lock')\n  if (fse.existsSync(lockPath)) {\n    await fse.remove(lockPath)\n  }\n\n  if (!cliArgs['--no-deps']) {\n    info(`Using ${packageManager}.\\n`)\n    spinner.message('Installing dependencies...')\n    const result = await installDeps({ cliArgs, packageManager, projectDir })\n    if (result) {\n      spinner.stop('Successfully installed Payload and dependencies')\n    } else {\n      spinner.stop('Error installing dependencies', 1)\n    }\n  } else {\n    spinner.stop('Dependency installation skipped')\n  }\n\n  if (!cliArgs['--no-git']) {\n    tryInitRepoAndCommit({ cwd: projectDir })\n  }\n}\n\nexport async function updatePackageJSON(args: {\n  projectDir: string\n  projectName: string\n}): Promise<void> {\n  const { projectDir, projectName } = args\n  const packageJsonPath = path.resolve(projectDir, 'package.json')\n  try {\n    const packageObj = await fse.readJson(packageJsonPath)\n    packageObj.name = projectName\n    await fse.writeJson(packageJsonPath, packageObj, { spaces: 2 })\n  } catch (err: unknown) {\n    warning(`Unable to update name in package.json. ${err instanceof Error ? err.message : ''}`)\n  }\n}\n"],"names":["p","chalk","degit","execa","fse","fileURLToPath","path","tryInitRepoAndCommit","debug","error","info","warning","configurePayloadConfig","filename","url","dirname","createOrFindProjectDir","projectDir","pathExists","mkdir","installDeps","args","cliArgs","packageManager","installCmd","command","cwd","resolve","err","Error","message","createProject","dbDetails","projectName","template","green","localTemplate","copy","templateUrl","emitter","clone","spinner","start","updatePackageJSON","dbType","type","projectDirOrConfigPath","lockPath","existsSync","remove","result","stop","packageJsonPath","packageObj","readJson","name","writeJson","spaces"],"mappings":"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"}
+{"version":3,"sources":["../../src/lib/create-project.ts"],"sourcesContent":["import * as p from '@clack/prompts'\nimport chalk from 'chalk'\nimport execa from 'execa'\nimport fse from 'fs-extra'\nimport { fileURLToPath } from 'node:url'\nimport path from 'path'\n\nimport type { CliArgs, DbDetails, PackageManager, ProjectTemplate } from '../types.js'\n\nimport { tryInitRepoAndCommit } from '../utils/git.js'\nimport { debug, error, info, warning } from '../utils/log.js'\nimport { configurePayloadConfig } from './configure-payload-config.js'\nimport { downloadTemplate } from './download-template.js'\n\nconst filename = fileURLToPath(import.meta.url)\nconst dirname = path.dirname(filename)\n\nasync function createOrFindProjectDir(projectDir: string): Promise<void> {\n  const pathExists = await fse.pathExists(projectDir)\n  if (!pathExists) {\n    await fse.mkdir(projectDir)\n  }\n}\n\nasync function installDeps(args: {\n  cliArgs: CliArgs\n  packageManager: PackageManager\n  projectDir: string\n}): Promise<boolean> {\n  const { cliArgs, packageManager, projectDir } = args\n  if (cliArgs['--no-deps']) {\n    return true\n  }\n  let installCmd = 'npm install --legacy-peer-deps'\n\n  if (packageManager === 'yarn') {\n    installCmd = 'yarn'\n  } else if (packageManager === 'pnpm') {\n    installCmd = 'pnpm install'\n  } else if (packageManager === 'bun') {\n    installCmd = 'bun install'\n  }\n\n  try {\n    await execa.command(installCmd, {\n      cwd: path.resolve(projectDir),\n    })\n    return true\n  } catch (err: unknown) {\n    error(`Error installing dependencies${err instanceof Error ? `: ${err.message}` : ''}.`)\n    return false\n  }\n}\n\nexport async function createProject(args: {\n  cliArgs: CliArgs\n  dbDetails?: DbDetails\n  packageManager: PackageManager\n  projectDir: string\n  projectName: string\n  template: ProjectTemplate\n}): Promise<void> {\n  const { cliArgs, dbDetails, packageManager, projectDir, projectName, template } = args\n\n  if (cliArgs['--dry-run']) {\n    debug(`Dry run: Creating project in ${chalk.green(projectDir)}`)\n    return\n  }\n\n  await createOrFindProjectDir(projectDir)\n\n  if (cliArgs['--local-template']) {\n    // Copy template from local path. For development purposes.\n    const localTemplate = path.resolve(\n      dirname,\n      '../../../../templates/',\n      cliArgs['--local-template'],\n    )\n    await fse.copy(localTemplate, projectDir)\n  } else if ('url' in template) {\n    if (cliArgs['--template-branch']) {\n      template.url = `${template.url.split('#')?.[0]}#${cliArgs['--template-branch']}`\n    }\n\n    await downloadTemplate({\n      debug: cliArgs['--debug'],\n      projectDir,\n      template,\n    })\n  }\n\n  const spinner = p.spinner()\n  spinner.start('Checking latest Payload version...')\n\n  await updatePackageJSON({ projectDir, projectName })\n  spinner.message('Configuring Payload...')\n  await configurePayloadConfig({\n    dbType: dbDetails?.type,\n    projectDirOrConfigPath: { projectDir },\n  })\n\n  // Remove yarn.lock file. This is only desired in Payload Cloud.\n  const lockPath = path.resolve(projectDir, 'pnpm-lock.yaml')\n  if (fse.existsSync(lockPath)) {\n    await fse.remove(lockPath)\n  }\n\n  if (!cliArgs['--no-deps']) {\n    info(`Using ${packageManager}.\\n`)\n    spinner.message('Installing dependencies...')\n    const result = await installDeps({ cliArgs, packageManager, projectDir })\n    if (result) {\n      spinner.stop('Successfully installed Payload and dependencies')\n    } else {\n      spinner.stop('Error installing dependencies', 1)\n    }\n  } else {\n    spinner.stop('Dependency installation skipped')\n  }\n\n  if (!cliArgs['--no-git']) {\n    tryInitRepoAndCommit({ cwd: projectDir })\n  }\n}\n\nexport async function updatePackageJSON(args: {\n  projectDir: string\n  projectName: string\n}): Promise<void> {\n  const { projectDir, projectName } = args\n  const packageJsonPath = path.resolve(projectDir, 'package.json')\n  try {\n    const packageObj = await fse.readJson(packageJsonPath)\n    packageObj.name = projectName\n    await fse.writeJson(packageJsonPath, packageObj, { spaces: 2 })\n  } catch (err: unknown) {\n    warning(`Unable to update name in package.json. ${err instanceof Error ? err.message : ''}`)\n  }\n}\n"],"names":["p","chalk","execa","fse","fileURLToPath","path","tryInitRepoAndCommit","debug","error","info","warning","configurePayloadConfig","downloadTemplate","filename","url","dirname","createOrFindProjectDir","projectDir","pathExists","mkdir","installDeps","args","cliArgs","packageManager","installCmd","command","cwd","resolve","err","Error","message","createProject","dbDetails","projectName","template","green","localTemplate","copy","split","spinner","start","updatePackageJSON","dbType","type","projectDirOrConfigPath","lockPath","existsSync","remove","result","stop","packageJsonPath","packageObj","readJson","name","writeJson","spaces"],"mappings":"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"}

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

@@ -1,17 +1,20 @@
+import { jest } from '@jest/globals';
+import fs from 'fs';
 import fse from 'fs-extra';
+import globby from 'globby';
+import * as os from 'node:os';
 import path from 'path';
 import { createProject } from './create-project.js';
 import { dbReplacements } from './replacements.js';
 import { getValidTemplates } from './templates.js';
-import globby from 'globby';
-import { jest } from '@jest/globals';
-import tempDirectory from 'temp-dir';
 describe('createProject', ()=>{
     let projectDir;
     beforeAll(()=>{
+        // eslint-disable-next-line no-console
         console.log = jest.fn();
     });
     beforeEach(()=>{
+        const tempDirectory = fs.realpathSync(os.tmpdir());
         projectDir = `${tempDirectory}/${Math.random().toString(36).substring(7)}`;
     });
     afterEach(()=>{
@@ -22,13 +25,12 @@ describe('createProject', ()=>{
         }
     });
     describe('#createProject', ()=>{
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         const args = {
             _: [
                 'project-name'
             ],
             '--db': 'mongodb',
-            '--local-template': 'blank-3.0',
+            '--local-template': 'blank',
             '--no-deps': true
         };
         const packageManager = 'yarn';
@@ -37,30 +39,30 @@ describe('createProject', ()=>{
             const template = {
                 name: 'plugin',
                 type: 'plugin',
-                url: 'https://github.com/payloadcms/payload-plugin-template',
-                description: 'Template for creating a Payload plugin'
+                description: 'Template for creating a Payload plugin',
+                url: 'https://github.com/payloadcms/payload-plugin-template'
             };
             await createProject({
                 cliArgs: args,
-                projectName,
+                packageManager,
                 projectDir,
-                template,
-                packageManager
+                projectName,
+                template
             });
             const packageJsonPath = path.resolve(projectDir, 'package.json');
             const packageJson = fse.readJsonSync(packageJsonPath);
             // Check package name and description
-            expect(packageJson.name).toEqual(projectName);
+            expect(packageJson.name).toStrictEqual(projectName);
         });
         describe('creates project from template', ()=>{
             const templates = getValidTemplates();
             it.each([
                 [
-                    'blank-3.0',
+                    'blank',
                     'mongodb'
                 ],
                 [
-                    'blank-3.0',
+                    'blank',
                     'postgres'
                 ]
             ])('update config and deps: %s, %s', async (templateName, db)=>{
@@ -73,14 +75,14 @@ describe('createProject', ()=>{
                 };
                 await createProject({
                     cliArgs,
-                    projectName,
-                    projectDir,
-                    template: template,
-                    packageManager,
                     dbDetails: {
-                        dbUri: `${db}://localhost:27017/create-project-test`,
-                        type: db
-                    }
+                        type: db,
+                        dbUri: `${db}://localhost:27017/create-project-test`
+                    },
+                    packageManager,
+                    projectDir,
+                    projectName,
+                    template: template
                 });
                 const dbReplacement = dbReplacements[db];
                 const packageJsonPath = path.resolve(projectDir, 'package.json');
@@ -93,9 +95,6 @@ describe('createProject', ()=>{
                     absolute: true,
                     cwd: projectDir
                 }))?.[0];
-                if (!payloadConfigPath) {
-                    throw new Error(`Could not find payload.config.ts inside ${projectDir}`);
-                }
                 const content = fse.readFileSync(payloadConfigPath, 'utf-8');
                 // Check payload.config.ts
                 expect(content).not.toContain('// database-adapter-import');

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/create-project.spec.ts"],"sourcesContent":["import fse from 'fs-extra'\nimport path from 'path'\nimport type { CliArgs, DbType, ProjectTemplate } from '../types.js'\nimport { createProject } from './create-project.js'\nimport { dbReplacements } from './replacements.js'\nimport { getValidTemplates } from './templates.js'\nimport globby from 'globby'\nimport { jest } from '@jest/globals'\n\nimport tempDirectory from 'temp-dir'\n\ndescribe('createProject', () => {\n  let projectDir: string\n  beforeAll(() => {\n    console.log = jest.fn()\n  })\n\n  beforeEach(() => {\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    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions\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        url: 'https://github.com/payloadcms/payload-plugin-template',\n        description: 'Template for creating a Payload plugin',\n      }\n      await createProject({\n        cliArgs: args,\n        projectName,\n        projectDir,\n        template,\n        packageManager,\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          projectName,\n          projectDir,\n          template: template as ProjectTemplate,\n          packageManager,\n          dbDetails: {\n            dbUri: `${db}://localhost:27017/create-project-test`,\n            type: db as DbType,\n          },\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":["fse","path","createProject","dbReplacements","getValidTemplates","globby","jest","tempDirectory","describe","projectDir","beforeAll","console","log","fn","beforeEach","Math","random","toString","substring","afterEach","existsSync","rmSync","recursive","args","_","packageManager","it","projectName","template","name","type","url","description","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    // eslint-disable-next-line no-console\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).toStrictEqual(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        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","toStrictEqual","templates","each","templateName","db","find","t","dbDetails","dbUri","dbReplacement","toBe","Object","keys","dependencies","filter","n","startsWith","toHaveLength","payloadConfigPath","absolute","cwd","content","readFileSync","not","toContain","importReplacement","configReplacement","join"],"mappings":"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"}

package/dist/lib/download-template.d.ts

@@ -0,0 +1,7 @@
+import type { ProjectTemplate } from '../types.js';
+export declare function downloadTemplate({ debug, projectDir, template, }: {
+    debug?: boolean;
+    projectDir: string;
+    template: ProjectTemplate;
+}): Promise<void>;
+//# sourceMappingURL=download-template.d.ts.map

package/dist/lib/download-template.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"download-template.d.ts","sourceRoot":"","sources":["../../src/lib/download-template.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAIlD,wBAAsB,gBAAgB,CAAC,EACrC,KAAK,EACL,UAAU,EACV,QAAQ,GACT,EAAE;IACD,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,eAAe,CAAA;CAC1B,iBAmBA"}

package/dist/lib/download-template.js

@@ -0,0 +1,28 @@
+import { Readable } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
+import { x } from 'tar';
+import { debug as debugLog } from '../utils/log.js';
+export async function downloadTemplate({ debug, projectDir, template }) {
+    const branchOrTag = template.url.split('#')?.[1] || 'beta';
+    const url = `https://codeload.github.com/payloadcms/payload/tar.gz/${branchOrTag}`;
+    const filter = `payload-${branchOrTag.replace(/^v/, '')}/templates/${template.name}/`;
+    if (debug) {
+        debugLog(`Using template url: ${template.url}`);
+        debugLog(`Codeload url: ${url}`);
+        debugLog(`Filter: ${filter}`);
+    }
+    await pipeline(await downloadTarStream(url), x({
+        cwd: projectDir,
+        filter: (p)=>p.includes(filter),
+        strip: 2 + template.name.split('/').length
+    }));
+}
+async function downloadTarStream(url) {
+    const res = await fetch(url);
+    if (!res.body) {
+        throw new Error(`Failed to download: ${url}`);
+    }
+    return Readable.from(res.body);
+}
+
+//# sourceMappingURL=download-template.js.map

package/dist/lib/download-template.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/lib/download-template.ts"],"sourcesContent":["import { Readable } from 'node:stream'\nimport { pipeline } from 'node:stream/promises'\nimport { x } from 'tar'\n\nimport type { ProjectTemplate } from '../types.js'\n\nimport { debug as debugLog } from '../utils/log.js'\n\nexport async function downloadTemplate({\n  debug,\n  projectDir,\n  template,\n}: {\n  debug?: boolean\n  projectDir: string\n  template: ProjectTemplate\n}) {\n  const branchOrTag = template.url.split('#')?.[1] || 'beta'\n  const url = `https://codeload.github.com/payloadcms/payload/tar.gz/${branchOrTag}`\n  const filter = `payload-${branchOrTag.replace(/^v/, '')}/templates/${template.name}/`\n\n  if (debug) {\n    debugLog(`Using template url: ${template.url}`)\n    debugLog(`Codeload url: ${url}`)\n    debugLog(`Filter: ${filter}`)\n  }\n\n  await pipeline(\n    await downloadTarStream(url),\n    x({\n      cwd: projectDir,\n      filter: (p) => p.includes(filter),\n      strip: 2 + template.name.split('/').length,\n    }),\n  )\n}\n\nasync function downloadTarStream(url: string) {\n  const res = await fetch(url)\n\n  if (!res.body) {\n    throw new Error(`Failed to download: ${url}`)\n  }\n\n  return Readable.from(res.body as unknown as NodeJS.ReadableStream)\n}\n"],"names":["Readable","pipeline","x","debug","debugLog","downloadTemplate","projectDir","template","branchOrTag","url","split","filter","replace","name","downloadTarStream","cwd","p","includes","strip","length","res","fetch","body","Error","from"],"mappings":"AAAA,SAASA,QAAQ,QAAQ,cAAa;AACtC,SAASC,QAAQ,QAAQ,uBAAsB;AAC/C,SAASC,CAAC,QAAQ,MAAK;AAIvB,SAASC,SAASC,QAAQ,QAAQ,kBAAiB;AAEnD,OAAO,eAAeC,iBAAiB,EACrCF,KAAK,EACLG,UAAU,EACVC,QAAQ,EAKT;IACC,MAAMC,cAAcD,SAASE,GAAG,CAACC,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI;IACpD,MAAMD,MAAM,CAAC,sDAAsD,EAAED,YAAY,CAAC;IAClF,MAAMG,SAAS,CAAC,QAAQ,EAAEH,YAAYI,OAAO,CAAC,MAAM,IAAI,WAAW,EAAEL,SAASM,IAAI,CAAC,CAAC,CAAC;IAErF,IAAIV,OAAO;QACTC,SAAS,CAAC,oBAAoB,EAAEG,SAASE,GAAG,CAAC,CAAC;QAC9CL,SAAS,CAAC,cAAc,EAAEK,IAAI,CAAC;QAC/BL,SAAS,CAAC,QAAQ,EAAEO,OAAO,CAAC;IAC9B;IAEA,MAAMV,SACJ,MAAMa,kBAAkBL,MACxBP,EAAE;QACAa,KAAKT;QACLK,QAAQ,CAACK,IAAMA,EAAEC,QAAQ,CAACN;QAC1BO,OAAO,IAAIX,SAASM,IAAI,CAACH,KAAK,CAAC,KAAKS,MAAM;IAC5C;AAEJ;AAEA,eAAeL,kBAAkBL,GAAW;IAC1C,MAAMW,MAAM,MAAMC,MAAMZ;IAExB,IAAI,CAACW,IAAIE,IAAI,EAAE;QACb,MAAM,IAAIC,MAAM,CAAC,oBAAoB,EAAEd,IAAI,CAAC;IAC9C;IAEA,OAAOT,SAASwB,IAAI,CAACJ,IAAIE,IAAI;AAC/B"}

package/dist/lib/get-package-manager.js

@@ -3,23 +3,44 @@ import fse from 'fs-extra';
 export async function getPackageManager(args) {
     const { cliArgs, projectDir } = args;
     try {
-        // Check for yarn.lock, package-lock.json, or pnpm-lock.yaml
+        // Check for flag or lockfile
         let detected = 'npm';
-        if (cliArgs?.['--use-pnpm'] || fse.existsSync(`${projectDir}/pnpm-lock.yaml`) || await commandExists('pnpm')) {
+        if (cliArgs?.['--use-pnpm'] || fse.existsSync(`${projectDir}/pnpm-lock.yaml`)) {
             detected = 'pnpm';
-        } else if (cliArgs?.['--use-yarn'] || fse.existsSync(`${projectDir}/yarn.lock`) || await commandExists('yarn')) {
+        } else if (cliArgs?.['--use-yarn'] || fse.existsSync(`${projectDir}/yarn.lock`)) {
             detected = 'yarn';
         } else if (cliArgs?.['--use-npm'] || fse.existsSync(`${projectDir}/package-lock.json`)) {
             detected = 'npm';
+        } else if (cliArgs?.['--use-bun'] || fse.existsSync(`${projectDir}/bun.lockb`)) {
+            detected = 'bun';
+        } else if (await commandExists('pnpm')) {
+            // Prefer pnpm if it's installed
+            detected = 'pnpm';
+        } else {
+            // Otherwise check the execution environment
+            detected = getEnvironmentPackageManager();
         }
         return detected;
-    } catch (error) {
+    } catch (ignore) {
         return 'npm';
     }
 }
+function getEnvironmentPackageManager() {
+    const userAgent = process.env.npm_config_user_agent || '';
+    if (userAgent.startsWith('yarn')) {
+        return 'yarn';
+    }
+    if (userAgent.startsWith('pnpm')) {
+        return 'pnpm';
+    }
+    if (userAgent.startsWith('bun')) {
+        return 'bun';
+    }
+    return 'npm';
+}
 async function commandExists(command) {
     try {
-        await execa.command(`command -v ${command}`);
+        await execa.command(process.platform === 'win32' ? `where ${command}` : `command -v ${command}`);
         return true;
     } catch  {
         return false;

package/dist/lib/get-package-manager.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/get-package-manager.ts"],"sourcesContent":["import execa from 'execa'\nimport fse from 'fs-extra'\n\nimport type { CliArgs, PackageManager } from '../types.js'\n\nexport async function getPackageManager(args: {\n  cliArgs?: CliArgs\n  projectDir: string\n}): Promise<PackageManager> {\n  const { cliArgs, projectDir } = args\n\n  try {\n    // Check for yarn.lock, package-lock.json, or pnpm-lock.yaml\n    let detected: PackageManager = 'npm'\n    if (\n      cliArgs?.['--use-pnpm'] ||\n      fse.existsSync(`${projectDir}/pnpm-lock.yaml`) ||\n      (await commandExists('pnpm'))\n    ) {\n      detected = 'pnpm'\n    } else if (\n      cliArgs?.['--use-yarn'] ||\n      fse.existsSync(`${projectDir}/yarn.lock`) ||\n      (await commandExists('yarn'))\n    ) {\n      detected = 'yarn'\n    } else if (cliArgs?.['--use-npm'] || fse.existsSync(`${projectDir}/package-lock.json`)) {\n      detected = 'npm'\n    }\n\n    return detected\n  } catch (error) {\n    return 'npm'\n  }\n}\n\nasync function commandExists(command: string): Promise<boolean> {\n  try {\n    await execa.command(`command -v ${command}`)\n    return true\n  } catch {\n    return false\n  }\n}\n"],"names":["execa","fse","getPackageManager","args","cliArgs","projectDir","detected","existsSync","commandExists","error","command"],"mappings":"AAAA,OAAOA,WAAW,QAAO;AACzB,OAAOC,SAAS,WAAU;AAI1B,OAAO,eAAeC,kBAAkBC,IAGvC;IACC,MAAM,EAAEC,OAAO,EAAEC,UAAU,EAAE,GAAGF;IAEhC,IAAI;QACF,4DAA4D;QAC5D,IAAIG,WAA2B;QAC/B,IACEF,SAAS,CAAC,aAAa,IACvBH,IAAIM,UAAU,CAAC,CAAC,EAAEF,WAAW,eAAe,CAAC,KAC5C,MAAMG,cAAc,SACrB;YACAF,WAAW;QACb,OAAO,IACLF,SAAS,CAAC,aAAa,IACvBH,IAAIM,UAAU,CAAC,CAAC,EAAEF,WAAW,UAAU,CAAC,KACvC,MAAMG,cAAc,SACrB;YACAF,WAAW;QACb,OAAO,IAAIF,SAAS,CAAC,YAAY,IAAIH,IAAIM,UAAU,CAAC,CAAC,EAAEF,WAAW,kBAAkB,CAAC,GAAG;YACtFC,WAAW;QACb;QAEA,OAAOA;IACT,EAAE,OAAOG,OAAO;QACd,OAAO;IACT;AACF;AAEA,eAAeD,cAAcE,OAAe;IAC1C,IAAI;QACF,MAAMV,MAAMU,OAAO,CAAC,CAAC,WAAW,EAAEA,QAAQ,CAAC;QAC3C,OAAO;IACT,EAAE,OAAM;QACN,OAAO;IACT;AACF"}
+{"version":3,"sources":["../../src/lib/get-package-manager.ts"],"sourcesContent":["import execa from 'execa'\nimport fse from 'fs-extra'\n\nimport type { CliArgs, PackageManager } from '../types.js'\n\nexport async function getPackageManager(args: {\n  cliArgs?: CliArgs\n  projectDir: string\n}): Promise<PackageManager> {\n  const { cliArgs, projectDir } = args\n\n  try {\n    // Check for flag or lockfile\n    let detected: PackageManager = 'npm'\n    if (cliArgs?.['--use-pnpm'] || fse.existsSync(`${projectDir}/pnpm-lock.yaml`)) {\n      detected = 'pnpm'\n    } else if (cliArgs?.['--use-yarn'] || fse.existsSync(`${projectDir}/yarn.lock`)) {\n      detected = 'yarn'\n    } else if (cliArgs?.['--use-npm'] || fse.existsSync(`${projectDir}/package-lock.json`)) {\n      detected = 'npm'\n    } else if (cliArgs?.['--use-bun'] || fse.existsSync(`${projectDir}/bun.lockb`)) {\n      detected = 'bun'\n    } else if (await commandExists('pnpm')) {\n      // Prefer pnpm if it's installed\n      detected = 'pnpm'\n    } else {\n      // Otherwise check the execution environment\n      detected = getEnvironmentPackageManager()\n    }\n\n    return detected\n  } catch (ignore) {\n    return 'npm'\n  }\n}\n\nfunction getEnvironmentPackageManager(): PackageManager {\n  const userAgent = process.env.npm_config_user_agent || ''\n\n  if (userAgent.startsWith('yarn')) {\n    return 'yarn'\n  }\n\n  if (userAgent.startsWith('pnpm')) {\n    return 'pnpm'\n  }\n\n  if (userAgent.startsWith('bun')) {\n    return 'bun'\n  }\n\n  return 'npm'\n}\n\nasync function commandExists(command: string): Promise<boolean> {\n  try {\n    await execa.command(process.platform === 'win32' ? `where ${command}` : `command -v ${command}`)\n    return true\n  } catch {\n    return false\n  }\n}\n"],"names":["execa","fse","getPackageManager","args","cliArgs","projectDir","detected","existsSync","commandExists","getEnvironmentPackageManager","ignore","userAgent","process","env","npm_config_user_agent","startsWith","command","platform"],"mappings":"AAAA,OAAOA,WAAW,QAAO;AACzB,OAAOC,SAAS,WAAU;AAI1B,OAAO,eAAeC,kBAAkBC,IAGvC;IACC,MAAM,EAAEC,OAAO,EAAEC,UAAU,EAAE,GAAGF;IAEhC,IAAI;QACF,6BAA6B;QAC7B,IAAIG,WAA2B;QAC/B,IAAIF,SAAS,CAAC,aAAa,IAAIH,IAAIM,UAAU,CAAC,CAAC,EAAEF,WAAW,eAAe,CAAC,GAAG;YAC7EC,WAAW;QACb,OAAO,IAAIF,SAAS,CAAC,aAAa,IAAIH,IAAIM,UAAU,CAAC,CAAC,EAAEF,WAAW,UAAU,CAAC,GAAG;YAC/EC,WAAW;QACb,OAAO,IAAIF,SAAS,CAAC,YAAY,IAAIH,IAAIM,UAAU,CAAC,CAAC,EAAEF,WAAW,kBAAkB,CAAC,GAAG;YACtFC,WAAW;QACb,OAAO,IAAIF,SAAS,CAAC,YAAY,IAAIH,IAAIM,UAAU,CAAC,CAAC,EAAEF,WAAW,UAAU,CAAC,GAAG;YAC9EC,WAAW;QACb,OAAO,IAAI,MAAME,cAAc,SAAS;YACtC,gCAAgC;YAChCF,WAAW;QACb,OAAO;YACL,4CAA4C;YAC5CA,WAAWG;QACb;QAEA,OAAOH;IACT,EAAE,OAAOI,QAAQ;QACf,OAAO;IACT;AACF;AAEA,SAASD;IACP,MAAME,YAAYC,QAAQC,GAAG,CAACC,qBAAqB,IAAI;IAEvD,IAAIH,UAAUI,UAAU,CAAC,SAAS;QAChC,OAAO;IACT;IAEA,IAAIJ,UAAUI,UAAU,CAAC,SAAS;QAChC,OAAO;IACT;IAEA,IAAIJ,UAAUI,UAAU,CAAC,QAAQ;QAC/B,OAAO;IACT;IAEA,OAAO;AACT;AAEA,eAAeP,cAAcQ,OAAe;IAC1C,IAAI;QACF,MAAMhB,MAAMgB,OAAO,CAACJ,QAAQK,QAAQ,KAAK,UAAU,CAAC,MAAM,EAAED,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAEA,QAAQ,CAAC;QAC/F,OAAO;IACT,EAAE,OAAM;QACN,OAAO;IACT;AACF"}

package/dist/lib/init-next.d.ts

@@ -1,21 +1,21 @@
 import type { CliArgs, DbType, NextAppDetails, PackageManager } from '../types.js';
-type InitNextArgs = Pick<CliArgs, '--debug'> & {
+type InitNextArgs = {
     dbType: DbType;
     nextAppDetails?: NextAppDetails;
     packageManager: PackageManager;
     projectDir: string;
     useDistFiles?: boolean;
-};
+} & Pick<CliArgs, '--debug'>;
 type InitNextResult = {
-    isSrcDir: boolean;
-    nextAppDir: string;
-    payloadConfigPath: string;
-    success: true;
-} | {
     isSrcDir: boolean;
     nextAppDir?: string;
     reason: string;
     success: false;
+} | {
+    isSrcDir: boolean;
+    nextAppDir: string;
+    payloadConfigPath: string;
+    success: true;
 };
 export declare function initNext(args: InitNextArgs): Promise<InitNextResult>;
 export declare function getNextAppDetails(projectDir: string): Promise<NextAppDetails>;

package/dist/lib/init-next.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init-next.d.ts","sourceRoot":"","sources":["../../src/lib/init-next.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAkB,cAAc,EAAE,MAAM,aAAa,CAAA;AAclG,KAAK,YAAY,GAAG,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,GAAG;IAC7C,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE,cAAc,CAAA;IAC/B,cAAc,EAAE,cAAc,CAAA;IAC9B,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,KAAK,cAAc,GACf;IACE,QAAQ,EAAE,OAAO,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,iBAAiB,EAAE,MAAM,CAAA;IACzB,OAAO,EAAE,IAAI,CAAA;CACd,GACD;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,KAAK,CAAA;CAAE,CAAA;AAE9E,wBAAsB,QAAQ,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC,CAiE1E;AAkID,wBAAsB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CA6CnF"}
+{"version":3,"file":"init-next.d.ts","sourceRoot":"","sources":["../../src/lib/init-next.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAkB,cAAc,EAAE,MAAM,aAAa,CAAA;AAclG,KAAK,YAAY,GAAG;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE,cAAc,CAAA;IAC/B,cAAc,EAAE,cAAc,CAAA;IAC9B,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,GAAG,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;AAE5B,KAAK,cAAc,GACf;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,KAAK,CAAA;CAAE,GAC1E;IACE,QAAQ,EAAE,OAAO,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,iBAAiB,EAAE,MAAM,CAAA;IACzB,OAAO,EAAE,IAAI,CAAA;CACd,CAAA;AAEL,wBAAsB,QAAQ,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC,CAgE1E;AAqID,wBAAsB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CA2FnF"}

package/dist/lib/init-next.js

@@ -26,7 +26,7 @@ export async function initNext(args) {
         });
         nextAppDetails.nextAppDir = createdAppDir;
     }
-    const { hasTopLevelLayout, isPayloadInstalled, isSrcDir, nextAppDir, nextConfigType } = nextAppDetails;
+    const { hasTopLevelLayout, isSrcDir, nextAppDir, nextConfigType } = nextAppDetails;
     if (!nextConfigType) {
         return {
             isSrcDir,
@@ -50,7 +50,7 @@ export async function initNext(args) {
     }
     const installSpinner = p.spinner();
     installSpinner.start('Installing Payload and dependencies...');
-    const configurationResult = installAndConfigurePayload({
+    const configurationResult = await installAndConfigurePayload({
         ...args,
         nextAppDetails,
         nextConfigType,
@@ -112,7 +112,7 @@ async function addPayloadConfigToTsConfig(projectDir, isSrcDir) {
         });
     }
 }
-function installAndConfigurePayload(args) {
+async function installAndConfigurePayload(args) {
     const { '--debug': debug, nextAppDetails: { isSrcDir, nextAppDir, nextConfigPath } = {}, nextConfigType, projectDir, useDistFiles } = args;
     if (!nextAppDir || !nextConfigPath) {
         return {
@@ -121,7 +121,9 @@ function installAndConfigurePayload(args) {
         };
     }
     const logDebug = (message)=>{
-        if (debug) origDebug(message);
+        if (debug) {
+            origDebug(message);
+        }
     };
     if (!fs.existsSync(projectDir)) {
         return {
@@ -129,7 +131,7 @@ 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 {
@@ -148,9 +150,9 @@ function installAndConfigurePayload(args) {
     logDebug(`payloadConfigPath: ${path.resolve(projectDir, 'payload.config.ts')}`);
     logDebug(`isSrcDir: ${isSrcDir}. source: ${templateSrcDir}. dest: ${path.dirname(nextConfigPath)}`);
     // This is a little clunky and needs to account for isSrcDir
-    copyRecursiveSync(templateSrcDir, path.dirname(nextConfigPath), debug);
+    copyRecursiveSync(templateSrcDir, path.dirname(nextConfigPath));
     // Wrap next.config.js with withPayload
-    wrapNextConfig({
+    await wrapNextConfig({
         nextConfigPath,
         nextConfigType
     });
@@ -164,7 +166,7 @@ async function installDeps(projectDir, packageManager, dbType) {
         'payload',
         '@payloadcms/next',
         '@payloadcms/richtext-lexical',
-        '@payloadcms/plugin-cloud'
+        '@payloadcms/payload-cloud'
     ].map((pkg)=>`${pkg}@beta`);
     packagesToInstall.push(`@payloadcms/db-${dbType}@beta`);
     // Match graphql version of @payloadcms/next
@@ -177,7 +179,8 @@ async function installDeps(projectDir, packageManager, dbType) {
 }
 export async function getNextAppDetails(projectDir) {
     const isSrcDir = fs.existsSync(path.resolve(projectDir, 'src'));
-    const nextConfigPath = (await globby('next.config.*js', {
+    // Match next.config.js, next.config.ts, next.config.mjs, next.config.cjs
+    const nextConfigPath = (await globby('next.config.(\\w)?(t|j)s', {
         absolute: true,
         cwd: projectDir
     }))?.[0];
@@ -185,16 +188,50 @@ export async function getNextAppDetails(projectDir) {
         return {
             hasTopLevelLayout: false,
             isSrcDir,
-            nextConfigPath: undefined
+            isSupportedNextVersion: false,
+            nextConfigPath: undefined,
+            nextVersion: null
         };
     }
     const packageObj = await fse.readJson(path.resolve(projectDir, 'package.json'));
+    // Check if Next.js version is new enough
+    let nextVersion = null;
+    if (packageObj.dependencies?.next) {
+        nextVersion = packageObj.dependencies.next;
+        // Match versions using regex matching groups
+        const versionMatch = /(?<major>\d+)/.exec(nextVersion);
+        if (!versionMatch) {
+            p.log.warn(`Could not determine Next.js version from ${nextVersion}`);
+            return {
+                hasTopLevelLayout: false,
+                isSrcDir,
+                isSupportedNextVersion: false,
+                nextConfigPath,
+                nextVersion
+            };
+        }
+        const { major } = versionMatch.groups;
+        const majorVersion = parseInt(major);
+        if (majorVersion < 15) {
+            return {
+                hasTopLevelLayout: false,
+                isSrcDir,
+                isSupportedNextVersion: false,
+                nextConfigPath,
+                nextVersion
+            };
+        }
+    }
+    const isSupportedNextVersion = true;
+    // Check if Payload already installed
     if (packageObj.dependencies?.payload) {
         return {
             hasTopLevelLayout: false,
             isPayloadInstalled: true,
             isSrcDir,
-            nextConfigPath
+            isSupportedNextVersion,
+            nextConfigPath,
+            nextVersion
         };
     }
     let nextAppDir = (await globby([
@@ -218,13 +255,18 @@ export async function getNextAppDetails(projectDir) {
     return {
         hasTopLevelLayout,
         isSrcDir,
+        isSupportedNextVersion,
         nextAppDir,
         nextConfigPath,
-        nextConfigType: configType
+        nextConfigType: configType,
+        nextVersion
     };
 }
 function getProjectType(args) {
     const { nextConfigPath, packageObj } = args;
+    if (nextConfigPath.endsWith('.ts')) {
+        return 'ts';
+    }
     if (nextConfigPath.endsWith('.mjs')) {
         return 'esm';
     }