@payloadcms/figma 0.0.1-alpha.42 → 0.0.1-alpha.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api/control-plane.d.ts +1 -22
- package/dist/api/control-plane.d.ts.map +1 -1
- package/dist/api/control-plane.js +22 -55
- package/dist/api/control-plane.js.map +1 -1
- package/dist/api/figma-api.d.ts.map +1 -1
- package/dist/api/figma-api.js +21 -45
- package/dist/api/figma-api.js.map +1 -1
- package/dist/auth/callback-server.d.ts.map +1 -1
- package/dist/auth/callback-server.js +1 -2
- package/dist/auth/callback-server.js.map +1 -1
- package/dist/auth/crypto-utils.d.ts.map +1 -1
- package/dist/auth/crypto-utils.js +5 -5
- package/dist/auth/crypto-utils.js.map +1 -1
- package/dist/auth/jwt-validator.d.ts +1 -2
- package/dist/auth/jwt-validator.d.ts.map +1 -1
- package/dist/auth/jwt-validator.js +2 -2
- package/dist/auth/jwt-validator.js.map +1 -1
- package/dist/auth/oauth-flow.d.ts +1 -1
- package/dist/auth/oauth-flow.d.ts.map +1 -1
- package/dist/auth/oauth-flow.js +11 -15
- package/dist/auth/oauth-flow.js.map +1 -1
- package/dist/auth/project-token.d.ts.map +1 -1
- package/dist/auth/project-token.js +4 -9
- package/dist/auth/project-token.js.map +1 -1
- package/dist/auth/refresh.d.ts +1 -2
- package/dist/auth/refresh.d.ts.map +1 -1
- package/dist/auth/refresh.js +12 -25
- package/dist/auth/refresh.js.map +1 -1
- package/dist/auth/token-store.d.ts +0 -12
- package/dist/auth/token-store.d.ts.map +1 -1
- package/dist/auth/token-store.js +5 -28
- package/dist/auth/token-store.js.map +1 -1
- package/dist/auth/types.d.ts +4 -7
- package/dist/auth/types.d.ts.map +1 -1
- package/dist/auth/types.js.map +1 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +6 -39
- package/dist/cli.js.map +1 -1
- package/dist/commands/deploy.d.ts +0 -4
- package/dist/commands/deploy.d.ts.map +1 -1
- package/dist/commands/deploy.js +129 -72
- package/dist/commands/deploy.js.map +1 -1
- package/dist/commands/init.d.ts +5 -1
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +85 -105
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/list-tokens.d.ts +3 -3
- package/dist/commands/list-tokens.d.ts.map +1 -1
- package/dist/commands/list-tokens.js +7 -22
- package/dist/commands/list-tokens.js.map +1 -1
- package/dist/commands/login.d.ts +1 -8
- package/dist/commands/login.d.ts.map +1 -1
- package/dist/commands/login.js +12 -30
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/logout.d.ts +4 -5
- package/dist/commands/logout.d.ts.map +1 -1
- package/dist/commands/logout.js +13 -56
- package/dist/commands/logout.js.map +1 -1
- package/dist/config/oauth.d.ts +14 -4
- package/dist/config/oauth.d.ts.map +1 -1
- package/dist/config/oauth.js +40 -19
- package/dist/config/oauth.js.map +1 -1
- package/dist/constants.d.ts +18 -26
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +20 -34
- package/dist/constants.js.map +1 -1
- package/dist/exports/client.d.ts +0 -1
- package/dist/exports/client.d.ts.map +1 -1
- package/dist/exports/client.js +0 -1
- package/dist/exports/client.js.map +1 -1
- package/dist/index.d.ts +1 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -3
- package/dist/index.js.map +1 -1
- package/dist/oauth/components/LoginButton/index.d.ts.map +1 -1
- package/dist/oauth/components/LoginButton/index.js +6 -50
- package/dist/oauth/components/LoginButton/index.js.map +1 -1
- package/dist/oauth/components/LoginButton/index.scss +3 -50
- package/dist/oauth/components/LogoutButton/index.d.ts.map +1 -1
- package/dist/oauth/components/LogoutButton/index.js +4 -5
- package/dist/oauth/components/LogoutButton/index.js.map +1 -1
- package/dist/oauth/defaults.d.ts.map +1 -1
- package/dist/oauth/defaults.js +5 -29
- package/dist/oauth/defaults.js.map +1 -1
- package/dist/oauth/endpoints/getLoginEndpoint.d.ts.map +1 -1
- package/dist/oauth/endpoints/getLoginEndpoint.js +11 -21
- package/dist/oauth/endpoints/getLoginEndpoint.js.map +1 -1
- package/dist/oauth/endpoints/getLogoutEndpoint.d.ts.map +1 -1
- package/dist/oauth/endpoints/getLogoutEndpoint.js +4 -7
- package/dist/oauth/endpoints/getLogoutEndpoint.js.map +1 -1
- package/dist/oauth/index.d.ts.map +1 -1
- package/dist/oauth/index.js +13 -40
- package/dist/oauth/index.js.map +1 -1
- package/dist/oauth/strategy/index.d.ts +2 -0
- package/dist/oauth/strategy/index.d.ts.map +1 -1
- package/dist/oauth/strategy/index.js +15 -38
- package/dist/oauth/strategy/index.js.map +1 -1
- package/dist/oauth/types.d.ts +6 -6
- package/dist/oauth/types.d.ts.map +1 -1
- package/dist/oauth/types.js.map +1 -1
- package/dist/oauth/utilities/createCookieOptions.d.ts.map +1 -1
- package/dist/oauth/utilities/createCookieOptions.js.map +1 -1
- package/dist/oauth/utilities/getAdminPath.d.ts +8 -0
- package/dist/oauth/utilities/getAdminPath.d.ts.map +1 -0
- package/dist/oauth/utilities/getAdminPath.js +9 -0
- package/dist/oauth/utilities/getAdminPath.js.map +1 -0
- package/dist/oauth/utilities/refreshTokens.d.ts.map +1 -1
- package/dist/oauth/utilities/refreshTokens.js +1 -1
- package/dist/oauth/utilities/refreshTokens.js.map +1 -1
- package/dist/plugin/build-config.d.ts +4 -21
- package/dist/plugin/build-config.d.ts.map +1 -1
- package/dist/plugin/build-config.js +7 -113
- package/dist/plugin/build-config.js.map +1 -1
- package/dist/types.d.ts +0 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js.map +1 -1
- package/dist/utils/asset-collection.d.ts +6 -3
- package/dist/utils/asset-collection.d.ts.map +1 -1
- package/dist/utils/asset-collection.js +34 -10
- package/dist/utils/asset-collection.js.map +1 -1
- package/dist/utils/config.js +1 -1
- package/dist/utils/config.js.map +1 -1
- package/dist/utils/env-management.d.ts +8 -9
- package/dist/utils/env-management.d.ts.map +1 -1
- package/dist/utils/env-management.js +74 -73
- package/dist/utils/env-management.js.map +1 -1
- package/dist/utils/formatter.d.ts.map +1 -1
- package/dist/utils/formatter.js +5 -3
- package/dist/utils/formatter.js.map +1 -1
- package/dist/utils/lambda-config.d.ts +1 -3
- package/dist/utils/lambda-config.d.ts.map +1 -1
- package/dist/utils/lambda-config.js +32 -38
- package/dist/utils/lambda-config.js.map +1 -1
- package/dist/utils/messages.js +8 -8
- package/dist/utils/messages.js.map +1 -1
- package/dist/utils/payload-config-ast.d.ts +3 -22
- package/dist/utils/payload-config-ast.d.ts.map +1 -1
- package/dist/utils/payload-config-ast.js +31 -89
- package/dist/utils/payload-config-ast.js.map +1 -1
- package/dist/utils/payload-config-finder.d.ts +2 -2
- package/dist/utils/payload-config-finder.d.ts.map +1 -1
- package/dist/utils/payload-config-finder.js +9 -48
- package/dist/utils/payload-config-finder.js.map +1 -1
- package/dist/utils/payload-config-modifier.d.ts.map +1 -1
- package/dist/utils/payload-config-modifier.js +6 -54
- package/dist/utils/payload-config-modifier.js.map +1 -1
- package/dist/utils/payload-package-check.d.ts +1 -12
- package/dist/utils/payload-package-check.d.ts.map +1 -1
- package/dist/utils/payload-package-check.js +5 -63
- package/dist/utils/payload-package-check.js.map +1 -1
- package/dist/utils/project.d.ts.map +1 -1
- package/dist/utils/project.js +5 -8
- package/dist/utils/project.js.map +1 -1
- package/dist/utils/s3-upload.d.ts +1 -0
- package/dist/utils/s3-upload.d.ts.map +1 -1
- package/dist/utils/s3-upload.js +3 -10
- package/dist/utils/s3-upload.js.map +1 -1
- package/dist/utils/token-display.d.ts.map +1 -1
- package/dist/utils/token-display.js +5 -11
- package/dist/utils/token-display.js.map +1 -1
- package/dist/utils/typescript-validator.d.ts.map +1 -1
- package/dist/utils/typescript-validator.js +6 -4
- package/dist/utils/typescript-validator.js.map +1 -1
- package/package.json +9 -27
- package/dist/commands/build-lambda-zip.d.ts +0 -5
- package/dist/commands/build-lambda-zip.d.ts.map +0 -1
- package/dist/commands/build-lambda-zip.js +0 -19
- package/dist/commands/build-lambda-zip.js.map +0 -1
- package/dist/db-content-api/README.md +0 -98
- package/dist/db-content-api/generated/content-api-types.d.ts +0 -3914
- package/dist/db-content-api/generated/content-api-types.d.ts.map +0 -1
- package/dist/db-content-api/generated/content-api-types.js +0 -7
- package/dist/db-content-api/generated/content-api-types.js.map +0 -1
- package/dist/db-content-api/index.d.ts +0 -18
- package/dist/db-content-api/index.d.ts.map +0 -1
- package/dist/db-content-api/index.js +0 -586
- package/dist/db-content-api/index.js.map +0 -1
- package/dist/db-content-api/temp-utilities/slug.d.ts +0 -2
- package/dist/db-content-api/temp-utilities/slug.d.ts.map +0 -1
- package/dist/db-content-api/temp-utilities/slug.js +0 -3
- package/dist/db-content-api/temp-utilities/slug.js.map +0 -1
- package/dist/db-content-api/temp-utilities/sorting.d.ts +0 -3
- package/dist/db-content-api/temp-utilities/sorting.d.ts.map +0 -1
- package/dist/db-content-api/temp-utilities/sorting.js +0 -32
- package/dist/db-content-api/temp-utilities/sorting.js.map +0 -1
- package/dist/db-content-api/temp-utilities/unwrapDocument.d.ts +0 -34
- package/dist/db-content-api/temp-utilities/unwrapDocument.d.ts.map +0 -1
- package/dist/db-content-api/temp-utilities/unwrapDocument.js +0 -53
- package/dist/db-content-api/temp-utilities/unwrapDocument.js.map +0 -1
- package/dist/db-content-api/utilities/auth.d.ts +0 -30
- package/dist/db-content-api/utilities/auth.d.ts.map +0 -1
- package/dist/db-content-api/utilities/auth.js +0 -81
- package/dist/db-content-api/utilities/auth.js.map +0 -1
- package/dist/db-content-api/utilities/buildPathTypes.d.ts +0 -12
- package/dist/db-content-api/utilities/buildPathTypes.d.ts.map +0 -1
- package/dist/db-content-api/utilities/buildPathTypes.js +0 -157
- package/dist/db-content-api/utilities/buildPathTypes.js.map +0 -1
- package/dist/db-content-api/utilities/data/applyDefaults.d.ts +0 -7
- package/dist/db-content-api/utilities/data/applyDefaults.d.ts.map +0 -1
- package/dist/db-content-api/utilities/data/applyDefaults.js +0 -59
- package/dist/db-content-api/utilities/data/applyDefaults.js.map +0 -1
- package/dist/db-content-api/utilities/data/castFieldValue.d.ts +0 -11
- package/dist/db-content-api/utilities/data/castFieldValue.d.ts.map +0 -1
- package/dist/db-content-api/utilities/data/castFieldValue.js +0 -66
- package/dist/db-content-api/utilities/data/castFieldValue.js.map +0 -1
- package/dist/db-content-api/utilities/data/index.d.ts +0 -32
- package/dist/db-content-api/utilities/data/index.d.ts.map +0 -1
- package/dist/db-content-api/utilities/data/index.js +0 -190
- package/dist/db-content-api/utilities/data/index.js.map +0 -1
- package/dist/db-content-api/utilities/data/removeVirtualFields.d.ts +0 -12
- package/dist/db-content-api/utilities/data/removeVirtualFields.d.ts.map +0 -1
- package/dist/db-content-api/utilities/data/removeVirtualFields.js +0 -54
- package/dist/db-content-api/utilities/data/removeVirtualFields.js.map +0 -1
- package/dist/db-content-api/utilities/data/stripFields.d.ts +0 -48
- package/dist/db-content-api/utilities/data/stripFields.d.ts.map +0 -1
- package/dist/db-content-api/utilities/data/stripFields.js +0 -195
- package/dist/db-content-api/utilities/data/stripFields.js.map +0 -1
- package/dist/db-content-api/utilities/joins.d.ts +0 -55
- package/dist/db-content-api/utilities/joins.d.ts.map +0 -1
- package/dist/db-content-api/utilities/joins.js +0 -136
- package/dist/db-content-api/utilities/joins.js.map +0 -1
- package/dist/db-content-api/utilities/where.d.ts +0 -12
- package/dist/db-content-api/utilities/where.d.ts.map +0 -1
- package/dist/db-content-api/utilities/where.js +0 -121
- package/dist/db-content-api/utilities/where.js.map +0 -1
- package/dist/endpoints/health.d.ts +0 -3
- package/dist/endpoints/health.d.ts.map +0 -1
- package/dist/endpoints/health.js +0 -11
- package/dist/endpoints/health.js.map +0 -1
- package/dist/oauth/utilities/isDuplicateKeyError.d.ts +0 -7
- package/dist/oauth/utilities/isDuplicateKeyError.d.ts.map +0 -1
- package/dist/oauth/utilities/isDuplicateKeyError.js +0 -14
- package/dist/oauth/utilities/isDuplicateKeyError.js.map +0 -1
- package/dist/storage-content-api/api-types.d.ts +0 -168
- package/dist/storage-content-api/api-types.d.ts.map +0 -1
- package/dist/storage-content-api/api-types.js +0 -6
- package/dist/storage-content-api/api-types.js.map +0 -1
- package/dist/storage-content-api/client-uploads/ClientUploadHandler.d.ts +0 -9
- package/dist/storage-content-api/client-uploads/ClientUploadHandler.d.ts.map +0 -1
- package/dist/storage-content-api/client-uploads/ClientUploadHandler.js +0 -42
- package/dist/storage-content-api/client-uploads/ClientUploadHandler.js.map +0 -1
- package/dist/storage-content-api/client-uploads/generateSignedURL.d.ts +0 -13
- package/dist/storage-content-api/client-uploads/generateSignedURL.d.ts.map +0 -1
- package/dist/storage-content-api/client-uploads/generateSignedURL.js +0 -32
- package/dist/storage-content-api/client-uploads/generateSignedURL.js.map +0 -1
- package/dist/storage-content-api/client.d.ts +0 -6
- package/dist/storage-content-api/client.d.ts.map +0 -1
- package/dist/storage-content-api/client.js +0 -36
- package/dist/storage-content-api/client.js.map +0 -1
- package/dist/storage-content-api/generateURL.d.ts +0 -7
- package/dist/storage-content-api/generateURL.d.ts.map +0 -1
- package/dist/storage-content-api/generateURL.js +0 -8
- package/dist/storage-content-api/generateURL.js.map +0 -1
- package/dist/storage-content-api/handleDelete.d.ts +0 -8
- package/dist/storage-content-api/handleDelete.d.ts.map +0 -1
- package/dist/storage-content-api/handleDelete.js +0 -17
- package/dist/storage-content-api/handleDelete.js.map +0 -1
- package/dist/storage-content-api/handleUpload.d.ts +0 -11
- package/dist/storage-content-api/handleUpload.d.ts.map +0 -1
- package/dist/storage-content-api/handleUpload.js +0 -144
- package/dist/storage-content-api/handleUpload.js.map +0 -1
- package/dist/storage-content-api/index.d.ts +0 -5
- package/dist/storage-content-api/index.d.ts.map +0 -1
- package/dist/storage-content-api/index.js +0 -31
- package/dist/storage-content-api/index.js.map +0 -1
- package/dist/storage-content-api/staticHandler.d.ts +0 -10
- package/dist/storage-content-api/staticHandler.d.ts.map +0 -1
- package/dist/storage-content-api/staticHandler.js +0 -56
- package/dist/storage-content-api/staticHandler.js.map +0 -1
- package/dist/storage-content-api/types.d.ts +0 -10
- package/dist/storage-content-api/types.d.ts.map +0 -1
- package/dist/storage-content-api/types.js +0 -3
- package/dist/storage-content-api/types.js.map +0 -1
- package/dist/templates/README.md +0 -19
- package/dist/utils/build-lambda-zip.d.ts +0 -14
- package/dist/utils/build-lambda-zip.d.ts.map +0 -1
- package/dist/utils/build-lambda-zip.js +0 -81
- package/dist/utils/build-lambda-zip.js.map +0 -1
- package/dist/utils/format-env-suffix.d.ts +0 -12
- package/dist/utils/format-env-suffix.d.ts.map +0 -1
- package/dist/utils/format-env-suffix.js +0 -13
- package/dist/utils/format-env-suffix.js.map +0 -1
- package/dist/utils/version-check.d.ts +0 -3
- package/dist/utils/version-check.d.ts.map +0 -1
- package/dist/utils/version-check.js +0 -38
- package/dist/utils/version-check.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/utils/payload-config-modifier.ts"],"sourcesContent":["import pc from 'picocolors'\nimport { Project } from 'ts-morph'\n\nimport type { PackageManager } from './package-manager.js'\n\nimport { formatFile } from './formatter.js'\nimport * as log from './log.js'\nimport {\n addFigmaProperty,\n applyModifications,\n detectRequiredChanges,\n type FigmaPropertyConfig,\n} from './payload-config-ast.js'\nimport { findPayloadConfig } from './payload-config-finder.js'\nimport {\n checkPackageInstalled,\n getPayloadVersion,\n installPackage,\n uninstallPackage,\n} from './payload-package-check.js'\nimport { runTypeScriptCheck } from './typescript-validator.js'\n\nexport type ModificationResult = {\n changes: string[]\n error?: string\n modified: boolean\n success: boolean\n warnings?: string[]\n}\n\n/**\n * Main orchestrator for payload config modification\n * Checks package, detects needed changes, applies modifications\n */\nexport async function ensurePayloadFigmaConfig(\n projectPath: string,\n packageManager: PackageManager,\n figmaConfig?: FigmaPropertyConfig,\n): Promise<ModificationResult> {\n const changes: string[] = []\n const warnings: string[] = []\n let modified = false\n\n try {\n log.debug(`Starting payload config modification for: ${projectPath}`)\n\n // 1. Find config file\n const configPath = await findPayloadConfig(projectPath)\n if (!configPath) {\n log.debug(`Config file not found in: ${projectPath}`)\n return {\n changes: [],\n error: 'payload.config.ts not found in project',\n modified: false,\n success: false,\n }\n }\n\n log.debug(`Found config file: ${configPath}`)\n\n // Get payload version to pin @payloadcms/* dependencies\n const payloadVersion = await getPayloadVersion(projectPath)\n log.debug(`Detected payload version: ${payloadVersion || 'unknown'}`)\n\n // 2. Check/install @payloadcms/figma package\n const isInstalled = await checkPackageInstalled(projectPath, '@payloadcms/figma')\n if (!isInstalled) {\n log.debug('@payloadcms/figma not installed, attempting installation...')\n try {\n await installPackage(projectPath, '@payloadcms/figma', packageManager)\n changes.push('Installed @payloadcms/figma')\n modified = true\n log.debug('@payloadcms/figma installed successfully')\n } catch (error) {\n log.debug(\n `Failed to install @payloadcms/figma: ${error instanceof Error ? error.message : 'Unknown error'}`,\n )\n return {\n changes: [],\n error: 'Failed to install @payloadcms/figma',\n modified: false,\n success: false,\n }\n }\n } else {\n log.debug('@payloadcms/figma already installed')\n }\n\n // 3. Parse config with ts-morph\n log.debug('Parsing config file with ts-morph...')\n const project = new Project({\n skipAddingFilesFromTsConfig: true,\n })\n const sourceFile = project.addSourceFileAtPath(configPath)\n\n // 4. Detect required changes\n log.debug('Detecting required changes...')\n const detection = detectRequiredChanges(sourceFile)\n\n log.debug(\n `Detection results: needsImportChange=${detection.needsImportChange}, hasAlias=${detection.hasAlias}, hasBuildConfig=${detection.hasBuildConfig}`,\n )\n\n // Handle failure modes\n if (detection.hasAlias) {\n log.debug('Config uses import alias (e.g., buildConfig as X)')\n return {\n changes,\n error: 'Config uses import alias - manual modification required',\n modified,\n success: false,\n }\n }\n\n if (detection.hasBuildConfig === false) {\n log.debug('No buildConfig call found in config file')\n return {\n changes,\n error: 'Config structure not recognized (no buildConfig call found)',\n modified,\n success: false,\n }\n }\n\n // 5. Apply modifications\n log.debug('Applying modifications...')\n const modResult = applyModifications(sourceFile, detection)\n if (modResult.modified) {\n changes.push(...modResult.changes)\n modified = true\n\n log.debug(`Applied ${modResult.changes.length} modifications`)\n }\n\n // 6. Add figma property if config provided and doesn't exist\n if (figmaConfig && !detection.figmaObjectExists) {\n log.debug('Adding figma property to buildConfig...')\n const figmaResult = addFigmaProperty(sourceFile, figmaConfig)\n if (figmaResult.modified) {\n changes.push(...figmaResult.changes)\n modified = true\n log.debug(`Added figma property`)\n } else {\n log.debug('Figma property not added (may already exist)')\n }\n } else if (detection.figmaObjectExists) {\n log.debug('Figma property already exists, skipping')\n }\n\n // Save file if any modifications were made\n if (modified) {\n await sourceFile.save()\n log.debug('Config file saved')\n\n // 7. Handle package management\n const packagesToUninstall: string[] = []\n\n // Uninstall db adapter (buildFigmaConfig provides its own)\n if (detection.dbProperty) {\n packagesToUninstall.push(detection.dbProperty.importSource)\n }\n\n // Uninstall sharp (Figma infrastructure handles image processing)\n if (detection.sharpProperty) {\n packagesToUninstall.push('sharp')\n }\n\n // Ensure lexical is installed if user doesn't have a custom editor\n // (buildFigmaConfig uses lexicalEditor() as default)\n if (!detection.editorProperty) {\n log.debug(\n 'No editor property detected - will ensure lexical is installed for default editor',\n )\n } else if (detection.editorProperty.isDefault) {\n log.debug('Default lexicalEditor() detected - will ensure lexical is installed')\n } else {\n log.debug(\n `Custom editor detected (${detection.editorProperty.importSource}) - skipping lexical installation`,\n )\n }\n\n if (!detection.editorProperty || detection.editorProperty.isDefault) {\n log.debug('Checking if @payloadcms/richtext-lexical is installed...')\n const hasLexical = await checkPackageInstalled(projectPath, '@payloadcms/richtext-lexical')\n if (!hasLexical) {\n log.debug('@payloadcms/richtext-lexical not found, installing...')\n try {\n await installPackage(\n projectPath,\n '@payloadcms/richtext-lexical',\n packageManager,\n payloadVersion,\n )\n changes.push('Installed @payloadcms/richtext-lexical (default editor)')\n log.debug('Successfully installed @payloadcms/richtext-lexical')\n } catch (error) {\n log.debug(\n `Failed to install @payloadcms/richtext-lexical: ${error instanceof Error ? error.message : 'Unknown error'}`,\n )\n // Don't fail on install error - user can install manually if needed\n warnings.push(\n 'Could not install @payloadcms/richtext-lexical - you may need to install it manually',\n )\n }\n } else {\n log.debug('@payloadcms/richtext-lexical already installed, skipping')\n }\n }\n\n // Ensure cloud-storage is installed (required peer dependency for buildFigmaConfig)\n log.debug('Checking if @payloadcms/plugin-cloud-storage is installed...')\n const hasCloudStorage = await checkPackageInstalled(\n projectPath,\n '@payloadcms/plugin-cloud-storage',\n )\n if (!hasCloudStorage) {\n log.debug('@payloadcms/plugin-cloud-storage not found, installing...')\n try {\n await installPackage(\n projectPath,\n '@payloadcms/plugin-cloud-storage',\n packageManager,\n payloadVersion,\n )\n changes.push('Installed @payloadcms/plugin-cloud-storage')\n log.debug('Successfully installed @payloadcms/plugin-cloud-storage')\n } catch (error) {\n log.debug(\n `Failed to install @payloadcms/plugin-cloud-storage: ${error instanceof Error ? error.message : 'Unknown error'}`,\n )\n warnings.push(\n 'Could not install @payloadcms/plugin-cloud-storage - you may need to install it manually',\n )\n }\n } else {\n log.debug('@payloadcms/plugin-cloud-storage already installed, skipping')\n }\n\n if (packagesToUninstall.length > 0) {\n log.debug(`Uninstalling ${packagesToUninstall.length} orphaned packages...`)\n }\n\n for (const pkg of packagesToUninstall) {\n try {\n await uninstallPackage(projectPath, pkg, packageManager)\n changes.push(`Uninstalled ${pkg}`)\n log.debug(`Uninstalled ${pkg}`)\n } catch (error) {\n log.debug(\n `Failed to uninstall ${pkg}: ${error instanceof Error ? error.message : 'Unknown error'}`,\n )\n // Don't fail on uninstall errors - orphaned package is better than broken config\n }\n }\n\n // 8. Format file\n log.debug('Formatting config file...')\n const formatResult = await formatFile(configPath, packageManager)\n if (!formatResult.success && formatResult.warning) {\n warnings.push(formatResult.warning)\n log.debug(`Formatting warning: ${formatResult.warning}`)\n }\n\n // 9. Run TypeScript validation\n log.debug('Running TypeScript validation...')\n const tsResult = await runTypeScriptCheck(projectPath, packageManager)\n if (!tsResult.success && tsResult.errors.length > 0) {\n warnings.push(\"TypeScript validation found issues - run 'pnpm build' for details\")\n log.debug(`TypeScript validation found ${tsResult.errors.length} issues`)\n }\n } else {\n log.debug('No modifications needed - config already correct')\n }\n\n log.debug('Payload config modification completed successfully')\n\n return {\n changes,\n modified,\n success: true,\n warnings: warnings.length > 0 ? warnings : undefined,\n }\n } catch (error) {\n log.debug(\n `Unexpected error in ensurePayloadFigmaConfig: ${error instanceof Error ? error.message : 'Unknown error'}`,\n )\n if (error instanceof Error && error.stack) {\n log.debug(`Stack trace: ${error.stack}`)\n }\n return {\n changes,\n error: error instanceof Error ? error.message : 'Unknown error occurred',\n modified,\n success: false,\n }\n }\n}\n\n/**\n * Display manual configuration instructions\n */\nexport function displayManualInstructions(reason: string): void {\n const leftLineWrap = (message: string): string => {\n // Add '┌ ' prefix to first line, '│ ' to subsequent lines, and '└ ' to last line\n return message\n .split(/\\r?\\n/)\n .map((line, index, arr) => {\n if (index === 0) {\n return `${pc.dim('┌ ')}${line}`\n } else if (index === arr.length - 1) {\n return `${pc.dim('└ ')}${line}`\n } else {\n return `${pc.dim('│ ')}${line}`\n }\n })\n .join('\\n')\n }\n\n const message = leftLineWrap(`${pc.cyan(pc.bold('Manual Configuration Required'))}\n\nUnable to automatically modify payload.config.ts\nReason: ${pc.yellow(reason)}\n\n${pc.bold('Required changes:')}\n\n1. Replace buildConfig import:\n ${pc.dim('- FROM: ')}${pc.cyan(\"import { buildConfig } from 'payload'\")}\n ${pc.dim('- TO: ')}${pc.cyan(\"import { buildFigmaConfig } from '@payloadcms/figma'\")}\n\n2. Remove these properties from buildConfig():\n • db\n • secret\n • editor (if using default lexicalEditor())\n\n3. Install package:\n ${pc.cyan('pnpm add @payloadcms/figma')}\n\nThen run: ${pc.cyan('npx @payloadcms/figma init')}`)\n\n // eslint-disable-next-line no-console\n console.log(message)\n}\n"],"names":["pc","Project","formatFile","log","addFigmaProperty","applyModifications","detectRequiredChanges","findPayloadConfig","checkPackageInstalled","getPayloadVersion","installPackage","uninstallPackage","runTypeScriptCheck","ensurePayloadFigmaConfig","projectPath","packageManager","figmaConfig","changes","warnings","modified","debug","configPath","error","success","payloadVersion","isInstalled","push","Error","message","project","skipAddingFilesFromTsConfig","sourceFile","addSourceFileAtPath","detection","needsImportChange","hasAlias","hasBuildConfig","modResult","length","figmaObjectExists","figmaResult","save","packagesToUninstall","dbProperty","importSource","sharpProperty","editorProperty","isDefault","hasLexical","hasCloudStorage","pkg","formatResult","warning","tsResult","errors","undefined","stack","displayManualInstructions","reason","leftLineWrap","split","map","line","index","arr","dim","join","cyan","bold","yellow","console"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../src/utils/payload-config-modifier.ts"],"sourcesContent":["import pc from 'picocolors'\nimport { Project } from 'ts-morph'\n\nimport type { PackageManager } from './package-manager.js'\n\nimport { formatFile } from './formatter.js'\nimport * as log from './log.js'\nimport {\n addFigmaProperty,\n applyModifications,\n detectRequiredChanges,\n type FigmaPropertyConfig,\n} from './payload-config-ast.js'\nimport { findPayloadConfig } from './payload-config-finder.js'\nimport { checkPackageInstalled, installPackage, uninstallPackage } from './payload-package-check.js'\nimport { runTypeScriptCheck } from './typescript-validator.js'\n\nexport type ModificationResult = {\n changes: string[]\n error?: string\n modified: boolean\n success: boolean\n warnings?: string[]\n}\n\n/**\n * Main orchestrator for payload config modification\n * Checks package, detects needed changes, applies modifications\n */\nexport async function ensurePayloadFigmaConfig(\n projectPath: string,\n packageManager: PackageManager,\n figmaConfig?: FigmaPropertyConfig,\n): Promise<ModificationResult> {\n const changes: string[] = []\n const warnings: string[] = []\n let modified = false\n\n try {\n log.debug(`Starting payload config modification for: ${projectPath}`)\n\n // 1. Find config file\n const configPath = await findPayloadConfig(projectPath)\n if (!configPath) {\n log.debug(`Config file not found in: ${projectPath}`)\n return {\n changes: [],\n error: 'payload.config.ts not found in project',\n modified: false,\n success: false,\n }\n }\n\n log.debug(`Found config file: ${configPath}`)\n\n // 2. Check/install @payloadcms/figma package\n const isInstalled = await checkPackageInstalled(projectPath, '@payloadcms/figma')\n if (!isInstalled) {\n log.debug('@payloadcms/figma not installed, attempting installation...')\n try {\n await installPackage(projectPath, '@payloadcms/figma', packageManager)\n changes.push('Installed @payloadcms/figma')\n modified = true\n log.debug('@payloadcms/figma installed successfully')\n } catch (error) {\n log.debug(\n `Failed to install @payloadcms/figma: ${error instanceof Error ? error.message : 'Unknown error'}`,\n )\n return {\n changes: [],\n error: 'Failed to install @payloadcms/figma',\n modified: false,\n success: false,\n }\n }\n } else {\n log.debug('@payloadcms/figma already installed')\n }\n\n // 3. Parse config with ts-morph\n log.debug('Parsing config file with ts-morph...')\n const project = new Project({\n skipAddingFilesFromTsConfig: true,\n })\n const sourceFile = project.addSourceFileAtPath(configPath)\n\n // 4. Detect required changes\n log.debug('Detecting required changes...')\n const detection = detectRequiredChanges(sourceFile)\n\n log.debug(\n `Detection results: needsImportChange=${detection.needsImportChange}, hasAlias=${detection.hasAlias}, hasBuildConfig=${detection.hasBuildConfig}`,\n )\n\n // Handle failure modes\n if (detection.hasAlias) {\n log.debug('Config uses import alias (e.g., buildConfig as X)')\n return {\n changes,\n error: 'Config uses import alias - manual modification required',\n modified,\n success: false,\n }\n }\n\n if (detection.hasBuildConfig === false) {\n log.debug('No buildConfig call found in config file')\n return {\n changes,\n error: 'Config structure not recognized (no buildConfig call found)',\n modified,\n success: false,\n }\n }\n\n // 5. Apply modifications\n log.debug('Applying modifications...')\n const modResult = applyModifications(sourceFile, detection)\n if (modResult.modified) {\n changes.push(...modResult.changes)\n modified = true\n\n log.debug(`Applied ${modResult.changes.length} modifications`)\n }\n\n // 6. Add figma property if config provided and doesn't exist\n if (figmaConfig && !detection.figmaObjectExists) {\n log.debug('Adding figma property to buildConfig...')\n const figmaResult = addFigmaProperty(sourceFile, figmaConfig)\n if (figmaResult.modified) {\n changes.push(...figmaResult.changes)\n modified = true\n log.debug(`Added figma property`)\n } else {\n log.debug('Figma property not added (may already exist)')\n }\n } else if (detection.figmaObjectExists) {\n log.debug('Figma property already exists, skipping')\n }\n\n // Save file if any modifications were made\n if (modified) {\n await sourceFile.save()\n log.debug('Config file saved')\n\n // 7. Uninstall orphaned packages\n const packagesToUninstall: string[] = []\n\n if (detection.dbProperty) {\n packagesToUninstall.push(detection.dbProperty.importSource)\n }\n\n if (detection.editorProperty?.isDefault) {\n packagesToUninstall.push(detection.editorProperty.importSource)\n }\n\n if (packagesToUninstall.length > 0) {\n log.debug(`Uninstalling ${packagesToUninstall.length} orphaned packages...`)\n }\n\n for (const pkg of packagesToUninstall) {\n try {\n await uninstallPackage(projectPath, pkg, packageManager)\n changes.push(`Uninstalled ${pkg}`)\n log.debug(`Uninstalled ${pkg}`)\n } catch (error) {\n log.debug(\n `Failed to uninstall ${pkg}: ${error instanceof Error ? error.message : 'Unknown error'}`,\n )\n // Don't fail on uninstall errors - orphaned package is better than broken config\n }\n }\n\n // 8. Format file\n log.debug('Formatting config file...')\n const formatResult = await formatFile(configPath, packageManager)\n if (!formatResult.success && formatResult.warning) {\n warnings.push(formatResult.warning)\n log.debug(`Formatting warning: ${formatResult.warning}`)\n }\n\n // 9. Run TypeScript validation\n log.debug('Running TypeScript validation...')\n const tsResult = await runTypeScriptCheck(projectPath, packageManager)\n if (!tsResult.success && tsResult.errors.length > 0) {\n warnings.push(\"TypeScript validation found issues - run 'pnpm build' for details\")\n log.debug(`TypeScript validation found ${tsResult.errors.length} issues`)\n }\n } else {\n log.debug('No modifications needed - config already correct')\n }\n\n log.debug('Payload config modification completed successfully')\n\n return {\n changes,\n modified,\n success: true,\n warnings: warnings.length > 0 ? warnings : undefined,\n }\n } catch (error) {\n log.debug(\n `Unexpected error in ensurePayloadFigmaConfig: ${error instanceof Error ? error.message : 'Unknown error'}`,\n )\n if (error instanceof Error && error.stack) {\n log.debug(`Stack trace: ${error.stack}`)\n }\n return {\n changes,\n error: error instanceof Error ? error.message : 'Unknown error occurred',\n modified,\n success: false,\n }\n }\n}\n\n/**\n * Display manual configuration instructions\n */\nexport function displayManualInstructions(reason: string): void {\n const leftLineWrap = (message: string): string => {\n // Add '┌ ' prefix to first line, '│ ' to subsequent lines, and '└ ' to last line\n return message\n .split('\\n')\n .map((line, index, arr) => {\n if (index === 0) {\n return `${pc.dim('┌ ')}${line}`\n } else if (index === arr.length - 1) {\n return `${pc.dim('└ ')}${line}`\n } else {\n return `${pc.dim('│ ')}${line}`\n }\n })\n .join('\\n')\n }\n\n const message = leftLineWrap(`${pc.cyan(pc.bold('Manual Configuration Required'))}\n\nUnable to automatically modify payload.config.ts\nReason: ${pc.yellow(reason)}\n\n${pc.bold('Required changes:')}\n\n1. Replace buildConfig import:\n ${pc.dim('- FROM: ')}${pc.cyan(\"import { buildConfig } from 'payload'\")}\n ${pc.dim('- TO: ')}${pc.cyan(\"import { buildConfig } from '@payloadcms/figma'\")}\n\n2. Remove these properties from buildConfig():\n • db\n • secret\n • editor (if using default lexicalEditor())\n\n3. Install package:\n ${pc.cyan('pnpm add @payloadcms/figma')}\n\nThen run: ${pc.cyan('npx @payloadcms/figma init')}`)\n\n // eslint-disable-next-line no-console\n console.log(message)\n}\n"],"names":["pc","Project","formatFile","log","addFigmaProperty","applyModifications","detectRequiredChanges","findPayloadConfig","checkPackageInstalled","installPackage","uninstallPackage","runTypeScriptCheck","ensurePayloadFigmaConfig","projectPath","packageManager","figmaConfig","changes","warnings","modified","debug","configPath","error","success","isInstalled","push","Error","message","project","skipAddingFilesFromTsConfig","sourceFile","addSourceFileAtPath","detection","needsImportChange","hasAlias","hasBuildConfig","modResult","length","figmaObjectExists","figmaResult","save","packagesToUninstall","dbProperty","importSource","editorProperty","isDefault","pkg","formatResult","warning","tsResult","errors","undefined","stack","displayManualInstructions","reason","leftLineWrap","split","map","line","index","arr","dim","join","cyan","bold","yellow","console"],"mappings":"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"}
|
|
@@ -3,24 +3,13 @@ import type { PackageManager } from './package-manager.js';
|
|
|
3
3
|
* Check if a package is installed in dependencies (not devDependencies)
|
|
4
4
|
*/
|
|
5
5
|
export declare function checkPackageInstalled(projectPath: string, packageName: string): Promise<boolean>;
|
|
6
|
-
/**
|
|
7
|
-
* Get the payload version from project's package.json (without range specifiers)
|
|
8
|
-
* Returns the clean version number (e.g., "3.71.1") or undefined if not found
|
|
9
|
-
*/
|
|
10
|
-
export declare function getPayloadVersion(projectPath: string): Promise<string | undefined>;
|
|
11
6
|
/**
|
|
12
7
|
* Install a package as a production dependency
|
|
13
|
-
* @param version - Version to install (without caret). Defaults to 'latest'.
|
|
14
8
|
*/
|
|
15
|
-
export declare function installPackage(projectPath: string, packageName: string, packageManager: PackageManager
|
|
9
|
+
export declare function installPackage(projectPath: string, packageName: string, packageManager: PackageManager): Promise<void>;
|
|
16
10
|
/**
|
|
17
11
|
* Uninstall a package
|
|
18
12
|
* Does not throw on failure - orphaned package is better than broken config
|
|
19
13
|
*/
|
|
20
14
|
export declare function uninstallPackage(projectPath: string, packageName: string, packageManager: PackageManager): Promise<void>;
|
|
21
|
-
/**
|
|
22
|
-
* Run an npm script from package.json
|
|
23
|
-
* Does not throw on failure - logs warning and continues
|
|
24
|
-
*/
|
|
25
|
-
export declare function runScript(projectPath: string, scriptName: string, packageManager: PackageManager): Promise<boolean>;
|
|
26
15
|
//# sourceMappingURL=payload-package-check.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payload-package-check.d.ts","sourceRoot":"","sources":["../../src/utils/payload-package-check.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAI1D;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC,CAelB;AAED
|
|
1
|
+
{"version":3,"file":"payload-package-check.d.ts","sourceRoot":"","sources":["../../src/utils/payload-package-check.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAI1D;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC,CAelB;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,IAAI,CAAC,CA6Cf;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,IAAI,CAAC,CA4Bf"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import spawn from '
|
|
1
|
+
import { spawn } from 'child_process';
|
|
2
2
|
import fs from 'fs/promises';
|
|
3
3
|
import path from 'path';
|
|
4
4
|
import * as log from './log.js';
|
|
@@ -18,34 +18,14 @@ import * as log from './log.js';
|
|
|
18
18
|
return false;
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
|
-
/**
|
|
22
|
-
* Get the payload version from project's package.json (without range specifiers)
|
|
23
|
-
* Returns the clean version number (e.g., "3.71.1") or undefined if not found
|
|
24
|
-
*/ export async function getPayloadVersion(projectPath) {
|
|
25
|
-
try {
|
|
26
|
-
const pkgJsonPath = path.join(projectPath, 'package.json');
|
|
27
|
-
const pkgJsonContent = await fs.readFile(pkgJsonPath, 'utf-8');
|
|
28
|
-
const pkgJson = JSON.parse(pkgJsonContent);
|
|
29
|
-
const rawVersion = pkgJson.dependencies?.payload || pkgJson.devDependencies?.payload;
|
|
30
|
-
if (!rawVersion) {
|
|
31
|
-
return undefined;
|
|
32
|
-
}
|
|
33
|
-
// Strip range specifiers (^, ~, >=, etc.) to get clean version
|
|
34
|
-
return rawVersion.replace(/^[\^~>=<]+/, '');
|
|
35
|
-
} catch {
|
|
36
|
-
return undefined;
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
21
|
/**
|
|
40
22
|
* Install a package as a production dependency
|
|
41
|
-
|
|
42
|
-
*/ export async function installPackage(projectPath, packageName, packageManager, version = 'latest') {
|
|
23
|
+
*/ export async function installPackage(projectPath, packageName, packageManager) {
|
|
43
24
|
return new Promise((resolve, reject)=>{
|
|
44
25
|
const command = packageManager;
|
|
45
|
-
const packageSpec = `${packageName}@${version}`;
|
|
46
26
|
const args = [
|
|
47
27
|
'add',
|
|
48
|
-
|
|
28
|
+
packageName
|
|
49
29
|
];
|
|
50
30
|
// npm uses 'install' instead of 'add'
|
|
51
31
|
if (packageManager === 'npm') {
|
|
@@ -55,6 +35,7 @@ import * as log from './log.js';
|
|
|
55
35
|
let stderr = '';
|
|
56
36
|
const child = spawn(command, args, {
|
|
57
37
|
cwd: projectPath,
|
|
38
|
+
shell: true,
|
|
58
39
|
stdio: 'pipe'
|
|
59
40
|
});
|
|
60
41
|
// Capture stderr for debug logging
|
|
@@ -98,6 +79,7 @@ import * as log from './log.js';
|
|
|
98
79
|
log.debug(`Running: ${command} ${args.join(' ')} in ${projectPath}`);
|
|
99
80
|
const child = spawn(command, args, {
|
|
100
81
|
cwd: projectPath,
|
|
82
|
+
shell: true,
|
|
101
83
|
stdio: 'pipe'
|
|
102
84
|
});
|
|
103
85
|
child.on('close', (code)=>{
|
|
@@ -111,45 +93,5 @@ import * as log from './log.js';
|
|
|
111
93
|
});
|
|
112
94
|
});
|
|
113
95
|
}
|
|
114
|
-
/**
|
|
115
|
-
* Run an npm script from package.json
|
|
116
|
-
* Does not throw on failure - logs warning and continues
|
|
117
|
-
*/ export async function runScript(projectPath, scriptName, packageManager) {
|
|
118
|
-
return new Promise((resolve)=>{
|
|
119
|
-
const command = packageManager;
|
|
120
|
-
// yarn doesn't need 'run' prefix, but it works with it too
|
|
121
|
-
const args = [
|
|
122
|
-
'run',
|
|
123
|
-
scriptName
|
|
124
|
-
];
|
|
125
|
-
log.debug(`Running script: ${command} ${args.join(' ')} in ${projectPath}`);
|
|
126
|
-
let stderr = '';
|
|
127
|
-
const child = spawn(command, args, {
|
|
128
|
-
cwd: projectPath,
|
|
129
|
-
stdio: 'pipe'
|
|
130
|
-
});
|
|
131
|
-
if (child.stderr) {
|
|
132
|
-
child.stderr.on('data', (data)=>{
|
|
133
|
-
stderr += data.toString();
|
|
134
|
-
});
|
|
135
|
-
}
|
|
136
|
-
child.on('error', (error)=>{
|
|
137
|
-
log.debug(`Failed to run script ${scriptName}: ${error.message}`);
|
|
138
|
-
resolve(false);
|
|
139
|
-
});
|
|
140
|
-
child.on('close', (code)=>{
|
|
141
|
-
if (code === 0) {
|
|
142
|
-
log.debug(`Successfully ran script: ${scriptName}`);
|
|
143
|
-
resolve(true);
|
|
144
|
-
} else {
|
|
145
|
-
log.debug(`Script ${scriptName} failed (exit code: ${code})`);
|
|
146
|
-
if (stderr) {
|
|
147
|
-
log.debug(`stderr: ${stderr}`);
|
|
148
|
-
}
|
|
149
|
-
resolve(false);
|
|
150
|
-
}
|
|
151
|
-
});
|
|
152
|
-
});
|
|
153
|
-
}
|
|
154
96
|
|
|
155
97
|
//# sourceMappingURL=payload-package-check.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/utils/payload-package-check.ts"],"sourcesContent":["import spawn from '
|
|
1
|
+
{"version":3,"sources":["../../src/utils/payload-package-check.ts"],"sourcesContent":["import { spawn } from 'child_process'\nimport fs from 'fs/promises'\nimport path from 'path'\n\nimport type { PackageManager } from './package-manager.js'\n\nimport * as log from './log.js'\n\n/**\n * Check if a package is installed in dependencies (not devDependencies)\n */\nexport async function checkPackageInstalled(\n projectPath: string,\n packageName: string,\n): Promise<boolean> {\n try {\n const pkgJsonPath = path.join(projectPath, 'package.json')\n log.debug(`Checking if ${packageName} is installed in: ${pkgJsonPath}`)\n const pkgJsonContent = await fs.readFile(pkgJsonPath, 'utf-8')\n const pkgJson = JSON.parse(pkgJsonContent)\n const isInstalled = !!pkgJson.dependencies?.[packageName]\n log.debug(`${packageName} is ${isInstalled ? 'installed' : 'not installed'}`)\n return isInstalled\n } catch (error) {\n log.debug(\n `Error checking package installation: ${error instanceof Error ? error.message : 'Unknown error'}`,\n )\n return false\n }\n}\n\n/**\n * Install a package as a production dependency\n */\nexport async function installPackage(\n projectPath: string,\n packageName: string,\n packageManager: PackageManager,\n): Promise<void> {\n return new Promise((resolve, reject) => {\n const command = packageManager\n const args = ['add', packageName]\n\n // npm uses 'install' instead of 'add'\n if (packageManager === 'npm') {\n args[0] = 'install'\n }\n\n log.debug(`Running: ${command} ${args.join(' ')} in ${projectPath}`)\n\n let stderr = ''\n\n const child = spawn(command, args, {\n cwd: projectPath,\n shell: true,\n stdio: 'pipe',\n })\n\n // Capture stderr for debug logging\n if (child.stderr) {\n child.stderr.on('data', (data) => {\n stderr += data.toString()\n })\n }\n\n child.on('error', (error) => {\n log.debug(`Spawn error for ${command}: ${error.message}`)\n reject(new Error(`Failed to spawn ${command}: ${error.message}`))\n })\n\n child.on('close', (code) => {\n if (code === 0) {\n log.debug(`Successfully installed ${packageName}`)\n resolve()\n } else {\n log.debug(`Failed to install ${packageName} (exit code: ${code})`)\n if (stderr) {\n log.debug(`stderr: ${stderr}`)\n }\n reject(new Error(`Failed to install ${packageName}`))\n }\n })\n })\n}\n\n/**\n * Uninstall a package\n * Does not throw on failure - orphaned package is better than broken config\n */\nexport async function uninstallPackage(\n projectPath: string,\n packageName: string,\n packageManager: PackageManager,\n): Promise<void> {\n return new Promise((resolve) => {\n const command = packageManager\n const args = ['remove', packageName]\n\n // npm uses 'uninstall' instead of 'remove'\n if (packageManager === 'npm') {\n args[0] = 'uninstall'\n }\n\n log.debug(`Running: ${command} ${args.join(' ')} in ${projectPath}`)\n\n const child = spawn(command, args, {\n cwd: projectPath,\n shell: true,\n stdio: 'pipe',\n })\n\n child.on('close', (code) => {\n if (code === 0) {\n log.debug(`Successfully uninstalled ${packageName}`)\n } else {\n log.debug(`Failed to uninstall ${packageName} (exit code: ${code}), continuing anyway`)\n }\n // Always resolve, even on error\n resolve()\n })\n })\n}\n"],"names":["spawn","fs","path","log","checkPackageInstalled","projectPath","packageName","pkgJsonPath","join","debug","pkgJsonContent","readFile","pkgJson","JSON","parse","isInstalled","dependencies","error","Error","message","installPackage","packageManager","Promise","resolve","reject","command","args","stderr","child","cwd","shell","stdio","on","data","toString","code","uninstallPackage"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../src/utils/project.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../src/utils/project.ts"],"names":[],"mappings":"AAAA;;GAEG;AAMH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAQrD;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACxC,WAAW,GAAE,MAAsB,GAClC,OAAO,CAAC,WAAW,CAAC,CAwCtB;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAS/D;AAiED;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA0C7F;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAE3D;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,MAAM,EACnB,cAAc,GAAE,KAAK,GAAG,MAAM,GAAG,MAAc,GAC9C,OAAO,CAAC,IAAI,CAAC,CAsCf;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAenF;AAED;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CAAC,WAAW,GAAE,MAAsB,GAAG,OAAO,CAAC,OAAO,CAAC,CAQhG"}
|
package/dist/utils/project.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Project detection and scaffolding utilities
|
|
3
|
-
*/ import spawn from '
|
|
3
|
+
*/ import { spawn } from 'child_process';
|
|
4
4
|
import fs from 'fs/promises';
|
|
5
5
|
import path from 'path';
|
|
6
|
-
import { fileURLToPath } from 'url';
|
|
7
6
|
import { ensureGitignore } from './config.js';
|
|
8
7
|
import { downloadTemplateFromGitHub } from './download-template.js';
|
|
8
|
+
import { manageEnvFiles } from './env-management.js';
|
|
9
9
|
import { tryInitRepoAndCommit } from './git.js';
|
|
10
10
|
import { applyLambdaModifications } from './lambda-config.js';
|
|
11
11
|
/**
|
|
@@ -151,18 +151,14 @@ import { applyLambdaModifications } from './lambda-config.js';
|
|
|
151
151
|
// Replace workspace:* versions with actual versions
|
|
152
152
|
replaceWorkspaceVersions(packageJson, latestVersion);
|
|
153
153
|
await fs.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n', 'utf-8');
|
|
154
|
+
// Manage environment files (generate PAYLOAD_SECRET)
|
|
155
|
+
await manageEnvFiles(projectPath);
|
|
154
156
|
// Ensure .gitignore has required entries
|
|
155
|
-
// Note: .env file is created by init command with FIGMA_CONTENT_SYSTEM_ID
|
|
156
157
|
await ensureGitignore(projectPath, [
|
|
157
158
|
'.env',
|
|
158
159
|
'.env.local',
|
|
159
160
|
'lambda.zip'
|
|
160
161
|
]);
|
|
161
|
-
// Replace README with Figma-specific version
|
|
162
|
-
const readmeTemplatePath = fileURLToPath(new URL('../templates/README.md', import.meta.url));
|
|
163
|
-
let readmeContent = await fs.readFile(readmeTemplatePath, 'utf-8');
|
|
164
|
-
readmeContent = readmeContent.replace(/\{\{PROJECT_NAME\}\}/g, projectName);
|
|
165
|
-
await fs.writeFile(path.join(projectPath, 'README.md'), readmeContent, 'utf-8');
|
|
166
162
|
}
|
|
167
163
|
/**
|
|
168
164
|
* Initialize git repository after all setup is complete
|
|
@@ -185,6 +181,7 @@ import { applyLambdaModifications } from './lambda-config.js';
|
|
|
185
181
|
'install'
|
|
186
182
|
], {
|
|
187
183
|
cwd: projectPath,
|
|
184
|
+
shell: true,
|
|
188
185
|
stdio: 'pipe'
|
|
189
186
|
});
|
|
190
187
|
let stdout = '';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/utils/project.ts"],"sourcesContent":["/**\n * Project detection and scaffolding utilities\n */\n\nimport spawn from 'cross-spawn'\nimport fs from 'fs/promises'\nimport path from 'path'\nimport { fileURLToPath } from 'url'\n\nimport type { ProjectInfo } from '../types/config.js'\n\nimport { ensureGitignore } from './config.js'\nimport { downloadTemplateFromGitHub } from './download-template.js'\nimport { tryInitRepoAndCommit } from './git.js'\nimport { applyLambdaModifications } from './lambda-config.js'\n\n/**\n * Detect if current directory has a Payload project\n *\n * @param projectPath - Path to check (defaults to cwd)\n * @returns Project information\n */\nexport async function detectPayloadProject(\n projectPath: string = process.cwd(),\n): Promise<ProjectInfo> {\n const packageJsonPath = path.join(projectPath, 'package.json')\n\n try {\n const content = await fs.readFile(packageJsonPath, 'utf-8')\n const packageJson = JSON.parse(content)\n\n // Check for payload in dependencies or devDependencies\n const payloadVersion = packageJson.dependencies?.payload || packageJson.devDependencies?.payload\n\n // Detect package manager\n let packageManager: 'npm' | 'pnpm' | 'yarn' = 'npm'\n try {\n await fs.access(path.join(projectPath, 'pnpm-lock.yaml'))\n packageManager = 'pnpm'\n } catch {\n try {\n await fs.access(path.join(projectPath, 'yarn.lock'))\n packageManager = 'yarn'\n } catch {\n packageManager = 'npm'\n }\n }\n\n return {\n hasPayload: !!payloadVersion,\n packageManager,\n path: projectPath,\n payloadVersion: payloadVersion || undefined,\n }\n } catch (error) {\n if ((error as NodeJS.ErrnoException).code === 'ENOENT') {\n // No package.json found\n return {\n hasPayload: false,\n path: projectPath,\n }\n }\n throw new Error(`Failed to read package.json: ${(error as Error).message}`)\n }\n}\n\n/**\n * Validate Payload version (must be 3.x)\n *\n * @param version - Version string from package.json\n * @returns True if version is valid\n */\nexport function validatePayloadVersion(version: string): boolean {\n // Extract major version (handle ^3.0.0, ~3.0.0, 3.0.0, etc.)\n const match = version.match(/(\\d+)/)\n if (!match) {\n return false\n }\n\n const majorVersion = parseInt(match[1], 10)\n return majorVersion === 3\n}\n\n/**\n * Fetch the latest version of a package from npm registry\n *\n * @param packageName - Package name to fetch version for\n * @returns Latest version string\n */\nasync function getLatestPackageVersion(packageName: string): Promise<string> {\n const response = await fetch(`https://registry.npmjs.org/-/package/${packageName}/dist-tags`)\n\n if (!response.ok) {\n throw new Error(`Failed to fetch version for ${packageName}: ${response.statusText}`)\n }\n\n const data = (await response.json()) as Record<string, unknown>\n\n if (typeof data.latest !== 'string') {\n throw new Error(`Invalid version data received for ${packageName}`)\n }\n\n return data.latest\n}\n\n/**\n * Replace workspace versions in package.json with actual versions\n *\n * @param packageJson - Package JSON object to update\n * @param latestVersion - Latest Payload version to use\n */\nfunction replaceWorkspaceVersions(\n packageJson: Record<string, unknown>,\n latestVersion: string,\n): void {\n const deps = packageJson.dependencies as Record<string, string> | undefined\n if (!deps) {\n return\n }\n\n for (const [key, value] of Object.entries(deps)) {\n // Replace workspace:* or workspace:^ with actual version\n if (typeof value === 'string' && value.startsWith('workspace:')) {\n deps[key] = latestVersion\n }\n // Ensure all payload packages use the same version\n else if (key === 'payload' || key.startsWith('@payloadcms/')) {\n deps[key] = latestVersion\n }\n }\n\n // Also handle devDependencies if present\n const devDeps = packageJson.devDependencies as Record<string, string> | undefined\n if (!devDeps) {\n return\n }\n\n for (const [key, value] of Object.entries(devDeps)) {\n if (typeof value === 'string' && value.startsWith('workspace:')) {\n devDeps[key] = latestVersion\n } else if (key === 'payload' || key.startsWith('@payloadcms/')) {\n devDeps[key] = latestVersion\n }\n }\n}\n\n/**\n * Scaffold a new Payload project from GitHub template\n *\n * @param projectPath - Path where to create the project\n * @param projectName - Name for the project\n */\nexport async function scaffoldProject(projectPath: string, projectName: string): Promise<void> {\n // Create project directory if it doesn't exist\n await fs.mkdir(projectPath, { recursive: true })\n\n // Download template from GitHub\n await downloadTemplateFromGitHub(projectPath)\n\n // Apply Lambda modifications BEFORE updating package.json\n // This ensures we don't overwrite version replacements\n await applyLambdaModifications(projectPath)\n\n // Get latest Payload version from npm\n const latestVersion = await getLatestPackageVersion('payload')\n\n // Delete any existing lock files from template (they reference workspace:* versions)\n // This ensures pnpm install creates a fresh lock file with actual versions\n const lockFiles = ['pnpm-lock.yaml', 'yarn.lock', 'package-lock.json']\n for (const lockFile of lockFiles) {\n try {\n await fs.unlink(path.join(projectPath, lockFile))\n } catch {\n // File doesn't exist, ignore\n }\n }\n\n // Update package.json: set name, replace workspace versions\n // This must come AFTER applyLambdaModifications to ensure we have final versions\n const packageJsonPath = path.join(projectPath, 'package.json')\n const packageJsonContent = await fs.readFile(packageJsonPath, 'utf-8')\n const packageJson = JSON.parse(packageJsonContent) as Record<string, unknown>\n packageJson.name = projectName\n\n // Replace workspace:* versions with actual versions\n replaceWorkspaceVersions(packageJson, latestVersion)\n\n await fs.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\\n', 'utf-8')\n\n // Ensure .gitignore has required entries\n // Note: .env file is created by init command with FIGMA_CONTENT_SYSTEM_ID\n await ensureGitignore(projectPath, ['.env', '.env.local', 'lambda.zip'])\n\n // Replace README with Figma-specific version\n const readmeTemplatePath = fileURLToPath(new URL('../templates/README.md', import.meta.url))\n let readmeContent = await fs.readFile(readmeTemplatePath, 'utf-8')\n readmeContent = readmeContent.replace(/\\{\\{PROJECT_NAME\\}\\}/g, projectName)\n await fs.writeFile(path.join(projectPath, 'README.md'), readmeContent, 'utf-8')\n}\n\n/**\n * Initialize git repository after all setup is complete\n *\n * This should be called AFTER installDependencies so that lock files are included\n *\n * @param projectPath - Path to project directory\n */\nexport function initializeGitRepo(projectPath: string): void {\n tryInitRepoAndCommit(projectPath)\n}\n\n/**\n * Install dependencies using the detected package manager\n *\n * @param projectPath - Path to project\n * @param packageManager - Package manager to use\n * @returns Promise that resolves when installation completes\n */\nexport async function installDependencies(\n projectPath: string,\n packageManager: 'npm' | 'pnpm' | 'yarn' = 'npm',\n): Promise<void> {\n return new Promise((resolve, reject) => {\n const child = spawn(packageManager, ['install'], {\n cwd: projectPath,\n stdio: 'pipe',\n })\n\n let stdout = ''\n let stderr = ''\n\n // Capture stdout\n child.stdout?.on('data', (data) => {\n stdout += data.toString()\n })\n\n // Capture stderr\n child.stderr?.on('data', (data) => {\n stderr += data.toString()\n })\n\n child.on('close', (code) => {\n if (code === 0) {\n resolve()\n } else {\n // Show captured output on error\n const output = [stdout, stderr].filter(Boolean).join('\\n\\n')\n const errorMessage = output\n ? `${packageManager} install failed with code ${code}\\n\\nOutput:\\n${output}`\n : `${packageManager} install failed with code ${code}`\n reject(new Error(errorMessage))\n }\n })\n\n child.on('error', (error) => {\n reject(new Error(`Failed to run ${packageManager} install: ${error.message}`))\n })\n })\n}\n\n/**\n * Check if required dependencies are installed\n *\n * @param projectPath - Path to project\n * @returns True if all required dependencies exist\n */\nexport async function hasRequiredDependencies(projectPath: string): Promise<boolean> {\n const packageJsonPath = path.join(projectPath, 'package.json')\n\n try {\n const content = await fs.readFile(packageJsonPath, 'utf-8')\n const packageJson = JSON.parse(content)\n\n // Check for Payload and Next.js\n const hasPayload = packageJson.dependencies?.payload || packageJson.devDependencies?.payload\n const hasNext = packageJson.dependencies?.next || packageJson.devDependencies?.next\n\n return !!(hasPayload && hasNext)\n } catch {\n return false\n }\n}\n\n/**\n * Check if current directory is a project directory\n *\n * A project directory has package.json\n *\n * @param projectPath - Path to check (defaults to cwd)\n * @returns True if in project directory\n */\nexport async function isInProjectDirectory(projectPath: string = process.cwd()): Promise<boolean> {\n try {\n // Check for package.json\n await fs.access(path.join(projectPath, 'package.json'))\n return true\n } catch {\n return false\n }\n}\n"],"names":["spawn","fs","path","fileURLToPath","ensureGitignore","downloadTemplateFromGitHub","tryInitRepoAndCommit","applyLambdaModifications","detectPayloadProject","projectPath","process","cwd","packageJsonPath","join","content","readFile","packageJson","JSON","parse","payloadVersion","dependencies","payload","devDependencies","packageManager","access","hasPayload","undefined","error","code","Error","message","validatePayloadVersion","version","match","majorVersion","parseInt","getLatestPackageVersion","packageName","response","fetch","ok","statusText","data","json","latest","replaceWorkspaceVersions","latestVersion","deps","key","value","Object","entries","startsWith","devDeps","scaffoldProject","projectName","mkdir","recursive","lockFiles","lockFile","unlink","packageJsonContent","name","writeFile","stringify","readmeTemplatePath","URL","url","readmeContent","replace","initializeGitRepo","installDependencies","Promise","resolve","reject","child","stdio","stdout","stderr","on","toString","output","filter","Boolean","errorMessage","hasRequiredDependencies","hasNext","next","isInProjectDirectory"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../src/utils/project.ts"],"sourcesContent":["/**\n * Project detection and scaffolding utilities\n */\n\nimport { spawn } from 'child_process'\nimport fs from 'fs/promises'\nimport path from 'path'\n\nimport type { ProjectInfo } from '../types/config.js'\n\nimport { ensureGitignore } from './config.js'\nimport { downloadTemplateFromGitHub } from './download-template.js'\nimport { manageEnvFiles } from './env-management.js'\nimport { tryInitRepoAndCommit } from './git.js'\nimport { applyLambdaModifications } from './lambda-config.js'\n\n/**\n * Detect if current directory has a Payload project\n *\n * @param projectPath - Path to check (defaults to cwd)\n * @returns Project information\n */\nexport async function detectPayloadProject(\n projectPath: string = process.cwd(),\n): Promise<ProjectInfo> {\n const packageJsonPath = path.join(projectPath, 'package.json')\n\n try {\n const content = await fs.readFile(packageJsonPath, 'utf-8')\n const packageJson = JSON.parse(content)\n\n // Check for payload in dependencies or devDependencies\n const payloadVersion = packageJson.dependencies?.payload || packageJson.devDependencies?.payload\n\n // Detect package manager\n let packageManager: 'npm' | 'pnpm' | 'yarn' = 'npm'\n try {\n await fs.access(path.join(projectPath, 'pnpm-lock.yaml'))\n packageManager = 'pnpm'\n } catch {\n try {\n await fs.access(path.join(projectPath, 'yarn.lock'))\n packageManager = 'yarn'\n } catch {\n packageManager = 'npm'\n }\n }\n\n return {\n hasPayload: !!payloadVersion,\n packageManager,\n path: projectPath,\n payloadVersion: payloadVersion || undefined,\n }\n } catch (error) {\n if ((error as NodeJS.ErrnoException).code === 'ENOENT') {\n // No package.json found\n return {\n hasPayload: false,\n path: projectPath,\n }\n }\n throw new Error(`Failed to read package.json: ${(error as Error).message}`)\n }\n}\n\n/**\n * Validate Payload version (must be 3.x)\n *\n * @param version - Version string from package.json\n * @returns True if version is valid\n */\nexport function validatePayloadVersion(version: string): boolean {\n // Extract major version (handle ^3.0.0, ~3.0.0, 3.0.0, etc.)\n const match = version.match(/(\\d+)/)\n if (!match) {\n return false\n }\n\n const majorVersion = parseInt(match[1], 10)\n return majorVersion === 3\n}\n\n/**\n * Fetch the latest version of a package from npm registry\n *\n * @param packageName - Package name to fetch version for\n * @returns Latest version string\n */\nasync function getLatestPackageVersion(packageName: string): Promise<string> {\n const response = await fetch(`https://registry.npmjs.org/-/package/${packageName}/dist-tags`)\n\n if (!response.ok) {\n throw new Error(`Failed to fetch version for ${packageName}: ${response.statusText}`)\n }\n\n const data = (await response.json()) as Record<string, unknown>\n\n if (typeof data.latest !== 'string') {\n throw new Error(`Invalid version data received for ${packageName}`)\n }\n\n return data.latest\n}\n\n/**\n * Replace workspace versions in package.json with actual versions\n *\n * @param packageJson - Package JSON object to update\n * @param latestVersion - Latest Payload version to use\n */\nfunction replaceWorkspaceVersions(\n packageJson: Record<string, unknown>,\n latestVersion: string,\n): void {\n const deps = packageJson.dependencies as Record<string, string> | undefined\n if (!deps) {\n return\n }\n\n for (const [key, value] of Object.entries(deps)) {\n // Replace workspace:* or workspace:^ with actual version\n if (typeof value === 'string' && value.startsWith('workspace:')) {\n deps[key] = latestVersion\n }\n // Ensure all payload packages use the same version\n else if (key === 'payload' || key.startsWith('@payloadcms/')) {\n deps[key] = latestVersion\n }\n }\n\n // Also handle devDependencies if present\n const devDeps = packageJson.devDependencies as Record<string, string> | undefined\n if (!devDeps) {\n return\n }\n\n for (const [key, value] of Object.entries(devDeps)) {\n if (typeof value === 'string' && value.startsWith('workspace:')) {\n devDeps[key] = latestVersion\n } else if (key === 'payload' || key.startsWith('@payloadcms/')) {\n devDeps[key] = latestVersion\n }\n }\n}\n\n/**\n * Scaffold a new Payload project from GitHub template\n *\n * @param projectPath - Path where to create the project\n * @param projectName - Name for the project\n */\nexport async function scaffoldProject(projectPath: string, projectName: string): Promise<void> {\n // Create project directory if it doesn't exist\n await fs.mkdir(projectPath, { recursive: true })\n\n // Download template from GitHub\n await downloadTemplateFromGitHub(projectPath)\n\n // Apply Lambda modifications BEFORE updating package.json\n // This ensures we don't overwrite version replacements\n await applyLambdaModifications(projectPath)\n\n // Get latest Payload version from npm\n const latestVersion = await getLatestPackageVersion('payload')\n\n // Delete any existing lock files from template (they reference workspace:* versions)\n // This ensures pnpm install creates a fresh lock file with actual versions\n const lockFiles = ['pnpm-lock.yaml', 'yarn.lock', 'package-lock.json']\n for (const lockFile of lockFiles) {\n try {\n await fs.unlink(path.join(projectPath, lockFile))\n } catch {\n // File doesn't exist, ignore\n }\n }\n\n // Update package.json: set name, replace workspace versions\n // This must come AFTER applyLambdaModifications to ensure we have final versions\n const packageJsonPath = path.join(projectPath, 'package.json')\n const packageJsonContent = await fs.readFile(packageJsonPath, 'utf-8')\n const packageJson = JSON.parse(packageJsonContent) as Record<string, unknown>\n packageJson.name = projectName\n\n // Replace workspace:* versions with actual versions\n replaceWorkspaceVersions(packageJson, latestVersion)\n\n await fs.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\\n', 'utf-8')\n\n // Manage environment files (generate PAYLOAD_SECRET)\n await manageEnvFiles(projectPath)\n\n // Ensure .gitignore has required entries\n await ensureGitignore(projectPath, ['.env', '.env.local', 'lambda.zip'])\n}\n\n/**\n * Initialize git repository after all setup is complete\n *\n * This should be called AFTER installDependencies so that lock files are included\n *\n * @param projectPath - Path to project directory\n */\nexport function initializeGitRepo(projectPath: string): void {\n tryInitRepoAndCommit(projectPath)\n}\n\n/**\n * Install dependencies using the detected package manager\n *\n * @param projectPath - Path to project\n * @param packageManager - Package manager to use\n * @returns Promise that resolves when installation completes\n */\nexport async function installDependencies(\n projectPath: string,\n packageManager: 'npm' | 'pnpm' | 'yarn' = 'npm',\n): Promise<void> {\n return new Promise((resolve, reject) => {\n const child = spawn(packageManager, ['install'], {\n cwd: projectPath,\n shell: true,\n stdio: 'pipe', // Capture output to avoid interfering with spinner\n })\n\n let stdout = ''\n let stderr = ''\n\n // Capture stdout\n child.stdout?.on('data', (data) => {\n stdout += data.toString()\n })\n\n // Capture stderr\n child.stderr?.on('data', (data) => {\n stderr += data.toString()\n })\n\n child.on('close', (code) => {\n if (code === 0) {\n resolve()\n } else {\n // Show captured output on error\n const output = [stdout, stderr].filter(Boolean).join('\\n\\n')\n const errorMessage = output\n ? `${packageManager} install failed with code ${code}\\n\\nOutput:\\n${output}`\n : `${packageManager} install failed with code ${code}`\n reject(new Error(errorMessage))\n }\n })\n\n child.on('error', (error) => {\n reject(new Error(`Failed to run ${packageManager} install: ${error.message}`))\n })\n })\n}\n\n/**\n * Check if required dependencies are installed\n *\n * @param projectPath - Path to project\n * @returns True if all required dependencies exist\n */\nexport async function hasRequiredDependencies(projectPath: string): Promise<boolean> {\n const packageJsonPath = path.join(projectPath, 'package.json')\n\n try {\n const content = await fs.readFile(packageJsonPath, 'utf-8')\n const packageJson = JSON.parse(content)\n\n // Check for Payload and Next.js\n const hasPayload = packageJson.dependencies?.payload || packageJson.devDependencies?.payload\n const hasNext = packageJson.dependencies?.next || packageJson.devDependencies?.next\n\n return !!(hasPayload && hasNext)\n } catch {\n return false\n }\n}\n\n/**\n * Check if current directory is a project directory\n *\n * A project directory has package.json\n *\n * @param projectPath - Path to check (defaults to cwd)\n * @returns True if in project directory\n */\nexport async function isInProjectDirectory(projectPath: string = process.cwd()): Promise<boolean> {\n try {\n // Check for package.json\n await fs.access(path.join(projectPath, 'package.json'))\n return true\n } catch {\n return false\n }\n}\n"],"names":["spawn","fs","path","ensureGitignore","downloadTemplateFromGitHub","manageEnvFiles","tryInitRepoAndCommit","applyLambdaModifications","detectPayloadProject","projectPath","process","cwd","packageJsonPath","join","content","readFile","packageJson","JSON","parse","payloadVersion","dependencies","payload","devDependencies","packageManager","access","hasPayload","undefined","error","code","Error","message","validatePayloadVersion","version","match","majorVersion","parseInt","getLatestPackageVersion","packageName","response","fetch","ok","statusText","data","json","latest","replaceWorkspaceVersions","latestVersion","deps","key","value","Object","entries","startsWith","devDeps","scaffoldProject","projectName","mkdir","recursive","lockFiles","lockFile","unlink","packageJsonContent","name","writeFile","stringify","initializeGitRepo","installDependencies","Promise","resolve","reject","child","shell","stdio","stdout","stderr","on","toString","output","filter","Boolean","errorMessage","hasRequiredDependencies","hasNext","next","isInProjectDirectory"],"mappings":"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"}
|
|
@@ -18,6 +18,7 @@ export interface UploadResults {
|
|
|
18
18
|
*
|
|
19
19
|
* @param filePath - Absolute path to file to upload
|
|
20
20
|
* @param signedUrl - Signed S3 upload URL
|
|
21
|
+
* @param contentType - MIME type (optional)
|
|
21
22
|
* @throws Error if upload fails after retries
|
|
22
23
|
*/
|
|
23
24
|
export declare function uploadFile(filePath: string, signedUrl: string, contentType?: string): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"s3-upload.d.ts","sourceRoot":"","sources":["../../src/utils/s3-upload.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,oDAAoD;IACpD,YAAY,EAAE,MAAM,CAAA;IACpB,oDAAoD;IACpD,cAAc,EAAE,MAAM,CAAA;IACtB,uCAAuC;IACvC,cAAc,EAAE,OAAO,CAAA;IACvB,2BAA2B;IAC3B,kBAAkB,EAAE,MAAM,CAAA;CAC3B;AAsBD
|
|
1
|
+
{"version":3,"file":"s3-upload.d.ts","sourceRoot":"","sources":["../../src/utils/s3-upload.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,oDAAoD;IACpD,YAAY,EAAE,MAAM,CAAA;IACpB,oDAAoD;IACpD,cAAc,EAAE,MAAM,CAAA;IACtB,uCAAuC;IACvC,cAAc,EAAE,OAAO,CAAA;IACvB,2BAA2B;IAC3B,kBAAkB,EAAE,MAAM,CAAA;CAC3B;AAsBD;;;;;;;;;GASG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CA6Cf;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEvF;AAED;;;;;;;;;GASG;AACH,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,GACrD,OAAO,CAAC,aAAa,CAAC,CAgDxB"}
|
package/dist/utils/s3-upload.js
CHANGED
|
@@ -23,6 +23,7 @@ const INITIAL_RETRY_DELAY = 1000 // 1 second
|
|
|
23
23
|
*
|
|
24
24
|
* @param filePath - Absolute path to file to upload
|
|
25
25
|
* @param signedUrl - Signed S3 upload URL
|
|
26
|
+
* @param contentType - MIME type (optional)
|
|
26
27
|
* @throws Error if upload fails after retries
|
|
27
28
|
*/ export async function uploadFile(filePath, signedUrl, contentType) {
|
|
28
29
|
// Skip actual upload for mock URLs
|
|
@@ -44,18 +45,10 @@ const INITIAL_RETRY_DELAY = 1000 // 1 second
|
|
|
44
45
|
let lastError = null;
|
|
45
46
|
for(let attempt = 0; attempt < MAX_RETRIES; attempt++){
|
|
46
47
|
try {
|
|
47
|
-
// Content-type only needed if css or js, else let S3 infer
|
|
48
|
-
const ext = path.extname(filePath).toLowerCase();
|
|
49
|
-
let determinedContentType = contentType;
|
|
50
|
-
if (ext === '.js') {
|
|
51
|
-
determinedContentType = 'application/javascript';
|
|
52
|
-
} else if (ext === '.css') {
|
|
53
|
-
determinedContentType = 'text/css';
|
|
54
|
-
}
|
|
55
48
|
const response = await fetch(signedUrl, {
|
|
56
49
|
body: fileBuffer,
|
|
57
|
-
headers:
|
|
58
|
-
'Content-Type':
|
|
50
|
+
headers: contentType ? {
|
|
51
|
+
'Content-Type': contentType
|
|
59
52
|
} : {},
|
|
60
53
|
method: 'PUT'
|
|
61
54
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/utils/s3-upload.ts"],"sourcesContent":["import fs from 'fs/promises'\nimport path from 'path'\n\nimport * as log from './log.js'\n\n/**\n * Results from uploading assets\n */\nexport interface UploadResults {\n /** Number of static assets that failed to upload */\n assetsFailed: number\n /** Number of static assets successfully uploaded */\n assetsUploaded: number\n /** Whether Lambda code was uploaded */\n lambdaUploaded: boolean\n /** Total bytes uploaded */\n totalBytesUploaded: number\n}\n\n/**\n * Retry configuration\n */\nconst MAX_RETRIES = 3\nconst INITIAL_RETRY_DELAY = 1000 // 1 second\n\n/**\n * Sleep for specified milliseconds\n */\nfunction sleep(ms: number): Promise<void> {\n return new Promise((resolve) => setTimeout(resolve, ms))\n}\n\n/**\n * Check if a signed URL is a mock URL\n */\nfunction isMockUrl(signedUrl: string): boolean {\n return signedUrl.includes('X-Amz-Signature=mock')\n}\n\n/**\n * Upload a file to S3 using a signed URL\n *\n * Retries up to 3 times with exponential backoff\n *\n * @param filePath - Absolute path to file to upload\n * @param signedUrl - Signed S3 upload URL\n * @throws Error if upload fails after retries\n */\nexport async function uploadFile(\n filePath: string,\n signedUrl: string,\n contentType?: string,\n): Promise<void> {\n // Skip actual upload for mock URLs\n if (isMockUrl(signedUrl)) {\n log.debug(`Mock upload detected for ${path.basename(filePath)}`)\n // Verify file exists\n const stats = await fs.stat(filePath)\n\n // Simulate upload latency based on file size\n // lambda.zip: ~1-2 seconds, small files: 50-150ms\n const isLargeFile = stats.size > 1024 * 1024 // > 1MB\n const latency = isLargeFile\n ? 1000 + Math.random() * 1000 // 1-2 seconds for large files\n : 50 + Math.random() * 100 // 50-150ms for small files\n await sleep(latency)\n return\n }\n\n const fileBuffer = await fs.readFile(filePath)\n\n let lastError: Error | null = null\n\n for (let attempt = 0; attempt < MAX_RETRIES; attempt++) {\n try {\n
|
|
1
|
+
{"version":3,"sources":["../../src/utils/s3-upload.ts"],"sourcesContent":["import fs from 'fs/promises'\nimport path from 'path'\n\nimport * as log from './log.js'\n\n/**\n * Results from uploading assets\n */\nexport interface UploadResults {\n /** Number of static assets that failed to upload */\n assetsFailed: number\n /** Number of static assets successfully uploaded */\n assetsUploaded: number\n /** Whether Lambda code was uploaded */\n lambdaUploaded: boolean\n /** Total bytes uploaded */\n totalBytesUploaded: number\n}\n\n/**\n * Retry configuration\n */\nconst MAX_RETRIES = 3\nconst INITIAL_RETRY_DELAY = 1000 // 1 second\n\n/**\n * Sleep for specified milliseconds\n */\nfunction sleep(ms: number): Promise<void> {\n return new Promise((resolve) => setTimeout(resolve, ms))\n}\n\n/**\n * Check if a signed URL is a mock URL\n */\nfunction isMockUrl(signedUrl: string): boolean {\n return signedUrl.includes('X-Amz-Signature=mock')\n}\n\n/**\n * Upload a file to S3 using a signed URL\n *\n * Retries up to 3 times with exponential backoff\n *\n * @param filePath - Absolute path to file to upload\n * @param signedUrl - Signed S3 upload URL\n * @param contentType - MIME type (optional)\n * @throws Error if upload fails after retries\n */\nexport async function uploadFile(\n filePath: string,\n signedUrl: string,\n contentType?: string,\n): Promise<void> {\n // Skip actual upload for mock URLs\n if (isMockUrl(signedUrl)) {\n log.debug(`Mock upload detected for ${path.basename(filePath)}`)\n // Verify file exists\n const stats = await fs.stat(filePath)\n\n // Simulate upload latency based on file size\n // lambda.zip: ~1-2 seconds, small files: 50-150ms\n const isLargeFile = stats.size > 1024 * 1024 // > 1MB\n const latency = isLargeFile\n ? 1000 + Math.random() * 1000 // 1-2 seconds for large files\n : 50 + Math.random() * 100 // 50-150ms for small files\n await sleep(latency)\n return\n }\n\n const fileBuffer = await fs.readFile(filePath)\n\n let lastError: Error | null = null\n\n for (let attempt = 0; attempt < MAX_RETRIES; attempt++) {\n try {\n const response = await fetch(signedUrl, {\n body: fileBuffer,\n headers: contentType ? { 'Content-Type': contentType } : {},\n method: 'PUT',\n })\n\n if (response.ok) {\n return // Success\n }\n\n lastError = new Error(`Upload failed: ${response.status} ${response.statusText}`)\n } catch (error) {\n lastError = error instanceof Error ? error : new Error('Unknown error')\n }\n\n // Wait before retry (exponential backoff)\n if (attempt < MAX_RETRIES - 1) {\n await sleep(INITIAL_RETRY_DELAY * Math.pow(2, attempt))\n }\n }\n\n throw lastError || new Error('Upload failed after retries')\n}\n\n/**\n * Upload Lambda code zip to S3\n *\n * @param zipPath - Path to lambda.zip\n * @param signedUrl - Signed S3 upload URL\n */\nexport async function uploadLambdaZip(zipPath: string, signedUrl: string): Promise<void> {\n await uploadFile(zipPath, signedUrl, 'application/zip')\n}\n\n/**\n * Upload static assets to S3 in parallel\n *\n * Uploads up to 5 files concurrently\n *\n * @param projectPath - Path to project root\n * @param assetUrls - Map of asset paths to signed URLs\n * @param onProgress - Optional callback for progress updates (uploaded, total)\n * @returns Upload results with counts\n */\nexport async function uploadStaticAssets(\n projectPath: string,\n assetUrls: Record<string, string>,\n onProgress?: (uploaded: number, total: number) => void,\n): Promise<UploadResults> {\n const results: UploadResults = {\n assetsFailed: 0,\n assetsUploaded: 0,\n lambdaUploaded: false,\n totalBytesUploaded: 0,\n }\n\n const assetPaths = Object.keys(assetUrls)\n\n if (assetPaths.length === 0) {\n return results\n }\n\n // Upload assets with limited concurrency\n const CONCURRENCY = 5\n for (let i = 0; i < assetPaths.length; i += CONCURRENCY) {\n const batch = assetPaths.slice(i, i + CONCURRENCY)\n\n await Promise.all(\n batch.map(async (assetPath) => {\n try {\n // Convert _next back to .next for file system\n const fsPath = assetPath.replace(/^_next\\//, '.next/')\n const fullPath = path.join(projectPath, fsPath)\n const signedUrl = assetUrls[assetPath]\n\n await uploadFile(fullPath, signedUrl)\n\n results.assetsUploaded++\n\n // Track bytes uploaded\n const stats = await fs.stat(fullPath)\n results.totalBytesUploaded += stats.size\n\n // Report progress\n onProgress?.(results.assetsUploaded, assetPaths.length)\n } catch (error) {\n results.assetsFailed++\n log.debug(\n `Failed to upload ${assetPath}: ${error instanceof Error ? error.message : 'Unknown error'}`,\n )\n }\n }),\n )\n }\n\n return results\n}\n"],"names":["fs","path","log","MAX_RETRIES","INITIAL_RETRY_DELAY","sleep","ms","Promise","resolve","setTimeout","isMockUrl","signedUrl","includes","uploadFile","filePath","contentType","debug","basename","stats","stat","isLargeFile","size","latency","Math","random","fileBuffer","readFile","lastError","attempt","response","fetch","body","headers","method","ok","Error","status","statusText","error","pow","uploadLambdaZip","zipPath","uploadStaticAssets","projectPath","assetUrls","onProgress","results","assetsFailed","assetsUploaded","lambdaUploaded","totalBytesUploaded","assetPaths","Object","keys","length","CONCURRENCY","i","batch","slice","all","map","assetPath","fsPath","replace","fullPath","join","message"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-display.d.ts","sourceRoot":"","sources":["../../src/utils/token-display.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAIxD;;GAEG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAK/C;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAsBzD;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"token-display.d.ts","sourceRoot":"","sources":["../../src/utils/token-display.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAIxD;;GAEG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAK/C;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAsBzD;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAkC9D"}
|
|
@@ -37,33 +37,27 @@ import { isDebug } from './is-debug.js';
|
|
|
37
37
|
// Get all tenant IDs that have project tokens
|
|
38
38
|
const tenantIds = tokenStore.getAllProjectTokenTenantIds();
|
|
39
39
|
if (tenantIds.length === 0) {
|
|
40
|
-
p.
|
|
40
|
+
p.log.step(pc.dim('No project tokens stored.'));
|
|
41
|
+
p.note(`Run ${pc.cyan('@payloadcms/figma init')} to create a CMS instance`, 'Tip');
|
|
41
42
|
return;
|
|
42
43
|
}
|
|
43
44
|
const projectTokenLines = [];
|
|
44
|
-
|
|
45
|
-
tenantIds.forEach((tenantId)=>{
|
|
45
|
+
tenantIds.forEach((tenantId, index)=>{
|
|
46
46
|
const projectToken = tokenStore.getProjectToken(tenantId);
|
|
47
47
|
if (!projectToken) {
|
|
48
48
|
return;
|
|
49
49
|
}
|
|
50
50
|
const isValid = tokenStore.hasValidProjectToken(tenantId);
|
|
51
51
|
const status = isValid ? pc.green('✓ Valid') : pc.red('✗ Expired');
|
|
52
|
-
if (
|
|
52
|
+
if (index > 0) {
|
|
53
53
|
projectTokenLines.push(''); // Blank line between tokens
|
|
54
54
|
}
|
|
55
55
|
projectTokenLines.push(`Tenant ID: ${tenantId}`);
|
|
56
56
|
projectTokenLines.push(`Status: ${status}`);
|
|
57
57
|
projectTokenLines.push(`Token: ${isDebug() ? projectToken.token : maskToken(projectToken.token)}`);
|
|
58
58
|
projectTokenLines.push(`Expires: ${formatTimestamp(projectToken.expiresAt)}`);
|
|
59
|
-
displayedCount++;
|
|
60
59
|
});
|
|
61
|
-
|
|
62
|
-
if (displayedCount === 0) {
|
|
63
|
-
p.note(pc.dim('No project tokens stored.'), `Project Tokens`);
|
|
64
|
-
return;
|
|
65
|
-
}
|
|
66
|
-
p.note(projectTokenLines.join('\n'), `Project Tokens (${displayedCount})`);
|
|
60
|
+
p.note(projectTokenLines.join('\n'), `Project Tokens (${tenantIds.length})`);
|
|
67
61
|
}
|
|
68
62
|
|
|
69
63
|
//# sourceMappingURL=token-display.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/utils/token-display.ts"],"sourcesContent":["import * as p from '@clack/prompts'\nimport pc from 'picocolors'\n\nimport type { TokenStore } from '../auth/token-store.js'\n\nimport { isDebug } from './is-debug.js'\n\n/**\n * Mask token for display (show first 4 and last 4 characters)\n */\nexport function maskToken(token: string): string {\n if (token.length <= 8) {\n return '***'\n }\n return `${token.slice(0, 4)}${'*'.repeat(Math.min(token.length - 8, 32))}${token.slice(-4)}`\n}\n\n/**\n * Format timestamp as human-readable string with color coding\n */\nexport function formatTimestamp(timestamp: number): string {\n const now = Date.now()\n const diff = timestamp - now\n\n if (diff < 0) {\n return pc.red('Expired')\n }\n\n const minutes = Math.floor(diff / 60000)\n const hours = Math.floor(minutes / 60)\n const days = Math.floor(hours / 24)\n\n if (days > 0) {\n return pc.green(`${days}d ${hours % 24}h`)\n }\n if (hours > 0) {\n return pc.green(`${hours}h ${minutes % 60}m`)\n }\n if (minutes > 5) {\n return pc.yellow(`${minutes}m`)\n }\n return pc.red(`${minutes}m`)\n}\n\n/**\n * Show all stored project tokens\n */\nexport function showProjectTokens(tokenStore: TokenStore): void {\n // Get all tenant IDs that have project tokens\n const tenantIds = tokenStore.getAllProjectTokenTenantIds()\n\n if (tenantIds.length === 0) {\n p.
|
|
1
|
+
{"version":3,"sources":["../../src/utils/token-display.ts"],"sourcesContent":["import * as p from '@clack/prompts'\nimport pc from 'picocolors'\n\nimport type { TokenStore } from '../auth/token-store.js'\n\nimport { isDebug } from './is-debug.js'\n\n/**\n * Mask token for display (show first 4 and last 4 characters)\n */\nexport function maskToken(token: string): string {\n if (token.length <= 8) {\n return '***'\n }\n return `${token.slice(0, 4)}${'*'.repeat(Math.min(token.length - 8, 32))}${token.slice(-4)}`\n}\n\n/**\n * Format timestamp as human-readable string with color coding\n */\nexport function formatTimestamp(timestamp: number): string {\n const now = Date.now()\n const diff = timestamp - now\n\n if (diff < 0) {\n return pc.red('Expired')\n }\n\n const minutes = Math.floor(diff / 60000)\n const hours = Math.floor(minutes / 60)\n const days = Math.floor(hours / 24)\n\n if (days > 0) {\n return pc.green(`${days}d ${hours % 24}h`)\n }\n if (hours > 0) {\n return pc.green(`${hours}h ${minutes % 60}m`)\n }\n if (minutes > 5) {\n return pc.yellow(`${minutes}m`)\n }\n return pc.red(`${minutes}m`)\n}\n\n/**\n * Show all stored project tokens\n */\nexport function showProjectTokens(tokenStore: TokenStore): void {\n // Get all tenant IDs that have project tokens\n const tenantIds = tokenStore.getAllProjectTokenTenantIds()\n\n if (tenantIds.length === 0) {\n p.log.step(pc.dim('No project tokens stored.'))\n p.note(`Run ${pc.cyan('@payloadcms/figma init')} to create a CMS instance`, 'Tip')\n return\n }\n const projectTokenLines: string[] = []\n\n tenantIds.forEach((tenantId, index) => {\n const projectToken = tokenStore.getProjectToken(tenantId)\n\n if (!projectToken) {\n return\n }\n\n const isValid = tokenStore.hasValidProjectToken(tenantId)\n const status = isValid ? pc.green('✓ Valid') : pc.red('✗ Expired')\n\n if (index > 0) {\n projectTokenLines.push('') // Blank line between tokens\n }\n\n projectTokenLines.push(`Tenant ID: ${tenantId}`)\n projectTokenLines.push(`Status: ${status}`)\n projectTokenLines.push(\n `Token: ${isDebug() ? projectToken.token : maskToken(projectToken.token)}`,\n )\n projectTokenLines.push(`Expires: ${formatTimestamp(projectToken.expiresAt)}`)\n })\n\n p.note(projectTokenLines.join('\\n'), `Project Tokens (${tenantIds.length})`)\n}\n"],"names":["p","pc","isDebug","maskToken","token","length","slice","repeat","Math","min","formatTimestamp","timestamp","now","Date","diff","red","minutes","floor","hours","days","green","yellow","showProjectTokens","tokenStore","tenantIds","getAllProjectTokenTenantIds","log","step","dim","note","cyan","projectTokenLines","forEach","tenantId","index","projectToken","getProjectToken","isValid","hasValidProjectToken","status","push","expiresAt","join"],"mappings":"AAAA,YAAYA,OAAO,iBAAgB;AACnC,OAAOC,QAAQ,aAAY;AAI3B,SAASC,OAAO,QAAQ,gBAAe;AAEvC;;CAEC,GACD,OAAO,SAASC,UAAUC,KAAa;IACrC,IAAIA,MAAMC,MAAM,IAAI,GAAG;QACrB,OAAO;IACT;IACA,OAAO,GAAGD,MAAME,KAAK,CAAC,GAAG,KAAK,IAAIC,MAAM,CAACC,KAAKC,GAAG,CAACL,MAAMC,MAAM,GAAG,GAAG,OAAOD,MAAME,KAAK,CAAC,CAAC,IAAI;AAC9F;AAEA;;CAEC,GACD,OAAO,SAASI,gBAAgBC,SAAiB;IAC/C,MAAMC,MAAMC,KAAKD,GAAG;IACpB,MAAME,OAAOH,YAAYC;IAEzB,IAAIE,OAAO,GAAG;QACZ,OAAOb,GAAGc,GAAG,CAAC;IAChB;IAEA,MAAMC,UAAUR,KAAKS,KAAK,CAACH,OAAO;IAClC,MAAMI,QAAQV,KAAKS,KAAK,CAACD,UAAU;IACnC,MAAMG,OAAOX,KAAKS,KAAK,CAACC,QAAQ;IAEhC,IAAIC,OAAO,GAAG;QACZ,OAAOlB,GAAGmB,KAAK,CAAC,GAAGD,KAAK,EAAE,EAAED,QAAQ,GAAG,CAAC,CAAC;IAC3C;IACA,IAAIA,QAAQ,GAAG;QACb,OAAOjB,GAAGmB,KAAK,CAAC,GAAGF,MAAM,EAAE,EAAEF,UAAU,GAAG,CAAC,CAAC;IAC9C;IACA,IAAIA,UAAU,GAAG;QACf,OAAOf,GAAGoB,MAAM,CAAC,GAAGL,QAAQ,CAAC,CAAC;IAChC;IACA,OAAOf,GAAGc,GAAG,CAAC,GAAGC,QAAQ,CAAC,CAAC;AAC7B;AAEA;;CAEC,GACD,OAAO,SAASM,kBAAkBC,UAAsB;IACtD,8CAA8C;IAC9C,MAAMC,YAAYD,WAAWE,2BAA2B;IAExD,IAAID,UAAUnB,MAAM,KAAK,GAAG;QAC1BL,EAAE0B,GAAG,CAACC,IAAI,CAAC1B,GAAG2B,GAAG,CAAC;QAClB5B,EAAE6B,IAAI,CAAC,CAAC,IAAI,EAAE5B,GAAG6B,IAAI,CAAC,0BAA0B,yBAAyB,CAAC,EAAE;QAC5E;IACF;IACA,MAAMC,oBAA8B,EAAE;IAEtCP,UAAUQ,OAAO,CAAC,CAACC,UAAUC;QAC3B,MAAMC,eAAeZ,WAAWa,eAAe,CAACH;QAEhD,IAAI,CAACE,cAAc;YACjB;QACF;QAEA,MAAME,UAAUd,WAAWe,oBAAoB,CAACL;QAChD,MAAMM,SAASF,UAAUpC,GAAGmB,KAAK,CAAC,aAAanB,GAAGc,GAAG,CAAC;QAEtD,IAAImB,QAAQ,GAAG;YACbH,kBAAkBS,IAAI,CAAC,KAAI,4BAA4B;QACzD;QAEAT,kBAAkBS,IAAI,CAAC,CAAC,gBAAgB,EAAEP,UAAU;QACpDF,kBAAkBS,IAAI,CAAC,CAAC,gBAAgB,EAAED,QAAQ;QAClDR,kBAAkBS,IAAI,CACpB,CAAC,gBAAgB,EAAEtC,YAAYiC,aAAa/B,KAAK,GAAGD,UAAUgC,aAAa/B,KAAK,GAAG;QAErF2B,kBAAkBS,IAAI,CAAC,CAAC,gBAAgB,EAAE9B,gBAAgByB,aAAaM,SAAS,GAAG;IACrF;IAEAzC,EAAE6B,IAAI,CAACE,kBAAkBW,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAElB,UAAUnB,MAAM,CAAC,CAAC,CAAC;AAC7E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript-validator.d.ts","sourceRoot":"","sources":["../../src/utils/typescript-validator.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAE1D,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,qBAAqB,CAAC,
|
|
1
|
+
{"version":3,"file":"typescript-validator.d.ts","sourceRoot":"","sources":["../../src/utils/typescript-validator.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAE1D,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,qBAAqB,CAAC,CAmChC"}
|
|
@@ -1,16 +1,18 @@
|
|
|
1
|
-
import spawn from '
|
|
1
|
+
import { spawn } from 'child_process';
|
|
2
2
|
/**
|
|
3
3
|
* Run TypeScript type checking (tsc --noEmit)
|
|
4
4
|
* Skips silently if TypeScript not available
|
|
5
5
|
*/ export async function runTypeScriptCheck(projectPath, packageManager) {
|
|
6
6
|
return new Promise((resolve)=>{
|
|
7
7
|
try {
|
|
8
|
-
const
|
|
8
|
+
const args = [
|
|
9
9
|
'exec',
|
|
10
10
|
'tsc',
|
|
11
11
|
'--noEmit'
|
|
12
|
-
]
|
|
12
|
+
];
|
|
13
|
+
const child = spawn(packageManager, args, {
|
|
13
14
|
cwd: projectPath,
|
|
15
|
+
shell: true,
|
|
14
16
|
stdio: 'pipe'
|
|
15
17
|
});
|
|
16
18
|
let output = '';
|
|
@@ -50,7 +52,7 @@ import spawn from 'cross-spawn';
|
|
|
50
52
|
/**
|
|
51
53
|
* Parse TypeScript error output
|
|
52
54
|
*/ function parseTypeScriptErrors(output) {
|
|
53
|
-
return output.split(
|
|
55
|
+
return output.split('\n').filter((line)=>line.includes('error TS')).map((line)=>line.trim());
|
|
54
56
|
}
|
|
55
57
|
|
|
56
58
|
//# sourceMappingURL=typescript-validator.js.map
|