@payloadcms/figma 0.0.1-alpha.60 → 0.0.1-alpha.62

package/dist/api/control-plane.d.ts

@@ -28,6 +28,10 @@ export interface CreateTenantOptions {
  * Options for creating a new deployment
  */
 export interface CreateDeploymentOptions {
+    /** Framework adapter name (e.g., "vite", "nextjs"). Forwarded to Gatekeeper. */
+    adapter?: string;
+    /** SPA fallback path (e.g., "/index.html"). Vite-only. */
+    fallback?: string;
     /** Pages keyed by route, each with its associated asset keys */
     pages: Record<string, {
         assets: string[];

package/dist/api/control-plane.js

@@ -184,14 +184,21 @@ import * as log from '../utils/log.js';
             assets: pageData.assets
         };
     }
+    const body = {
+        pages,
+        static_assets: options.staticAssets
+    };
+    if (options.adapter) {
+        body.adapter = options.adapter;
+    }
+    if (options.fallback) {
+        body.fallback = options.fallback;
+    }
     // REAL API IMPLEMENTATION
     const response = await controlPlaneFetch({
         context: 'create deployment',
         options: {
-            body: JSON.stringify({
-                pages,
-                static_assets: options.staticAssets
-            }),
+            body: JSON.stringify(body),
             headers: {
                 ...getAuthHeaders(credential),
                 'Content-Type': 'application/json'

package/dist/cli.js

@@ -68,9 +68,11 @@ class Main {
                 setInfraEnvironment('production');
             } else if (infraEnvArg === 'staging') {
                 setInfraEnvironment('staging');
+            } else if (infraEnvArg === 'devbox') {
+                setInfraEnvironment('devbox');
             } else {
                 // eslint-disable-next-line no-console
-                console.error(`Invalid --infra-env value: ${this.args['--infra-env']}. Use 'production' or 'staging'.`);
+                console.error(`Invalid --infra-env value: ${this.args['--infra-env']}. Use 'production', 'staging', or 'devbox'.`);
                 process.exit(1);
             }
         }

package/dist/commands/deploy.js

@@ -241,6 +241,8 @@ import { loginCommand } from './login.js';
             };
         }
         const createResponse = await createDeployment(credential, tenantInstanceId, {
+            adapter: adapter.name,
+            fallback: adapter.fallback,
             pages: pagesPayload,
             staticAssets: assets.uploadKeys
         });

package/dist/commands/init.js

@@ -67,7 +67,7 @@ import { cacheAllEnvironments } from '../utils/cache-bootstrap.js';
  *
  * @param options - Command options
  */ export async function initCommand(options) {
-    // Check for outdated version (non-blocking)
+    // Check for mismatched version (non-blocking)
     const currentVersion = await getOwnVersion();
     await checkForUpdates(currentVersion);
     // Check authentication

package/dist/config/oauth.d.ts

@@ -1,8 +1,16 @@
 import type { OAuthConfig } from '../auth/types.js';
 export declare const DEFAULT_CALLBACK_PORT = 34462;
 /**
- * Get OAuth configuration for current environment
- * Uses getEnvConfig() to determine staging vs production
+ * Get OAuth configuration for current environment.
+ *
+ * Honors env overrides:
+ *   FIGMA_API_BASE_URL → tokenUrl, refreshUrl
+ *   FIGMA_WEB_BASE_URL → authorizationUrl (appends /oauth)
+ *   FIGMA_CLIENT_ID    → clientId
+ *   FIGMA_REDIRECT_URI → redirectUri
+ *
+ * When FIGMA_INFRA_ENV=devbox, FIGMA_API_BASE_URL and FIGMA_WEB_BASE_URL are
+ * required (ENV_CONFIG.devbox has empty URL defaults to fail-closed).
  */
 export declare function getOAuthConfig(): OAuthConfig;
 export declare const TOKEN_EXPIRY_BUFFER_SECONDS = 300;

package/dist/config/oauth.js

@@ -1,10 +1,24 @@
-import { getEnvConfig } from '../constants.js';
+import { getEnvConfig, getInfraEnvironment } from '../constants.js';
 export const DEFAULT_CALLBACK_PORT = 34462;
 /**
- * Get OAuth configuration for current environment
- * Uses getEnvConfig() to determine staging vs production
+ * Get OAuth configuration for current environment.
+ *
+ * Honors env overrides:
+ *   FIGMA_API_BASE_URL → tokenUrl, refreshUrl
+ *   FIGMA_WEB_BASE_URL → authorizationUrl (appends /oauth)
+ *   FIGMA_CLIENT_ID    → clientId
+ *   FIGMA_REDIRECT_URI → redirectUri
+ *
+ * When FIGMA_INFRA_ENV=devbox, FIGMA_API_BASE_URL and FIGMA_WEB_BASE_URL are
+ * required (ENV_CONFIG.devbox has empty URL defaults to fail-closed).
  */ export function getOAuthConfig() {
-    const { apiBaseUrl, authorizationUrl, clientId } = getEnvConfig();
+    const { apiBaseUrl: defaultApi, authorizationUrl: defaultAuth, clientId } = getEnvConfig();
+    const apiBaseUrl = process.env.FIGMA_API_BASE_URL || defaultApi;
+    const webBase = process.env.FIGMA_WEB_BASE_URL;
+    const authorizationUrl = webBase ? `${webBase}/oauth` : defaultAuth;
+    if (getInfraEnvironment() === 'devbox' && (!apiBaseUrl || !authorizationUrl)) {
+        throw new Error('FIGMA_API_BASE_URL and FIGMA_WEB_BASE_URL must be set when FIGMA_INFRA_ENV=devbox');
+    }
     return {
         authorizationUrl,
         clientId: process.env.FIGMA_CLIENT_ID || clientId,

package/dist/constants.d.ts

@@ -1,7 +1,9 @@
 /**
- * Figma infrastructure environment (production or staging)
+ * Figma infrastructure environment (production, staging, or devbox).
+ * devbox is a local-dev mode that requires FIGMA_API_BASE_URL and
+ * FIGMA_WEB_BASE_URL env overrides to point at a Coder devbox.
  */
-export type Environment = 'production' | 'staging';
+export type Environment = 'devbox' | 'production' | 'staging';
 type EnvironmentConfig = {
     /** Figma API base URL. Override: FIGMA_API_BASE_URL */
     apiBaseUrl: string;

package/dist/constants.js

@@ -18,6 +18,17 @@ import { getEnvVarSync } from './utils/env-management.js';
         contentApiUrl: 'https://us-east-1.cms-tenants-001-staging.figmacontentstaging.com',
         identityMetadata: 'https://staging.figma.com/.well-known/openid-configuration',
         jwksUri: 'https://static.figmacontentstaging.com/.well_known/jwks.json'
+    },
+    // Empty URLs are intentional: devbox mode requires FIGMA_API_BASE_URL and
+    // FIGMA_WEB_BASE_URL to be set, validated at getOAuthConfig() time.
+    // clientId defaults to the dev seed value in sinatra/db/seeds.rb.
+    devbox: {
+        apiBaseUrl: '',
+        authorizationUrl: '',
+        clientId: 'rNZBcf3xBDmI76mQ9603su',
+        contentApiUrl: '',
+        identityMetadata: '',
+        jwksUri: ''
     }
 };
 /**
@@ -58,9 +69,13 @@ export function getInfraEnvironment() {
         return envOverride;
     }
     // Check process.env first (case-insensitive)
-    if (process.env.FIGMA_INFRA_ENV?.toLowerCase() === 'staging') {
+    const processEnv = process.env.FIGMA_INFRA_ENV?.toLowerCase();
+    if (processEnv === 'staging') {
         return 'staging';
     }
+    if (processEnv === 'devbox') {
+        return 'devbox';
+    }
     // Fall back to .env file in cwd (check both new and old env var names)
     const envFileValue = getEnvVarSync(process.cwd(), 'FIGMA_INFRA_ENV') ?? getEnvVarSync(process.cwd(), 'FIGMA_ENV');
     if (envFileValue) {
@@ -68,6 +83,9 @@ export function getInfraEnvironment() {
         if (env === 'staging') {
             return 'staging';
         }
+        if (env === 'devbox') {
+            return 'devbox';
+        }
         if (env !== 'production') {
             // eslint-disable-next-line no-console
             console.warn(`Warning: Invalid FIGMA_INFRA_ENV value "${envFileValue}" in .env file. Using production.`);

package/dist/db-content-api/index.js

@@ -8,6 +8,7 @@ import { addFallbackSort } from './temp-utilities/sorting.js';
 import { unwrapDocument, unwrapFindResponse } from './temp-utilities/unwrapDocument.js';
 import { createAuthMiddleware, createErrorMiddleware } from './utilities/auth.js';
 import { dataToContentAPI, resolveVersionContent } from './utilities/data/index.js';
+import { validateRelationshipIds } from './utilities/data/validateRelationships.js';
 import { convertPayloadJoinsToContentAPI } from './utilities/joins.js';
 import { addFallbackLocale } from './utilities/locale/index.js';
 import { buildMeta } from './utilities/meta/buildMeta.js';
@@ -56,7 +57,7 @@ async function syncCollections() {
         }
     }
 }
-async function init() {
+function init() {
     if (this.auth.mode === 'apiKey') {
         this.payload.logger.info('Using API Key authentication');
     } else if (this.auth.mode === 'tokenStore') {
@@ -64,8 +65,15 @@ async function init() {
     } else {
         this.payload.logger.info('Using Dev JWT authentication (testing)');
     }
-    if (process.env.PAYLOAD_DROP_DATABASE === 'true') {
+}
+// connect is called after init — once on first startup (hotReload=false) and again on HMR
+// (hotReload=true). Only clear the database on the first startup, never on hot reload.
+async function connect(args) {
+    const hotReload = args?.hotReload ?? false;
+    if (!hotReload && process.env.PAYLOAD_DROP_DATABASE === 'true') {
+        // clearDatabase already calls syncCollections internally after clearing
         await this.clearDatabase();
+        return;
     }
     await syncCollections.call(this);
 }
@@ -99,7 +107,7 @@ async function findMany({ collection, joins, limit, locale: localeArg, page, pag
         body: {
             collection,
             contentSystemId: this.contentSystemId,
-            join: convertPayloadJoinsToContentAPI(this.payload, collection, joins),
+            join: convertPayloadJoinsToContentAPI(this.payload, collection, joins, locale),
             limit,
             locale,
             page: page ?? 1,
@@ -346,6 +354,11 @@ async function findDistinct(args) {
 }
 async function updateMany(args) {
     const locale = addFallbackLocale(args.locale, this.payload);
+    validateRelationshipIds({
+        collectionSlug: args.collection,
+        data: args.data,
+        payload: this.payload
+    });
     const { data: response, error } = await this.client.POST('/api/v0/documents:update', {
         body: {
             collection: args.collection,
@@ -387,6 +400,11 @@ async function updateOne(args) {
             equals: args.id
         }
     };
+    validateRelationshipIds({
+        collectionSlug: args.collection,
+        data: args.data,
+        payload: this.payload
+    });
     const { data: response, error } = await this.client.POST('/api/v0/documents:update', {
         body: {
             collection: args.collection,
@@ -491,6 +509,11 @@ async function create(args) {
         id = uuid();
     }
     const locale = addFallbackLocale(args.locale, this.payload);
+    validateRelationshipIds({
+        collectionSlug: args.collection,
+        data: args.data,
+        payload: this.payload
+    });
     const { data: response, error } = await this.client.POST('/api/v0/documents:create', {
         body: {
             collection: args.collection,
@@ -604,6 +627,11 @@ async function upsert(args) {
         documentId = uuid();
     }
     const locale = addFallbackLocale(args.locale, this.payload);
+    validateRelationshipIds({
+        collectionSlug: args.collection,
+        data: args.data,
+        payload: this.payload
+    });
     const { data: response, error } = await this.client.POST('/api/v0/documents:update', {
         body: {
             collection: args.collection,
@@ -645,13 +673,131 @@ async function upsert(args) {
         payload: this.payload
     });
 }
+// Mirrors MAX_DOCUMENT_UPDATES in the content API's updateDocuments.ts.
+// updateJobs may be called with larger limits (e.g. 150), so we batch sequentially.
+const CONTENT_API_MAX_UPDATES = 20;
+// Issues a single update request against payload-jobs and returns the unwrapped docs.
+async function updateJobsBatch({ batchSize, docData, meta, sortClause, whereQuery }) {
+    const { data: response, error } = await this.client.POST('/api/v0/documents:update', {
+        body: {
+            collection: 'payload-jobs',
+            contentSystemId: this.contentSystemId,
+            createOnMissing: false,
+            doc: docData,
+            ...batchSize != null && {
+                limit: batchSize
+            },
+            returning: {},
+            sort: sortClause,
+            where: whereQuery,
+            ...meta
+        }
+    });
+    if (error) {
+        throw new Error(`Content API updateJobs error: ${JSON.stringify(error)}`);
+    }
+    if (!response) {
+        throw new Error('No response from updateJobs');
+    }
+    if (!response.result || !('data' in response.result)) {
+        return [];
+    }
+    return response.result.data.map((doc)=>unwrapDocument({
+            collectionSlug: 'payload-jobs',
+            doc,
+            payload: this.payload
+        }));
+}
+async function updateJobs(args) {
+    const { id, limit, returning, sort, where } = args;
+    if (id == null && where == null) {
+        throw new Error('updateJobs requires either id or a where clause');
+    }
+    // Copy data to avoid mutating the caller's object.
+    const data = {
+        ...args.data
+    };
+    // Strip log if empty/absent. The content API's deep merge replaces arrays entirely
+    // (it does not concatenate), so sending log: [] would wipe existing log entries.
+    // Only include log when it carries new content: a non-empty array or a $push operation.
+    const log = data.log;
+    if (!(Array.isArray(log) && log.length > 0) && !(log && typeof log === 'object' && '$push' in log)) {
+        delete data.log;
+    }
+    const whereClause = id != null ? {
+        id: {
+            equals: String(id)
+        }
+    } : where;
+    const docData = dataToContentAPI(this.payload, 'payload-jobs', data);
+    const sortClause = addFallbackSort(sort || '-updatedAt', this.payload, 'payload-jobs');
+    const whereQuery = convertPayloadWhereToContentAPI(whereClause);
+    const meta = buildMeta(this.payload, {
+        collection: 'payload-jobs',
+        locale: undefined,
+        where: whereClause
+    });
+    // When limit exceeds the content API's per-request cap, batch sequentially.
+    const needsBatching = limit != null && limit > CONTENT_API_MAX_UPDATES;
+    if (!needsBatching) {
+        const docs = await updateJobsBatch.call(this, {
+            batchSize: limit,
+            docData,
+            meta,
+            sortClause,
+            whereQuery
+        });
+        if (returning === false) {
+            return null;
+        }
+        return docs;
+    }
+    // Batched path: issue sequential requests of ≤ CONTENT_API_MAX_UPDATES each.
+    // This relies on the update itself causing matched jobs to no longer satisfy the where
+    // clause on subsequent batches (e.g. setting processing: true removes them from a
+    // "processing: false" query). If a future updateJobs call in Payload core updates jobs
+    // in a way that does NOT change their match status, the same jobs could be updated
+    // multiple times across batches.
+    const allDocs = [];
+    let remaining = limit;
+    while(remaining > 0){
+        const batchSize = Math.min(remaining, CONTENT_API_MAX_UPDATES);
+        const batchDocs = await updateJobsBatch.call(this, {
+            batchSize,
+            docData,
+            meta,
+            sortClause,
+            whereQuery
+        });
+        allDocs.push(...batchDocs);
+        remaining -= batchSize;
+        // Stop early when this batch returned fewer docs than requested — no more matching docs.
+        if (batchDocs.length < batchSize) {
+            break;
+        }
+    }
+    if (returning === false) {
+        return null;
+    }
+    return allDocs;
+}
 function createGlobal(args) {
-    return this.create({
+    // Globals are singletons identified by their slug. Use upsert so concurrent calls
+    // (e.g. handleSchedules processing multiple queueables with the same null jobStats)
+    // don't fail with "A record with this field already exists". The deep-merge semantics
+    // of the update path are safe here: callers that want a fresh create (first run) get
+    // an effective create, and callers that race a prior create get a merge instead.
+    return this.upsert({
         collection: getGlobalSlug(args.slug),
         data: {
             ...args.data,
             id: args.slug,
             globalType: args.slug
+        },
+        where: {
+            id: {
+                equals: args.slug
+            }
         }
     });
 }
@@ -749,6 +895,7 @@ export const contentAPIAdapter = (opts)=>({
                 clearDatabase: clearDatabase,
                 client,
                 commitTransaction: async ()=>{},
+                connect: connect,
                 contentSystemId: opts.contentSystemId,
                 count: count,
                 countGlobalVersions: countGlobalVersions,
@@ -775,6 +922,7 @@ export const contentAPIAdapter = (opts)=>({
                 rollbackTransaction: async ()=>{},
                 updateGlobal: updateGlobal,
                 updateGlobalVersion: updateGlobalVersion,
+                updateJobs: updateJobs,
                 updateMany: updateMany,
                 updateOne: updateOne,
                 updateVersion: updateVersion,

package/dist/db-content-api/utilities/data/applyDefaults.js

@@ -3,6 +3,22 @@
  * This handles defaults for nested structures (arrays, groups) which traverseFields doesn't handle
  */ export function applyDefaults(data, fields) {
     for (const field of fields){
+        // Tabs fields: unnamed tabs are transparent (fields at the same level); named tabs nest
+        // their fields under the tab's name key. Recurse before the name-based guard so
+        // tab-nested fields (e.g. hasError in payload-jobs) get their defaults applied.
+        if (field.type === 'tabs') {
+            for (const tab of field.tabs){
+                if ('name' in tab && tab.name) {
+                    if (!data[tab.name]) {
+                        data[tab.name] = {};
+                    }
+                    applyDefaults(data[tab.name], tab.fields);
+                } else {
+                    applyDefaults(data, tab.fields);
+                }
+            }
+            continue;
+        }
         // Only process fields that affect data (have a name)
         if (!('name' in field) || !field.name) {
             continue;
@@ -37,11 +53,11 @@
                     applyDefaults(element, field.fields);
                 }
             }
-        } else if (field.type === 'group' && currentValue && typeof currentValue === 'object') {
-            // Apply defaults to group fields
-            if ('fields' in field) {
-                applyDefaults(currentValue, field.fields);
+        } else if (field.type === 'group' && 'fields' in field) {
+            if (currentValue == null || typeof currentValue !== 'object') {
+                data[field.name] = {};
             }
+            applyDefaults(data[field.name], field.fields);
         } else if (field.type === 'blocks' && Array.isArray(currentValue) && 'blocks' in field) {
             // Apply defaults to each block
             for (const element of currentValue){

package/dist/db-content-api/utilities/data/index.js

@@ -179,6 +179,23 @@ export function dataFromContentAPI(payload, collectionSlug, data, locale) {
         const current = ref;
         const value = current[field.name];
         const isLocalized = 'localized' in field && field.localized;
+        // Group fields must always be an object so Payload can traverse sub-fields
+        // (e.g. join fields inside a group). A null/undefined group crashes afterRead.
+        if (field.type === 'group') {
+            if (value == null || typeof value !== 'object') {
+                current[field.name] = {};
+            }
+            return;
+        }
+        // Localized join fields: wrap in locale map so afterRead can hoist the value.
+        // Content API returns join data directly at the field path (e.g. { docs: [...] }),
+        // but Payload's afterRead expects localized fields as { [locale]: value }.
+        if (field.type === 'join' && isLocalized && value !== undefined && !isAllLocales && locale) {
+            current[field.name] = {
+                [locale]: value
+            };
+            return;
+        }
         // Content API may omit fields; Payload expects null for optional fields.
         // In all-locales mode, localized fields use {} so afterRead can safely iterate locale keys.
         if (value === undefined) {

package/dist/db-content-api/utilities/data/validateRelationships.d.ts

@@ -0,0 +1,7 @@
+import type { Payload } from 'payload';
+export declare function validateRelationshipIds({ collectionSlug, data, payload, }: {
+    collectionSlug: string;
+    data: Record<string, unknown>;
+    payload: Payload;
+}): void;
+//# sourceMappingURL=validateRelationships.d.ts.map

package/dist/db-content-api/utilities/data/validateRelationships.js

@@ -0,0 +1,102 @@
+import { traverseFields } from 'payload';
+const UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+function collectRelationshipValues({ data, fields }) {
+    const relationships = [];
+    const callback = ({ field, ref })=>{
+        if (!('name' in field) || !field.name) {
+            return;
+        }
+        if (field.type !== 'relationship' && field.type !== 'upload') {
+            return;
+        }
+        if (!ref || typeof ref !== 'object') {
+            return;
+        }
+        const rawValue = ref[field.name];
+        if (rawValue == null || rawValue === '') {
+            return;
+        }
+        // For localized fields, the value is a locale map (e.g. { en: "uuid", fr: "uuid" }).
+        // Iterate locale values instead of treating the map as an ID.
+        if ('localized' in field && field.localized) {
+            if (typeof rawValue === 'object' && !Array.isArray(rawValue)) {
+                for (const localeValue of Object.values(rawValue)){
+                    if (localeValue != null && localeValue !== '') {
+                        parseRelationshipValues(localeValue, field.relationTo, relationships);
+                    }
+                }
+            }
+            return;
+        }
+        parseRelationshipValues(rawValue, field.relationTo, relationships);
+    };
+    traverseFields({
+        callback,
+        fields,
+        fillEmpty: false,
+        ref: data
+    });
+    return relationships;
+}
+function parseRelationshipValues(value, relationTo, relationships) {
+    if (Array.isArray(relationTo)) {
+        // Polymorphic (single or hasMany): value is { relationTo, value } or array of them
+        const values = Array.isArray(value) ? value : [
+            value
+        ];
+        for (const v of values){
+            if (v && typeof v === 'object' && 'relationTo' in v && 'value' in v) {
+                const obj = v;
+                if (obj.value != null && obj.value !== '') {
+                    relationships.push({
+                        collection: obj.relationTo,
+                        value: obj.value
+                    });
+                }
+            }
+        }
+    } else {
+        // Non-polymorphic (single or hasMany): value is a bare ID or array of IDs
+        const values = Array.isArray(value) ? value : [
+            value
+        ];
+        for (const v of values){
+            if (v != null && v !== '') {
+                relationships.push({
+                    collection: relationTo,
+                    value: v
+                });
+            }
+        }
+    }
+}
+function isValidId(value, customIDType) {
+    if (customIDType === 'number') {
+        const num = typeof value === 'number' ? value : typeof value === 'string' ? Number(value) : NaN;
+        return Number.isFinite(num);
+    }
+    if (customIDType === 'text') {
+        return typeof value === 'string' && value.length > 0;
+    }
+    return typeof value === 'string' && UUID_REGEX.test(value);
+}
+export function validateRelationshipIds({ collectionSlug, data, payload }) {
+    const isGlobal = collectionSlug.startsWith('_global-');
+    const actualSlug = isGlobal ? collectionSlug.substring(8) : collectionSlug;
+    const config = isGlobal ? payload.config.globals?.find((g)=>g.slug === actualSlug) : payload.config.collections.find((c)=>c.slug === actualSlug);
+    if (!config?.fields) {
+        return;
+    }
+    const relationships = collectRelationshipValues({
+        data,
+        fields: config.fields
+    });
+    for (const { collection, value } of relationships){
+        const customIDType = payload.collections?.[collection]?.customIDType;
+        if (!isValidId(value, customIDType)) {
+            throw new Error(`Invalid relationship ID "${String(value)}" for collection "${collection}". Expected ${customIDType === 'number' ? 'a number' : customIDType === 'text' ? 'a non-empty string' : 'a valid UUID'}.`);
+        }
+    }
+}
+
+//# sourceMappingURL=validateRelationships.js.map

package/dist/db-content-api/utilities/joins.d.ts

@@ -17,8 +17,6 @@ type ContentAPIJoin = components['schemas']['JoinClause'][number];
  * 3. **Polymorphic relationships** - Stored as `{ relationTo, value }` objects, but
  *    Content API expects a simple ID string.
  *
- * 4. **Localized relationship fields** - Locale-aware joins not implemented.
- *
  * Note: "Where querying through joins" (e.g., `where: { 'relatedPosts.title': { equals: 'x' } }`)
  * is a separate Payload feature that filters documents based on joined data. This is NOT
  * a join feature but a where clause feature, and would need separate Content API support.
@@ -50,6 +48,6 @@ type ContentAPIJoin = components['schemas']['JoinClause'][number];
  * - Which collection each join field refers to
  * - What the 'on' field is for each join
  */
-export declare function convertPayloadJoinsToContentAPI(payload: Payload, collectionSlug: string, joins: false | JoinQuery | undefined): ContentAPIJoin[] | undefined;
+export declare function convertPayloadJoinsToContentAPI(payload: Payload, collectionSlug: string, joins: false | JoinQuery | undefined, locale?: string): ContentAPIJoin[] | undefined;
 export {};
 //# sourceMappingURL=joins.d.ts.map

package/dist/db-content-api/utilities/joins.js

@@ -16,8 +16,6 @@ import { convertPayloadWhereToContentAPI } from './where.js';
  * 3. **Polymorphic relationships** - Stored as `{ relationTo, value }` objects, but
  *    Content API expects a simple ID string.
  *
- * 4. **Localized relationship fields** - Locale-aware joins not implemented.
- *
  * Note: "Where querying through joins" (e.g., `where: { 'relatedPosts.title': { equals: 'x' } }`)
  * is a separate Payload feature that filters documents based on joined data. This is NOT
  * a join feature but a where clause feature, and would need separate Content API support.
@@ -48,7 +46,7 @@ import { convertPayloadWhereToContentAPI } from './where.js';
  * The mapping requires the collection config to resolve:
  * - Which collection each join field refers to
  * - What the 'on' field is for each join
- */ export function convertPayloadJoinsToContentAPI(payload, collectionSlug, joins) {
+ */ export function convertPayloadJoinsToContentAPI(payload, collectionSlug, joins, locale) {
     const collectionConfig = payload.config.collections.find((c)=>c.slug === collectionSlug);
     if (!collectionConfig) {
         return undefined;
@@ -74,11 +72,14 @@ import { convertPayloadWhereToContentAPI } from './where.js';
         for (const [collectionSlug, sanitizedJoins] of Object.entries(collectionConfig.joins)){
             for (const sanitizedJoin of sanitizedJoins){
                 if (sanitizedJoin.joinPath === joinPath) {
+                    const on = locale && sanitizedJoin.getForeignPath ? sanitizedJoin.getForeignPath({
+                        locale
+                    }) : sanitizedJoin.field.on;
                     foundJoin = {
                         collectionSlug,
                         defaultLimit: sanitizedJoin.field.defaultLimit,
                         defaultSort: sanitizedJoin.field.defaultSort,
-                        on: sanitizedJoin.field.on
+                        on
                     };
                     break;
                 }
@@ -92,10 +93,13 @@ import { convertPayloadWhereToContentAPI } from './where.js';
             for (const sanitizedJoin of collectionConfig.polymorphicJoins){
                 if (sanitizedJoin.joinPath === joinPath) {
                     const collections = sanitizedJoin.field.collection;
+                    const on = locale && sanitizedJoin.getForeignPath ? sanitizedJoin.getForeignPath({
+                        locale
+                    }) : sanitizedJoin.field.on;
                     foundJoin = {
                         collectionSlug: collections,
                         defaultSort: sanitizedJoin.field.defaultSort,
-                        on: sanitizedJoin.field.on
+                        on
                     };
                     break;
                 }

package/dist/db-content-api/utilities/where.js

@@ -74,6 +74,10 @@ export function convertPayloadWhereToContentAPI(where, options = {}) {
                 if (op === 'exists' && typeof operatorValue === 'string') {
                     finalValue = operatorValue === 'true';
                 }
+                // REST API sends "null" as a string; convert to actual null
+                if (finalValue === 'null') {
+                    finalValue = null;
+                }
                 // Content API stores all document IDs as strings.
                 // Payload sends numeric values for collections with custom numeric ID fields,
                 // so we must stringify to match.

package/dist/storage-content-api/staticHandler.js

@@ -23,24 +23,7 @@ export const getHandler = ({ client, collection })=>{
                     status: 500
                 });
             }
-            // Fetch file bytes from S3 (required for Payload's image processing)
-            const fileResponse = await fetch(data.url);
-            if (!fileResponse.ok) {
-                req.payload.logger.error(`S3 fetch failed: ${fileResponse.status} ${fileResponse.statusText}`);
-                return new Response('Failed to fetch file from storage', {
-                    status: 502
-                });
-            }
-            const contentType = fileResponse.headers.get('content-type') || 'application/octet-stream';
-            const contentLength = fileResponse.headers.get('content-length');
-            return new Response(fileResponse.body, {
-                headers: {
-                    'Content-Type': contentType,
-                    ...contentLength && {
-                        'Content-Length': contentLength
-                    }
-                }
-            });
+            return Response.redirect(data.url, 302);
         } catch (err) {
             req.payload.logger.error({
                 err,

package/dist/utils/build-lambda-zip.d.ts

@@ -4,8 +4,10 @@
  * Cross-platform replacement for build_for_lambda.sh:
  * 1. Copies .next/static to .next/standalone/.next/static
  * 2. Copies run.sh to .next/standalone/run.sh
- * 3. Copies public/ to .next/standalone/public/ (if exists)
- * 4. Creates lambda.zip from .next/standalone/
+ * 3. Creates lambda.zip from .next/standalone/
+ *
+ * Note: public/ is NOT included in the zip — those files are uploaded
+ * as static assets and served via CDN, not from the Lambda function.
  *
  * @param projectPath - Path to project root
  * @throws Error if standalone directory missing or zip creation fails

package/dist/utils/build-lambda-zip.js

@@ -8,15 +8,16 @@ import path from 'path';
  * Cross-platform replacement for build_for_lambda.sh:
  * 1. Copies .next/static to .next/standalone/.next/static
  * 2. Copies run.sh to .next/standalone/run.sh
- * 3. Copies public/ to .next/standalone/public/ (if exists)
- * 4. Creates lambda.zip from .next/standalone/
+ * 3. Creates lambda.zip from .next/standalone/
+ *
+ * Note: public/ is NOT included in the zip — those files are uploaded
+ * as static assets and served via CDN, not from the Lambda function.
  *
  * @param projectPath - Path to project root
  * @throws Error if standalone directory missing or zip creation fails
  */ export async function buildLambdaZip(projectPath) {
     const standalonePath = path.join(projectPath, '.next', 'standalone');
     const staticPath = path.join(projectPath, '.next', 'static');
-    const publicPath = path.join(projectPath, 'public');
     const runShPath = path.join(projectPath, 'run.sh');
     const zipPath = path.join(projectPath, 'lambda.zip');
     if (!await isDirectory(standalonePath)) {
@@ -31,10 +32,6 @@ import path from 'path';
     } catch  {
     // run.sh may not exist in all setups
     }
-    if (await isDirectory(publicPath)) {
-        const destPublic = path.join(standalonePath, 'public');
-        await copyDirectory(publicPath, destPublic);
-    }
     await createZip(standalonePath, zipPath);
 }
 async function isDirectory(dirPath) {

package/dist/utils/lambda-config.js

@@ -17,7 +17,7 @@ NODE_ENV=production exec node server.js
     const runShPath = path.join(projectPath, 'run.sh');
     await fs.writeFile(runShPath, RUN_SH_CONTENT, 'utf-8');
     await fs.chmod(runShPath, 0o755);
-    // 2. Modify next config to add standalone output and eslint ignore
+    // 2. Modify next config to add standalone output
     await addNextConfigProperties(projectPath);
     // 3. Create/update .npmrc
     const npmrcPath = path.join(projectPath, '.npmrc');
@@ -58,7 +58,6 @@ NODE_ENV=production exec node server.js
 /**
  * Add required Next.js config properties using ts-morph AST parsing
  * - output: 'standalone' (for Lambda deployment)
- * - eslint: { ignoreDuringBuilds: true } (allow builds with lint errors)
  */ async function addNextConfigProperties(projectPath) {
     const nextConfigPath = await findNextConfigPath(projectPath);
     const project = new Project({
@@ -76,24 +75,14 @@ NODE_ENV=production exec node server.js
     if (!configObject) {
         throw new Error(`Could not find Next.js config object in ${path.basename(nextConfigPath)}. ` + `Expected either 'export default { ... }' or 'export default wrapper(configVar, ...)'`);
     }
-    // Check which properties already exist using AST (avoids false positives from comments)
     const hasOutput = configObject.getProperty('output') !== undefined;
-    const hasEslint = configObject.getProperty('eslint') !== undefined;
-    if (hasOutput && hasEslint) {
+    if (hasOutput) {
         return;
     }
-    if (!hasOutput) {
-        configObject.addPropertyAssignment({
-            name: 'output',
-            initializer: "'standalone'"
-        });
-    }
-    if (!hasEslint) {
-        configObject.addPropertyAssignment({
-            name: 'eslint',
-            initializer: `{ ignoreDuringBuilds: true }`
-        });
-    }
+    configObject.addPropertyAssignment({
+        name: 'output',
+        initializer: "'standalone'"
+    });
     await sourceFile.save();
 }
 /**

package/dist/utils/messages.js

@@ -59,7 +59,7 @@ export function helpMessage() {
 
   ${pc.bold('GLOBAL OPTIONS')}
 
-      ${pc.dim('--infra-env <env>')}                     Target infrastructure (production or staging)
+      ${pc.dim('--infra-env <env>')}                     Target infrastructure (production, staging, or devbox)
 
   ${pc.bold('DOCUMENTATION')}
 

package/dist/utils/payload-config-ast.js

@@ -9,9 +9,9 @@ import * as log from './log.js';
         hasOtherPayloadImports: false,
         needsImportChange: false
     };
-    // Find buildConfig import
+    // Find buildConfig import — prefer @payloadcms/figma (already migrated) over payload
     const imports = sourceFile.getImportDeclarations();
-    const payloadImport = imports.find((imp)=>imp.getModuleSpecifierValue() === 'payload' || imp.getModuleSpecifierValue() === '@payloadcms/figma');
+    const payloadImport = imports.find((imp)=>imp.getModuleSpecifierValue() === '@payloadcms/figma') || imports.find((imp)=>imp.getModuleSpecifierValue() === 'payload');
     if (!payloadImport) {
         log.debug('No payload or @payloadcms/figma import found');
         result.hasBuildConfig = false;
@@ -157,9 +157,27 @@ import * as log from './log.js';
     // Remove duplicates and sort in reverse order to avoid position shifts
     const uniqueRanges = Array.from(new Set(ranges.map((r)=>JSON.stringify(r)))).map((r)=>JSON.parse(r));
     uniqueRanges.sort((a, b)=>b[0] - a[0]);
-    // Remove each comment range
+    // Remove each comment range, extending to the full line when the comment is the only content
     for (const [pos, end] of uniqueRanges){
-        sourceFile.removeText(pos, end);
+        const fullText = sourceFile.getFullText();
+        let removeStart = pos;
+        let removeEnd = end;
+        // Find the start of the line containing this comment
+        let lineStart = pos;
+        while(lineStart > 0 && fullText[lineStart - 1] !== '\n'){
+            lineStart--;
+        }
+        const beforeComment = fullText.substring(lineStart, pos);
+        const nextNewline = fullText.indexOf('\n', end);
+        const afterComment = fullText.substring(end, nextNewline === -1 ? fullText.length : nextNewline);
+        // If the comment is the only content on this line, remove the entire line
+        if (beforeComment.trim() === '' && afterComment.trim() === '') {
+            removeStart = lineStart > 0 ? lineStart - 1 : lineStart;
+            if (nextNewline !== -1) {
+                removeEnd = nextNewline + 1;
+            }
+        }
+        sourceFile.removeText(removeStart, removeEnd);
     }
     return true;
 }

package/dist/utils/version-check.js

@@ -21,7 +21,7 @@ export async function checkForUpdates(currentVersion) {
         if (!latestVersion || latestVersion === currentVersion) {
             return;
         }
-        p.log.warn(pc.yellow(`@payloadcms/figma ${currentVersion} is outdated. Latest: ${latestVersion}`));
+        p.log.warn(pc.yellow(`@payloadcms/figma ${currentVersion} differs from latest. Latest: ${latestVersion}`));
         p.log.message(pc.dim(`  Run: npx @payloadcms/figma@${latestVersion} init --id <your-id>`));
     } catch  {
     // Silent catch - network errors, timeouts, parse errors should not interrupt CLI

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/figma",
-  "version": "0.0.1-alpha.60",
+  "version": "0.0.1-alpha.62",
   "license": "SEE LICENSE IN LICENSE.md",
   "type": "module",
   "exports": {
@@ -32,26 +32,26 @@
     "@sindresorhus/slugify": "^3.0.0",
     "archiver": "7.0.1",
     "arg": "^5.0.2",
-    "conf": "^13.0.1",
+    "conf": "^13.1.0",
     "cross-spawn": "7.0.6",
     "figures": "^6.1.0",
     "jose": "6.0.12",
     "jsonwebtoken": "9.0.3",
-    "open": "^10.1.0",
+    "open": "^10.2.0",
     "openapi-fetch": "0.15.0",
     "picocolors": "1.1.1",
-    "tar": "^7.4.3",
+    "tar": "^7.5.13",
     "terminal-link": "^5.0.0",
-    "ts-morph": "^21.0.0",
+    "ts-morph": "^21.0.1",
     "uuid": "^10.0.0"
   },
   "devDependencies": {
     "@types/archiver": "7.0.0",
     "@types/cross-spawn": "6.0.6",
     "@types/node": "22.12.0",
-    "openapi-typescript": "^7.10.1",
+    "openapi-typescript": "^7.13.0",
     "tsx": "4.20.6",
-    "typescript": "5.9.3",
+    "typescript": "5.7.3",
     "vitest": "4.0.15"
   },
   "peerDependencies": {