@wix/astro 1.0.21 → 1.0.23

package/src/schemas.ts

@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import * as z from 'zod/v4';
 
 export const baseDevCenterComponentSchema = z
   .object({
@@ -7,190 +7,199 @@ export const baseDevCenterComponentSchema = z
     compName: z.string().optional(),
     compType: z.string(),
   })
-  .passthrough();
+  .loose();
 
 export type BaseDevCenterComponent = z.TypeOf<
   typeof baseDevCenterComponentSchema
 >;
 
-const devCenterWebhookSchema = baseDevCenterComponentSchema.merge(
-  z.object({
+const devCenterWebhookSchema = z.object({
+  ...baseDevCenterComponentSchema.shape,
+  ...z.object({
     compData: z.object({
       webhook: z
         .object({
           callbackUrl: z.string().optional(),
         })
-        .passthrough(),
+        .loose(),
     }),
     compType: z.literal('WEBHOOK'),
-  })
-);
+  }).shape,
+});
 
 export type DevCenterWebhook = z.TypeOf<typeof devCenterWebhookSchema>;
 
-const devCenterBackofficeExtensionWidgetSchema =
-  baseDevCenterComponentSchema.merge(
-    z.object({
-      compData: z.object({
-        backOfficeExtensionWidget: z
-          .object({
-            iframeUrl: z.string().optional(),
-          })
-          .passthrough(),
-      }),
-      compType: z.literal('BACK_OFFICE_EXTENSION_WIDGET'),
-    })
-  );
+const devCenterBackofficeExtensionWidgetSchema = z.object({
+  ...baseDevCenterComponentSchema.shape,
+  ...z.object({
+    compData: z.object({
+      backOfficeExtensionWidget: z
+        .object({
+          iframeUrl: z.string().optional(),
+        })
+        .loose(),
+    }),
+    compType: z.literal('BACK_OFFICE_EXTENSION_WIDGET'),
+  }).shape,
+});
 
 export type DevCenterBackofficeExtensionWidget = z.TypeOf<
   typeof devCenterBackofficeExtensionWidgetSchema
 >;
 
-const devCenterBackofficeExtensionMenuPluginSchema =
-  baseDevCenterComponentSchema.merge(
-    z.object({
-      compData: z.object({
-        backOfficeExtensionMenuItem: z.unknown().optional(),
-      }),
-      compType: z.literal('BACK_OFFICE_EXTENSION_MENU_ITEM'),
-    })
-  );
+const devCenterBackofficeExtensionMenuPluginSchema = z.object({
+  ...baseDevCenterComponentSchema.shape,
+  ...z.object({
+    compData: z.object({
+      backOfficeExtensionMenuItem: z.unknown().optional(),
+    }),
+    compType: z.literal('BACK_OFFICE_EXTENSION_MENU_ITEM'),
+  }).shape,
+});
 
 export type DevCenterBackofficeExtensionMenuItem = z.TypeOf<
   typeof devCenterBackofficeExtensionMenuPluginSchema
 >;
 
-const devCenterBackofficeModalSchema = baseDevCenterComponentSchema.merge(
-  z.object({
+const devCenterBackofficeModalSchema = z.object({
+  ...baseDevCenterComponentSchema.shape,
+  ...z.object({
     compData: z.object({
       backOfficeModal: z
         .object({
           iframeUrl: z.string().optional(),
         })
-        .passthrough(),
+        .loose(),
     }),
     compType: z.literal('BACK_OFFICE_MODAL'),
-  })
-);
+  }).shape,
+});
 
 export type DevCenterBackofficeModal = z.TypeOf<
   typeof devCenterBackofficeModalSchema
 >;
 
-const devCenterBackofficePageSchema = baseDevCenterComponentSchema.merge(
-  z.object({
+const devCenterBackofficePageSchema = z.object({
+  ...baseDevCenterComponentSchema.shape,
+  ...z.object({
     compData: z.object({
       backOfficePage: z
         .object({
           iframeUrl: z.string().optional(),
         })
-        .passthrough(),
+        .loose(),
     }),
     compType: z.literal('BACK_OFFICE_PAGE'),
-  })
-);
+  }).shape,
+});
 
 export type DevCenterBackofficePage = z.TypeOf<
   typeof devCenterBackofficePageSchema
 >;
 
-const devCenterEcomAdditionalFeesSchema = baseDevCenterComponentSchema.merge(
-  z.object({
+const devCenterEcomAdditionalFeesSchema = z.object({
+  ...baseDevCenterComponentSchema.shape,
+  ...z.object({
     compData: z.object({
       ecomAdditionalFees: z
         .object({
           deploymentUri: z.string().optional(),
         })
-        .passthrough(),
+        .loose(),
     }),
     compType: z.literal('ECOM_ADDITIONAL_FEES'),
-  })
-);
+  }).shape,
+});
 
 export type DevCenterEcomAdditionalFees = z.TypeOf<
   typeof devCenterEcomAdditionalFeesSchema
 >;
 
-const devCenterEcomDiscountsTriggerSchema = baseDevCenterComponentSchema.merge(
-  z.object({
+const devCenterEcomDiscountsTriggerSchema = z.object({
+  ...baseDevCenterComponentSchema.shape,
+  ...z.object({
     compData: z.object({
       ecomDiscountsTrigger: z
         .object({
           deploymentUri: z.string().optional(),
         })
-        .passthrough(),
+        .loose(),
     }),
     compType: z.literal('ECOM_DISCOUNTS_TRIGGER'),
-  })
-);
+  }).shape,
+});
 
 export type DevCenterEcomDiscountsTrigger = z.TypeOf<
   typeof devCenterEcomDiscountsTriggerSchema
 >;
 
-const devCenterEcomPaymentSettingsSchema = baseDevCenterComponentSchema.merge(
-  z.object({
+const devCenterEcomPaymentSettingsSchema = z.object({
+  ...baseDevCenterComponentSchema.shape,
+  ...z.object({
     compData: z.object({
       ecomPaymentSettings: z
         .object({
           deploymentUri: z.string().optional(),
         })
-        .passthrough(),
+        .loose(),
     }),
     compType: z.literal('ECOM_PAYMENT_SETTINGS'),
-  })
-);
+  }).shape,
+});
 
 export type DevCenterEcomPaymentSettings = z.TypeOf<
   typeof devCenterEcomPaymentSettingsSchema
 >;
 
-const devCenterEcomShippingRatesSchema = baseDevCenterComponentSchema.merge(
-  z.object({
+const devCenterEcomShippingRatesSchema = z.object({
+  ...baseDevCenterComponentSchema.shape,
+  ...z.object({
     compData: z.object({
       ecomShippingRates: z
         .object({
           deploymentUri: z.string().optional(),
         })
-        .passthrough(),
+        .loose(),
     }),
     compType: z.literal('ECOM_SHIPPING_RATES'),
-  })
-);
+  }).shape,
+});
 
 export type DevCenterEcomShippingRates = z.TypeOf<
   typeof devCenterEcomShippingRatesSchema
 >;
 
-const devCenterEcomValidationsSchema = baseDevCenterComponentSchema.merge(
-  z.object({
+const devCenterEcomValidationsSchema = z.object({
+  ...baseDevCenterComponentSchema.shape,
+  ...z.object({
     compData: z.object({
       ecomValidations: z
         .object({
           deploymentUri: z.string().optional(),
         })
-        .passthrough(),
+        .loose(),
     }),
     compType: z.literal('ECOM_VALIDATIONS'),
-  })
-);
+  }).shape,
+});
 
 export type DevCenterEcomValidations = z.TypeOf<
   typeof devCenterEcomValidationsSchema
 >;
 
-const devCenterEcomGiftCardsProviderSchema = baseDevCenterComponentSchema.merge(
-  z.object({
+const devCenterEcomGiftCardsProviderSchema = z.object({
+  ...baseDevCenterComponentSchema.shape,
+  ...z.object({
     compData: z.object({
       giftCardsProvider: z
         .object({
           deploymentUri: z.string().optional(),
         })
-        .passthrough(),
+        .loose(),
     }),
     compType: z.literal('GIFT_CARDS_PROVIDER'),
-  })
-);
+  }).shape,
+});
 
 export type DevCenterEcomGiftCardsProvider = z.TypeOf<
   typeof devCenterEcomGiftCardsProviderSchema

package/src/utils/authAsyncLocalStorage.ts

@@ -1,6 +1,6 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
-import type { SessionTokens } from './getSessionTokensFromCookie.js';
+import type { Tokens } from '@wix/sdk';
 
 export const authAsyncLocalStorage = new AsyncLocalStorage<{
-  sessionTokens: null | SessionTokens;
+  sessionTokens: Tokens;
 }>();

package/src/utils/createProjectModel.ts

@@ -139,7 +139,7 @@ function parseBaseExtensionManifest(extensionManifest: unknown) {
     throw new Error(outdent`
       Invalid extension configuration:
 
-      ${appManifestResult.error.errors
+      ${appManifestResult.error.issues
         .map((e) => `${e.path.join('.')}: ${e.message}`)
         .join('\n')}
     `);

package/src/utils/getSessionTokensFromCookie.ts

@@ -1,3 +1,4 @@
+import type { Tokens } from '@wix/sdk';
 import type { APIContext } from 'astro';
 import { TokenRole } from '@wix/sdk';
 import { z } from 'astro/zod';
@@ -17,11 +18,7 @@ const tokensSchema = z.object({
   }),
 });
 
-export type SessionTokens = z.infer<typeof tokensSchema>;
-
-export function getSessionTokensFromCookie(
-  context: APIContext
-): null | SessionTokens {
+export function getSessionTokensFromCookie(context: APIContext): null | Tokens {
   if (!context.isPrerendered) {
     const rawCookie = context.cookies.get('wixSession')?.json() as unknown;
 
@@ -32,7 +29,7 @@ export function getSessionTokensFromCookie(
         tokensParseResult.success &&
         tokensParseResult.data.clientId === WIX_CLIENT_ID
       ) {
-        return tokensParseResult.data;
+        return tokensParseResult.data.tokens;
       }
     }
   }

package/src/utils/loadEnvVars.ts

@@ -20,7 +20,7 @@ export function loadEnvVars(logger: AstroIntegrationLogger): {
           wixClientIdEnvVar
         )} environment variable.
         💡 To pull the required environment variables from Wix, run:
-          ${chalk.magenta('npx wix edge env --env local pull')}
+          ${chalk.magenta('npx wix env pull')}
         🔍 Need Help?
         - Visit our docs: https://dev.wix.com/docs/go-headless
         - Join the community: https://discord.com/channels/1114269395317968906/1288424190969511987

package/src/utils/transformStreamUtils.ts

@@ -0,0 +1,39 @@
+export function injectAfterTransformStream(
+  predicate: RegExp,
+  htmlToInject: string
+): TransformStream<string> {
+  let hasInjected = false;
+  return new TransformStream<string>({
+    transform: (chunk, controller) => {
+      if (!hasInjected) {
+        const index = predicate.exec(chunk);
+        if (index) {
+          const position = index.index + index[0].length;
+          chunk =
+            chunk.slice(0, position) + htmlToInject + chunk.slice(position);
+          hasInjected = true;
+        }
+      }
+      controller.enqueue(chunk);
+    },
+  });
+}
+
+export function injectBeforeTransformStream(
+  predicate: string,
+  htmlToInject: string
+): TransformStream<string> {
+  let hasInjected = false;
+  return new TransformStream<string>({
+    transform: (chunk, controller) => {
+      if (!hasInjected) {
+        const index = chunk.indexOf(predicate);
+        if (index > -1) {
+          chunk = chunk.slice(0, index) + htmlToInject + chunk.slice(index);
+          hasInjected = true;
+        }
+      }
+      controller.enqueue(chunk);
+    },
+  });
+}

package/src/utils/writeVirtualBackofficeExtensionFiles.ts

@@ -64,9 +64,14 @@ export async function writeVirtualBackofficeExtensionFiles(
         import { WrappedComponent } from '${toRelativePath(virtualEntrypoint, virtualHocEntrypoint)}';
         ---
 
-        <div>
-          <WrappedComponent client:only="react" />
-        </div>
+        <html lang="en">
+          <head></head>
+          <body>
+            <div>
+              <WrappedComponent client:only="react" />
+            </div>
+          </body>
+        </html>
       `
     );
   }

package/tsup.config.mjs

@@ -52,6 +52,9 @@ export default defineConfig([
       'src/routes/auth/logout.ts',
       'src/routes/auth/callback.ts',
       'src/routes/auth/logout-callback.ts',
+
+      // html embeds
+      'src/middleware/html-embeds.ts',
     ],
     external: [...astroExternals, ...viteExternals],
     format: ['esm'],