@wix/astro 1.0.18 → 1.0.20

package/src/utils/generateAppManifest.ts

@@ -14,7 +14,7 @@ import type {
 } from '../schemas.js';
 import type { Model } from '../types.js';
 
-export function generateAppManifest(model: Model) {
+export function generateAppManifest(model: Model): DevCenterAppManifest {
   const extensions = model.components
     .map((component) => component.manifest)
     .map((manifest) => {
@@ -22,7 +22,7 @@ export function generateAppManifest(model: Model) {
         case 'BACK_OFFICE_EXTENSION_MENU_ITEM':
           return manifest satisfies DevCenterBackofficeExtensionMenuItem;
         case 'BACK_OFFICE_EXTENSION_WIDGET':
-          if (manifest.compData.backOfficeExtensionWidget.iframeUrl) {
+          if (manifest.compData.backOfficeExtensionWidget.iframeUrl != null) {
             return manifest;
           }
 
@@ -36,7 +36,7 @@ export function generateAppManifest(model: Model) {
             },
           } satisfies DevCenterBackofficeExtensionWidget;
         case 'BACK_OFFICE_MODAL':
-          if (manifest.compData.backOfficeModal.iframeUrl) {
+          if (manifest.compData.backOfficeModal.iframeUrl != null) {
             return manifest;
           }
 
@@ -50,7 +50,7 @@ export function generateAppManifest(model: Model) {
             },
           } satisfies DevCenterBackofficeModal;
         case 'BACK_OFFICE_PAGE':
-          if (manifest.compData.backOfficePage.iframeUrl) {
+          if (manifest.compData.backOfficePage.iframeUrl != null) {
             return manifest;
           }
 
@@ -64,7 +64,7 @@ export function generateAppManifest(model: Model) {
             },
           } satisfies DevCenterBackofficePage;
         case 'ECOM_ADDITIONAL_FEES':
-          if (manifest.compData.ecomAdditionalFees.deploymentUri) {
+          if (manifest.compData.ecomAdditionalFees.deploymentUri != null) {
             return manifest;
           }
 
@@ -78,7 +78,7 @@ export function generateAppManifest(model: Model) {
             },
           } satisfies DevCenterEcomAdditionalFees;
         case 'ECOM_DISCOUNTS_TRIGGER':
-          if (manifest.compData.ecomDiscountsTrigger.deploymentUri) {
+          if (manifest.compData.ecomDiscountsTrigger.deploymentUri != null) {
             return manifest;
           }
 
@@ -92,7 +92,7 @@ export function generateAppManifest(model: Model) {
             },
           } satisfies DevCenterEcomDiscountsTrigger;
         case 'ECOM_PAYMENT_SETTINGS':
-          if (manifest.compData.ecomPaymentSettings.deploymentUri) {
+          if (manifest.compData.ecomPaymentSettings.deploymentUri != null) {
             return manifest;
           }
 
@@ -106,7 +106,7 @@ export function generateAppManifest(model: Model) {
             },
           } satisfies DevCenterEcomPaymentSettings;
         case 'ECOM_SHIPPING_RATES':
-          if (manifest.compData.ecomShippingRates.deploymentUri) {
+          if (manifest.compData.ecomShippingRates.deploymentUri != null) {
             return manifest;
           }
 
@@ -120,7 +120,7 @@ export function generateAppManifest(model: Model) {
             },
           } satisfies DevCenterEcomShippingRates;
         case 'ECOM_VALIDATIONS':
-          if (manifest.compData.ecomValidations.deploymentUri) {
+          if (manifest.compData.ecomValidations.deploymentUri != null) {
             return manifest;
           }
 
@@ -134,7 +134,7 @@ export function generateAppManifest(model: Model) {
             },
           } satisfies DevCenterEcomValidations;
         case 'GIFT_CARDS_PROVIDER':
-          if (manifest.compData.giftCardsProvider.deploymentUri) {
+          if (manifest.compData.giftCardsProvider.deploymentUri != null) {
             return manifest;
           }
 
@@ -148,7 +148,7 @@ export function generateAppManifest(model: Model) {
             },
           } satisfies DevCenterEcomGiftCardsProvider;
         case 'WEBHOOK':
-          if (manifest.compData.webhook.callbackUrl) {
+          if (manifest.compData.webhook.callbackUrl != null) {
             return manifest;
           }
 
@@ -173,5 +173,5 @@ export function generateAppManifest(model: Model) {
   return {
     appId: model.appId,
     components: [...extensions, ...unknownExtensions],
-  } satisfies DevCenterAppManifest;
+  };
 }

package/src/utils/generateVisitorTokens.ts

@@ -1,3 +1,4 @@
+import type { Tokens } from '@wix/sdk';
 import { OAuthStrategy } from '@wix/sdk';
 import { WIX_CLIENT_ID } from 'astro:env/client';
 
@@ -5,6 +6,6 @@ const auth = OAuthStrategy({
   clientId: WIX_CLIENT_ID,
 });
 
-export async function generateVisitorTokens() {
+export async function generateVisitorTokens(): Promise<Tokens> {
   return auth.generateVisitorTokens();
 }

package/src/utils/getSessionTokensFromCookie.ts

@@ -1,7 +1,7 @@
 import type { APIContext } from 'astro';
 import { TokenRole } from '@wix/sdk';
-import { WIX_CLIENT_ID } from 'astro:env/client';
 import { z } from 'astro/zod';
+import { WIX_CLIENT_ID } from 'astro:env/client';
 
 const tokensSchema = z.object({
   clientId: z.string(),
@@ -23,9 +23,9 @@ export function getSessionTokensFromCookie(
   context: APIContext
 ): null | SessionTokens {
   if (!context.isPrerendered) {
-    const rawCookie = context.cookies.get('wixSession')?.json();
+    const rawCookie = context.cookies.get('wixSession')?.json() as unknown;
 
-    if (rawCookie) {
+    if (rawCookie != null) {
       const tokensParseResult = tokensSchema.safeParse(rawCookie);
 
       if (

package/src/utils/isValidBackofficeComponent.ts

@@ -8,10 +8,11 @@ export function isValidBackofficeComponent(
   | Component<'BackofficePage'> {
   return (
     (component.type === 'BackofficePage' &&
-      !component.manifest.compData.backOfficePage.iframeUrl) ||
+      component.manifest.compData.backOfficePage.iframeUrl == null) ||
     (component.type === 'BackofficeExtensionWidget' &&
-      !component.manifest.compData.backOfficeExtensionWidget.iframeUrl) ||
+      component.manifest.compData.backOfficeExtensionWidget.iframeUrl ==
+        null) ||
     (component.type === 'BackofficeModal' &&
-      !component.manifest.compData.backOfficeModal.iframeUrl)
+      component.manifest.compData.backOfficeModal.iframeUrl == null)
   );
 }

package/src/utils/isValidServicePluginComponent.ts

@@ -11,16 +11,16 @@ export function isValidServicePluginComponent(
   | Component<'EcomValidations'> {
   return (
     (component.type === 'EcomShippingRates' &&
-      !component.manifest.compData.ecomShippingRates.deploymentUri) ||
+      component.manifest.compData.ecomShippingRates.deploymentUri == null) ||
     (component.type === 'EcomAdditionalFees' &&
-      !component.manifest.compData.ecomAdditionalFees.deploymentUri) ||
+      component.manifest.compData.ecomAdditionalFees.deploymentUri == null) ||
     (component.type === 'EcomDiscountsTrigger' &&
-      !component.manifest.compData.ecomDiscountsTrigger.deploymentUri) ||
+      component.manifest.compData.ecomDiscountsTrigger.deploymentUri == null) ||
     (component.type === 'EcomValidations' &&
-      !component.manifest.compData.ecomValidations.deploymentUri) ||
+      component.manifest.compData.ecomValidations.deploymentUri == null) ||
     (component.type === 'EcomPaymentSettings' &&
-      !component.manifest.compData.ecomPaymentSettings.deploymentUri) ||
+      component.manifest.compData.ecomPaymentSettings.deploymentUri == null) ||
     (component.type === 'EcomGiftCardsProvider' &&
-      !component.manifest.compData.giftCardsProvider.deploymentUri)
+      component.manifest.compData.giftCardsProvider.deploymentUri == null)
   );
 }

package/src/utils/isValidWebhookComponent.ts

@@ -5,6 +5,6 @@ export function isValidWebhookComponent(
 ): component is Component<'Webhook'> {
   return (
     component.type === 'Webhook' &&
-    !component.manifest.compData.webhook.callbackUrl
+    component.manifest.compData.webhook.callbackUrl == null
   );
 }

package/src/utils/loadEnvVars.ts

@@ -5,11 +5,14 @@ import { loadEnv } from 'vite';
 
 const wixClientIdEnvVar = 'WIX_CLIENT_ID';
 
-export function loadEnvVars(rootDir: string, logger: AstroIntegrationLogger) {
+export function loadEnvVars(logger: AstroIntegrationLogger): {
+  appId: string;
+  env: Record<string, string>;
+} {
   const env = loadEnv(process.env.NODE_ENV ?? 'development', process.cwd(), '');
   const appId = env[wixClientIdEnvVar];
 
-  if (!appId) {
+  if (appId == null) {
     logger.error(
       outdent`
         Missing environment variable ${chalk.blueBright(wixClientIdEnvVar)}

package/src/utils/saveSessionTokensToCookie.ts

@@ -2,16 +2,19 @@ import type { Tokens } from '@wix/sdk';
 import type { APIContext } from 'astro';
 import { WIX_CLIENT_ID } from 'astro:env/client';
 
+export function saveSessionTokensToCookie(
+  context: APIContext,
+  tokens: Tokens
+): void {
+  context.cookies.set('wixSession', sessionCookieJson(tokens), {
+    path: '/',
+    secure: true,
+  });
+}
+
 function sessionCookieJson(tokens: Tokens) {
   return {
     clientId: WIX_CLIENT_ID,
     tokens,
   };
 }
-
-export function saveSessionTokensToCookie(context: APIContext, tokens: Tokens) {
-  context.cookies.set('wixSession', sessionCookieJson(tokens), {
-    path: '/',
-    secure: true,
-  });
-}

package/src/utils/writeVirtualBackofficeExtensionFiles.ts

@@ -11,7 +11,7 @@ import { toRelativePath } from './fs-utils.js';
 export async function writeVirtualBackofficeExtensionFiles(
   model: Model,
   codegenDir: string
-) {
+): Promise<void> {
   const backofficeComponents = model.components.filter(
     isValidBackofficeComponent
   );

package/src/utils/writeVirtualServicePluginExtensionFiles.ts

@@ -9,7 +9,7 @@ import { isValidServicePluginComponent } from './isValidServicePluginComponent.j
 export async function writeVirtualServicePluginExtensionFiles(
   model: Model,
   codegenDir: string
-) {
+): Promise<void> {
   const servicePluginComponents = model.components.filter(
     isValidServicePluginComponent
   );

package/src/utils/writeVirtualWebhookExtensionFiles.ts

@@ -9,7 +9,7 @@ import { isValidWebhookComponent } from './isValidWebhookComponent.js';
 export async function writeVirtualWebhookExtensionFiles(
   model: Model,
   codegenDir: string
-) {
+): Promise<void> {
   const webhookComponents = model.components.filter(isValidWebhookComponent);
 
   const existingFiles = await globby(`*.ts`, {

package/tsup.config.mjs

@@ -8,21 +8,21 @@ const astroExternals = ['astro', /^astro:/];
 export default defineConfig([
   // astro integration
   {
-    entry: ['src/index.ts'],
-    target: 'node20.9',
-    format: ['esm'],
-    outDir: 'build',
     clean: true,
-    sourcemap: true,
-    external: [...astroExternals, ...viteExternals],
     dts: {
       resolve: [...astroExternals, ...viteExternals],
     },
+    entry: ['src/index.ts'],
+    external: [...astroExternals, ...viteExternals],
+    format: ['esm'],
+    outDir: 'build',
+    sourcemap: true,
+    target: 'node20.9',
     // We specifically do not minify the code in packages **for node** in order to keep it readable for debugging purposes.
-    minify: false,
     env: {
       NODE_ENV: isCI ? 'production' : 'development',
     },
+    minify: false,
     shims: true,
     // https://github.com/evanw/esbuild/issues/1921
     banner: {
@@ -34,6 +34,9 @@ export default defineConfig([
   },
   // backend runtime
   {
+    dts: {
+      resolve: [...astroExternals, ...viteExternals],
+    },
     entry: [
       // extensions
       'src/routes/webhooks.ts',
@@ -50,23 +53,20 @@ export default defineConfig([
       'src/routes/auth/callback.ts',
       'src/routes/auth/logout-callback.ts',
     ],
-    target: 'node20.9',
+    external: [...astroExternals, ...viteExternals],
     format: ['esm'],
     outDir: 'build-runtime',
-    external: [...astroExternals, ...viteExternals],
-    dts: {
-      resolve: [...astroExternals, ...viteExternals],
-    },
+    target: 'node20.9',
   },
   // browser runtime
   {
-    entry: ['src/context/setup.ts'],
-    target: 'chrome130',
-    format: ['esm'],
-    outDir: 'build-browser-runtime',
-    external: [...astroExternals, ...viteExternals, '@wix/sdk-context'],
     dts: {
       resolve: [...astroExternals, ...viteExternals, '@wix/sdk-context'],
     },
+    entry: ['src/context/setup.ts'],
+    external: [...astroExternals, ...viteExternals, '@wix/sdk-context'],
+    format: ['esm'],
+    outDir: 'build-browser-runtime',
+    target: 'chrome130',
   },
 ]);

package/build-runtime/{chunk-HVACFX6T.js → chunk-VMS3NKCF.js}

@@ -1,17 +1,17 @@
 // src/utils/saveSessionTokensToCookie.ts
 import { WIX_CLIENT_ID } from "astro:env/client";
-function sessionCookieJson(tokens) {
-  return {
-    clientId: WIX_CLIENT_ID,
-    tokens
-  };
-}
 function saveSessionTokensToCookie(context, tokens) {
   context.cookies.set("wixSession", sessionCookieJson(tokens), {
     path: "/",
     secure: true
   });
 }
+function sessionCookieJson(tokens) {
+  return {
+    clientId: WIX_CLIENT_ID,
+    tokens
+  };
+}
 
 export {
   saveSessionTokensToCookie