create-payload-app 3.0.0-alpha.64 → 3.0.0-alpha.66

package/dist/lib/configure-payload-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configure-payload-config.d.ts","sourceRoot":"","sources":["../../src/lib/configure-payload-config.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAK5C,gEAAgE;AAChE,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,SAAS,EAAE,SAAS,GAAG,SAAS,CAAA;IAChC,sBAAsB,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAA;CAC/E,GAAG,OAAO,CAAC,IAAI,CAAC,CA6DhB"}
+{"version":3,"file":"configure-payload-config.d.ts","sourceRoot":"","sources":["../../src/lib/configure-payload-config.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAK5C,gEAAgE;AAChE,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,SAAS,EAAE,SAAS,GAAG,SAAS,CAAA;IAChC,sBAAsB,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAA;CAC/E,GAAG,OAAO,CAAC,IAAI,CAAC,CAyFhB"}

package/dist/lib/configure-payload-config.js

@@ -1,11 +1,37 @@
 import fse from 'fs-extra';
 import globby from 'globby';
+import { fileURLToPath } from 'node:url';
+import path from 'path';
+const filename = fileURLToPath(import.meta.url);
+const dirname = path.dirname(filename);
 import { warning } from '../utils/log.js';
 import { dbReplacements } from './packages.js';
 /** Update payload config with necessary imports and adapters */ export async function configurePayloadConfig(args) {
     if (!args.dbDetails) {
         return;
     }
+    // Update package.json
+    const packageJsonPath = 'projectDir' in args.projectDirOrConfigPath && path.resolve(args.projectDirOrConfigPath.projectDir, 'package.json');
+    if (packageJsonPath && fse.existsSync(packageJsonPath)) {
+        try {
+            const packageObj = await fse.readJson(packageJsonPath);
+            const dbPackage = dbReplacements[args.dbDetails.type];
+            // Delete all other db adapters
+            Object.values(dbReplacements).forEach((p)=>{
+                if (p.packageName !== dbPackage.packageName) {
+                    delete packageObj.dependencies[p.packageName];
+                }
+            });
+            // Set version of db adapter to match payload version
+            packageObj.dependencies[dbPackage.packageName] = packageObj.dependencies['payload'];
+            await fse.writeJson(packageJsonPath, packageObj, {
+                spaces: 2
+            });
+        } catch (err) {
+            warning(`Unable to configure Payload in package.json`);
+            warning(err instanceof Error ? err.message : '');
+        }
+    }
     try {
         let payloadConfigPath;
         if (!('payloadConfigPath' in args.projectDirOrConfigPath)) {

package/dist/lib/configure-payload-config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/configure-payload-config.ts"],"sourcesContent":["import fse from 'fs-extra'\nimport globby from 'globby'\n\nimport type { DbDetails } from '../types.js'\n\nimport { warning } from '../utils/log.js'\nimport { dbReplacements } from './packages.js'\n\n/** Update payload config with necessary imports and adapters */\nexport async function configurePayloadConfig(args: {\n  dbDetails: DbDetails | undefined\n  projectDirOrConfigPath: { payloadConfigPath: string } | { projectDir: string }\n}): Promise<void> {\n  if (!args.dbDetails) {\n    return\n  }\n\n  try {\n    let payloadConfigPath: string | undefined\n    if (!('payloadConfigPath' in args.projectDirOrConfigPath)) {\n      payloadConfigPath = (\n        await globby('**/payload.config.ts', {\n          absolute: true,\n          cwd: args.projectDirOrConfigPath.projectDir,\n        })\n      )?.[0]\n    } else {\n      payloadConfigPath = args.projectDirOrConfigPath.payloadConfigPath\n    }\n\n    if (!payloadConfigPath) {\n      warning('Unable to update payload.config.ts with plugins. Could not find payload.config.ts.')\n      return\n    }\n\n    const configContent = fse.readFileSync(payloadConfigPath, 'utf-8')\n    const configLines = configContent.split('\\n')\n\n    const dbReplacement = dbReplacements[args.dbDetails.type]\n\n    let dbConfigStartLineIndex: number | undefined\n    let dbConfigEndLineIndex: number | undefined\n\n    configLines.forEach((l, i) => {\n      if (l.includes('// database-adapter-import')) {\n        configLines[i] = dbReplacement.importReplacement\n      }\n\n      if (l.includes('// database-adapter-config-start')) {\n        dbConfigStartLineIndex = i\n      }\n      if (l.includes('// database-adapter-config-end')) {\n        dbConfigEndLineIndex = i\n      }\n    })\n\n    if (!dbConfigStartLineIndex || !dbConfigEndLineIndex) {\n      warning('Unable to update payload.config.ts with database adapter import')\n    } else {\n      // Replaces lines between `// database-adapter-config-start` and `// database-adapter-config-end`\n      configLines.splice(\n        dbConfigStartLineIndex,\n        dbConfigEndLineIndex - dbConfigStartLineIndex + 1,\n        ...dbReplacement.configReplacement,\n      )\n    }\n\n    fse.writeFileSync(payloadConfigPath, configLines.join('\\n'))\n  } catch (err: unknown) {\n    warning(\n      `Unable to update payload.config.ts with plugins: ${err instanceof Error ? err.message : ''}`,\n    )\n  }\n}\n"],"names":["fse","globby","warning","dbReplacements","configurePayloadConfig","args","dbDetails","payloadConfigPath","projectDirOrConfigPath","absolute","cwd","projectDir","configContent","readFileSync","configLines","split","dbReplacement","type","dbConfigStartLineIndex","dbConfigEndLineIndex","forEach","l","i","includes","importReplacement","splice","configReplacement","writeFileSync","join","err","Error","message"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA,OAAOA,SAAS,WAAU;AAC1B,OAAOC,YAAY,SAAQ;AAI3B,SAASC,OAAO,QAAQ,kBAAiB;AACzC,SAASC,cAAc,QAAQ,gBAAe;AAE9C,8DAA8D,GAC9D,OAAO,eAAeC,uBAAuBC,IAG5C;IACC,IAAI,CAACA,KAAKC,SAAS,EAAE;QACnB;IACF;IAEA,IAAI;QACF,IAAIC;QACJ,IAAI,CAAE,CAAA,uBAAuBF,KAAKG,sBAAsB,AAAD,GAAI;YACzDD,oBACE,CAAA,MAAMN,OAAO,wBAAwB;gBACnCQ,UAAU;gBACVC,KAAKL,KAAKG,sBAAsB,CAACG,UAAU;YAC7C,EAAC,GACA,CAAC,EAAE;QACR,OAAO;YACLJ,oBAAoBF,KAAKG,sBAAsB,CAACD,iBAAiB;QACnE;QAEA,IAAI,CAACA,mBAAmB;YACtBL,QAAQ;YACR;QACF;QAEA,MAAMU,gBAAgBZ,IAAIa,YAAY,CAACN,mBAAmB;QAC1D,MAAMO,cAAcF,cAAcG,KAAK,CAAC;QAExC,MAAMC,gBAAgBb,cAAc,CAACE,KAAKC,SAAS,CAACW,IAAI,CAAC;QAEzD,IAAIC;QACJ,IAAIC;QAEJL,YAAYM,OAAO,CAAC,CAACC,GAAGC;YACtB,IAAID,EAAEE,QAAQ,CAAC,+BAA+B;gBAC5CT,WAAW,CAACQ,EAAE,GAAGN,cAAcQ,iBAAiB;YAClD;YAEA,IAAIH,EAAEE,QAAQ,CAAC,qCAAqC;gBAClDL,yBAAyBI;YAC3B;YACA,IAAID,EAAEE,QAAQ,CAAC,mCAAmC;gBAChDJ,uBAAuBG;YACzB;QACF;QAEA,IAAI,CAACJ,0BAA0B,CAACC,sBAAsB;YACpDjB,QAAQ;QACV,OAAO;YACL,iGAAiG;YACjGY,YAAYW,MAAM,CAChBP,wBACAC,uBAAuBD,yBAAyB,MAC7CF,cAAcU,iBAAiB;QAEtC;QAEA1B,IAAI2B,aAAa,CAACpB,mBAAmBO,YAAYc,IAAI,CAAC;IACxD,EAAE,OAAOC,KAAc;QACrB3B,QACE,CAAC,iDAAiD,EAAE2B,eAAeC,QAAQD,IAAIE,OAAO,GAAG,GAAG,CAAC;IAEjG;AACF"}
+{"version":3,"sources":["../../src/lib/configure-payload-config.ts"],"sourcesContent":["import fse from 'fs-extra'\nimport globby from 'globby'\nimport { fileURLToPath } from 'node:url'\nimport path from 'path'\nconst filename = fileURLToPath(import.meta.url)\nconst dirname = path.dirname(filename)\n\nimport type { DbDetails } from '../types.js'\n\nimport { warning } from '../utils/log.js'\nimport { dbReplacements } from './packages.js'\n\n/** Update payload config with necessary imports and adapters */\nexport async function configurePayloadConfig(args: {\n  dbDetails: DbDetails | undefined\n  projectDirOrConfigPath: { payloadConfigPath: string } | { projectDir: string }\n}): Promise<void> {\n  if (!args.dbDetails) {\n    return\n  }\n\n  // Update package.json\n  const packageJsonPath =\n    'projectDir' in args.projectDirOrConfigPath &&\n    path.resolve(args.projectDirOrConfigPath.projectDir, 'package.json')\n\n  if (packageJsonPath && fse.existsSync(packageJsonPath)) {\n    try {\n      const packageObj = await fse.readJson(packageJsonPath)\n\n      const dbPackage = dbReplacements[args.dbDetails.type]\n\n      // Delete all other db adapters\n      Object.values(dbReplacements).forEach((p) => {\n        if (p.packageName !== dbPackage.packageName) {\n          delete packageObj.dependencies[p.packageName]\n        }\n      })\n\n      // Set version of db adapter to match payload version\n      packageObj.dependencies[dbPackage.packageName] = packageObj.dependencies['payload']\n\n      await fse.writeJson(packageJsonPath, packageObj, { spaces: 2 })\n    } catch (err: unknown) {\n      warning(`Unable to configure Payload in package.json`)\n      warning(err instanceof Error ? err.message : '')\n    }\n  }\n\n  try {\n    let payloadConfigPath: string | undefined\n    if (!('payloadConfigPath' in args.projectDirOrConfigPath)) {\n      payloadConfigPath = (\n        await globby('**/payload.config.ts', {\n          absolute: true,\n          cwd: args.projectDirOrConfigPath.projectDir,\n        })\n      )?.[0]\n    } else {\n      payloadConfigPath = args.projectDirOrConfigPath.payloadConfigPath\n    }\n\n    if (!payloadConfigPath) {\n      warning('Unable to update payload.config.ts with plugins. Could not find payload.config.ts.')\n      return\n    }\n\n    const configContent = fse.readFileSync(payloadConfigPath, 'utf-8')\n    const configLines = configContent.split('\\n')\n\n    const dbReplacement = dbReplacements[args.dbDetails.type]\n\n    let dbConfigStartLineIndex: number | undefined\n    let dbConfigEndLineIndex: number | undefined\n\n    configLines.forEach((l, i) => {\n      if (l.includes('// database-adapter-import')) {\n        configLines[i] = dbReplacement.importReplacement\n      }\n\n      if (l.includes('// database-adapter-config-start')) {\n        dbConfigStartLineIndex = i\n      }\n      if (l.includes('// database-adapter-config-end')) {\n        dbConfigEndLineIndex = i\n      }\n    })\n\n    if (!dbConfigStartLineIndex || !dbConfigEndLineIndex) {\n      warning('Unable to update payload.config.ts with database adapter import')\n    } else {\n      // Replaces lines between `// database-adapter-config-start` and `// database-adapter-config-end`\n      configLines.splice(\n        dbConfigStartLineIndex,\n        dbConfigEndLineIndex - dbConfigStartLineIndex + 1,\n        ...dbReplacement.configReplacement,\n      )\n    }\n\n    fse.writeFileSync(payloadConfigPath, configLines.join('\\n'))\n  } catch (err: unknown) {\n    warning(\n      `Unable to update payload.config.ts with plugins: ${err instanceof Error ? err.message : ''}`,\n    )\n  }\n}\n"],"names":["fse","globby","fileURLToPath","path","filename","url","dirname","warning","dbReplacements","configurePayloadConfig","args","dbDetails","packageJsonPath","projectDirOrConfigPath","resolve","projectDir","existsSync","packageObj","readJson","dbPackage","type","Object","values","forEach","p","packageName","dependencies","writeJson","spaces","err","Error","message","payloadConfigPath","absolute","cwd","configContent","readFileSync","configLines","split","dbReplacement","dbConfigStartLineIndex","dbConfigEndLineIndex","l","i","includes","importReplacement","splice","configReplacement","writeFileSync","join"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA,OAAOA,SAAS,WAAU;AAC1B,OAAOC,YAAY,SAAQ;AAC3B,SAASC,aAAa,QAAQ,WAAU;AACxC,OAAOC,UAAU,OAAM;AACvB,MAAMC,WAAWF,cAAc,YAAYG,GAAG;AAC9C,MAAMC,UAAUH,KAAKG,OAAO,CAACF;AAI7B,SAASG,OAAO,QAAQ,kBAAiB;AACzC,SAASC,cAAc,QAAQ,gBAAe;AAE9C,8DAA8D,GAC9D,OAAO,eAAeC,uBAAuBC,IAG5C;IACC,IAAI,CAACA,KAAKC,SAAS,EAAE;QACnB;IACF;IAEA,sBAAsB;IACtB,MAAMC,kBACJ,gBAAgBF,KAAKG,sBAAsB,IAC3CV,KAAKW,OAAO,CAACJ,KAAKG,sBAAsB,CAACE,UAAU,EAAE;IAEvD,IAAIH,mBAAmBZ,IAAIgB,UAAU,CAACJ,kBAAkB;QACtD,IAAI;YACF,MAAMK,aAAa,MAAMjB,IAAIkB,QAAQ,CAACN;YAEtC,MAAMO,YAAYX,cAAc,CAACE,KAAKC,SAAS,CAACS,IAAI,CAAC;YAErD,+BAA+B;YAC/BC,OAAOC,MAAM,CAACd,gBAAgBe,OAAO,CAAC,CAACC;gBACrC,IAAIA,EAAEC,WAAW,KAAKN,UAAUM,WAAW,EAAE;oBAC3C,OAAOR,WAAWS,YAAY,CAACF,EAAEC,WAAW,CAAC;gBAC/C;YACF;YAEA,qDAAqD;YACrDR,WAAWS,YAAY,CAACP,UAAUM,WAAW,CAAC,GAAGR,WAAWS,YAAY,CAAC,UAAU;YAEnF,MAAM1B,IAAI2B,SAAS,CAACf,iBAAiBK,YAAY;gBAAEW,QAAQ;YAAE;QAC/D,EAAE,OAAOC,KAAc;YACrBtB,QAAQ,CAAC,2CAA2C,CAAC;YACrDA,QAAQsB,eAAeC,QAAQD,IAAIE,OAAO,GAAG;QAC/C;IACF;IAEA,IAAI;QACF,IAAIC;QACJ,IAAI,CAAE,CAAA,uBAAuBtB,KAAKG,sBAAsB,AAAD,GAAI;YACzDmB,oBACE,CAAA,MAAM/B,OAAO,wBAAwB;gBACnCgC,UAAU;gBACVC,KAAKxB,KAAKG,sBAAsB,CAACE,UAAU;YAC7C,EAAC,GACA,CAAC,EAAE;QACR,OAAO;YACLiB,oBAAoBtB,KAAKG,sBAAsB,CAACmB,iBAAiB;QACnE;QAEA,IAAI,CAACA,mBAAmB;YACtBzB,QAAQ;YACR;QACF;QAEA,MAAM4B,gBAAgBnC,IAAIoC,YAAY,CAACJ,mBAAmB;QAC1D,MAAMK,cAAcF,cAAcG,KAAK,CAAC;QAExC,MAAMC,gBAAgB/B,cAAc,CAACE,KAAKC,SAAS,CAACS,IAAI,CAAC;QAEzD,IAAIoB;QACJ,IAAIC;QAEJJ,YAAYd,OAAO,CAAC,CAACmB,GAAGC;YACtB,IAAID,EAAEE,QAAQ,CAAC,+BAA+B;gBAC5CP,WAAW,CAACM,EAAE,GAAGJ,cAAcM,iBAAiB;YAClD;YAEA,IAAIH,EAAEE,QAAQ,CAAC,qCAAqC;gBAClDJ,yBAAyBG;YAC3B;YACA,IAAID,EAAEE,QAAQ,CAAC,mCAAmC;gBAChDH,uBAAuBE;YACzB;QACF;QAEA,IAAI,CAACH,0BAA0B,CAACC,sBAAsB;YACpDlC,QAAQ;QACV,OAAO;YACL,iGAAiG;YACjG8B,YAAYS,MAAM,CAChBN,wBACAC,uBAAuBD,yBAAyB,MAC7CD,cAAcQ,iBAAiB;QAEtC;QAEA/C,IAAIgD,aAAa,CAAChB,mBAAmBK,YAAYY,IAAI,CAAC;IACxD,EAAE,OAAOpB,KAAc;QACrBtB,QACE,CAAC,iDAAiD,EAAEsB,eAAeC,QAAQD,IAAIE,OAAO,GAAG,GAAG,CAAC;IAEjG;AACF"}

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

@@ -0,0 +1,22 @@
+/* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
+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'
+
+type Args = {
+  params: {
+    segments: string[]
+  }
+  searchParams: {
+    [key: string]: string | string[]
+  }
+}
+
+export const generateMetadata = ({ params, searchParams }: Args): Promise<Metadata> =>
+  generatePageMetadata({ config, params, searchParams })
+
+const NotFound = ({ params, searchParams }: Args) => NotFoundPage({ config, params, searchParams })
+
+export default NotFound

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

@@ -1,7 +1,9 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
+import type { Metadata } from 'next'
+
 import config from '@payload-config'
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
-import { RootPage } from '@payloadcms/next/views'
+import { RootPage, generatePageMetadata } from '@payloadcms/next/views'
 
 type Args = {
   params: {
@@ -12,6 +14,9 @@ type Args = {
   }
 }
 
+export const generateMetadata = ({ params, searchParams }: Args): Promise<Metadata> =>
+  generatePageMetadata({ config, params, searchParams })
+
 const Page = ({ params, searchParams }: Args) => RootPage({ config, params, searchParams })
 
 export default Page

package/dist/template/src/app/(payload)/api/[...slug]/route.ts

@@ -1,9 +1,10 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY it because it could be re-written at any time. */
 import config from '@payload-config'
-import { REST_DELETE, REST_GET, REST_PATCH, REST_POST } from '@payloadcms/next/routes'
+import { REST_DELETE, REST_GET, REST_OPTIONS, REST_PATCH, REST_POST } from '@payloadcms/next/routes'
 
 export const GET = REST_GET(config)
 export const POST = REST_POST(config)
 export const DELETE = REST_DELETE(config)
 export const PATCH = REST_PATCH(config)
+export const OPTIONS = REST_OPTIONS(config)

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

@@ -1,6 +1,5 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 import configPromise from '@payload-config'
-import '@payloadcms/next/css'
 import { RootLayout } from '@payloadcms/next/layouts'
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import React from 'react'

package/package.json

@@ -1,17 +1,24 @@
 {
   "name": "create-payload-app",
-  "version": "3.0.0-alpha.64",
-  "license": "MIT",
-  "type": "module",
+  "version": "3.0.0-alpha.66",
   "homepage": "https://payloadcms.com",
-  "bin": {
-    "create-payload-app": "bin/cli.js"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/payloadcms/payload.git",
     "directory": "packages/create-payload-app"
   },
+  "license": "MIT",
+  "type": "module",
+  "exports": {
+    "./commands": {
+      "import": "./src/lib/init-next.ts",
+      "require": "./src/lib/init-next.ts",
+      "types": "./src/lib/init-next.ts"
+    }
+  },
+  "bin": {
+    "create-payload-app": "bin/cli.js"
+  },
   "files": [
     "package.json",
     "dist",
@@ -41,19 +48,12 @@
     "@types/jest": "^27.0.3",
     "@types/node": "20.12.5"
   },
-  "exports": {
-    "./commands": {
-      "import": "./src/lib/init-next.ts",
-      "require": "./src/lib/init-next.ts",
-      "types": "./src/lib/init-next.ts"
-    }
-  },
   "scripts": {
     "build": "pnpm pack-template-files && pnpm typecheck && pnpm build:swc",
-    "typecheck": "tsc",
-    "pack-template-files": "tsx src/scripts/pack-template-files.ts",
     "build:swc": "swc ./src -d ./dist --config-file .swcrc",
     "clean": "rimraf {dist,*.tsbuildinfo}",
-    "test": "jest"
+    "pack-template-files": "tsx src/scripts/pack-template-files.ts",
+    "test": "jest",
+    "typecheck": "tsc"
   }
 }