@wix/astro 1.0.14 → 1.0.16

package/build/index.js

@@ -8611,15 +8611,15 @@ var require_pattern = __commonJS({
     exports.removeDuplicateSlashes = removeDuplicateSlashes;
     function partitionAbsoluteAndRelative(patterns) {
       const absolute = [];
-      const relative = [];
+      const relative2 = [];
       for (const pattern of patterns) {
         if (isAbsolute(pattern)) {
           absolute.push(pattern);
         } else {
-          relative.push(pattern);
+          relative2.push(pattern);
         }
       }
-      return [absolute, relative];
+      return [absolute, relative2];
     }
     exports.partitionAbsoluteAndRelative = partitionAbsoluteAndRelative;
     function isAbsolute(pattern) {
@@ -12285,7 +12285,7 @@ var require_lib = __commonJS({
 // src/index.ts
 init_esm_shims();
 var import_chokidar = __toESM(require_chokidar(), 1);
-import { join as join6 } from "node:path";
+import { join as join7 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 import { envField, passthroughImageService } from "astro/config";
 
@@ -12468,9 +12468,45 @@ function patchGlobal() {
   ];
 }
 
+// src/plugins/setupSsrContext.ts
+init_esm_shims();
+import { extname, join as join2 } from "node:path";
+function setupSsrContext(rootDir) {
+  const srcDir = join2(rootDir, SRC_DIR);
+  const nonElevatedSetupUrl = new URL(
+    "../build-runtime/context/non-elevated.js",
+    import.meta.url
+  );
+  const elevatedSetupUrl = new URL(
+    "../build-runtime/context/elevated.js",
+    import.meta.url
+  );
+  return {
+    applyToEnvironment(environment) {
+      return environment.name === "ssr";
+    },
+    name: "setup-ssr-context",
+    transform(code, id) {
+      if (!id.startsWith(srcDir)) {
+        return null;
+      }
+      const extension = extname(id);
+      if (extension !== ".js" && extension !== ".astro" && extension !== ".ts" && extension !== ".tsx") {
+        return null;
+      }
+      return defaultOutdent`
+        import '${nonElevatedSetupUrl}';
+        import '${elevatedSetupUrl}';
+
+        ${code}
+      `;
+    }
+  };
+}
+
 // src/utils/createProjectModel.ts
 init_esm_shims();
-import { join as join2 } from "node:path";
+import { join as join3 } from "node:path";
 import { cwd } from "node:process";
 
 // ../../node_modules/globby/index.js
@@ -17219,7 +17255,7 @@ import {
   writeFile
 } from "node:fs/promises";
 import { EOL } from "node:os";
-import { dirname } from "node:path";
+import { dirname, relative } from "node:path";
 function toJsonString(object, opts) {
   return JSON.stringify(object, null, opts?.spaces).concat(EOL);
 }
@@ -17237,6 +17273,10 @@ function pathExists(path2) {
 async function outputDir(dir) {
   await mkdir(dir, { recursive: true });
 }
+function toRelativePath2(from, to) {
+  const rel = relative(dirname(from), to).replaceAll("\\", "/");
+  return rel.startsWith(".") ? rel : `./${rel}`;
+}
 
 // src/utils/loadEnvVars.ts
 init_esm_shims();
@@ -17773,7 +17813,7 @@ async function createProjectModel(logger) {
   const rootDir = cwd();
   const { appId, env: env2 } = loadEnvVars(rootDir, logger);
   const componentsPaths = await globby(
-    pathToGlobby(join2(EXTENSIONS_DIR, "*")),
+    pathToGlobby(join3(EXTENSIONS_DIR, "*")),
     {
       cwd: rootDir,
       onlyDirectories: true
@@ -17895,7 +17935,7 @@ async function parseBaseExtensionManifest(extensionManifest) {
   return appManifestResult.data;
 }
 async function readExtensionManifest(directoryPath) {
-  const manifestFilePath = join2(directoryPath, "extension.json");
+  const manifestFilePath = join3(directoryPath, "extension.json");
   if (!await pathExists(manifestFilePath)) {
     throw new Error("Missing extension manifest");
   }
@@ -18090,7 +18130,7 @@ async function resolveBuildMetadata(appManifestPath, config) {
 // src/utils/writeVirtualBackofficeExtensionFiles.ts
 init_esm_shims();
 import { rm, writeFile as writeFile2 } from "node:fs/promises";
-import { join as join3, resolve } from "node:path";
+import { join as join4, resolve } from "node:path";
 var import_variant2 = __toESM(require_lib(), 1);
 async function writeVirtualBackofficeExtensionFiles(model, codegenDir) {
   const backofficeComponents = model.components.filter(
@@ -18107,12 +18147,12 @@ async function writeVirtualBackofficeExtensionFiles(model, codegenDir) {
     if (hasMatchingSourceFile) {
       continue;
     }
-    await rm(join3(codegenDir, filename));
+    await rm(join4(codegenDir, filename));
   }
   for (const component of backofficeComponents) {
     const entryFilename = resolveEntry(component);
     const originalEntrypoint = resolve(model.rootDir, entryFilename);
-    const virtualEntrypoint = join3(
+    const virtualEntrypoint = join4(
       codegenDir,
       `${component.manifest.compId}.astro`
     );
@@ -18120,7 +18160,7 @@ async function writeVirtualBackofficeExtensionFiles(model, codegenDir) {
       virtualEntrypoint,
       defaultOutdent`
         ---
-        import Component from '${originalEntrypoint}';
+        import Component from '${toRelativePath2(virtualEntrypoint, originalEntrypoint)}';
         ---
 
         <div>
@@ -18136,13 +18176,13 @@ function resolveEntry(component) {
     BackofficeModal: () => "modal.tsx",
     BackofficePage: () => "page.tsx"
   });
-  return join3(component.directory, entryName);
+  return join4(component.directory, entryName);
 }
 
 // src/utils/writeVirtualServicePluginExtensionFiles.ts
 init_esm_shims();
 import { rm as rm2, writeFile as writeFile3 } from "node:fs/promises";
-import { join as join4, resolve as resolve2 } from "node:path";
+import { join as join5, resolve as resolve2 } from "node:path";
 async function writeVirtualServicePluginExtensionFiles(model, codegenDir) {
   const servicePluginComponents = model.components.filter(
     isValidServicePluginComponent
@@ -18158,11 +18198,11 @@ async function writeVirtualServicePluginExtensionFiles(model, codegenDir) {
     if (hasMatchingSourceFile) {
       continue;
     }
-    await rm2(join4(codegenDir, filename));
+    await rm2(join5(codegenDir, filename));
   }
   for (const component of servicePluginComponents) {
     const originalEntrypoint = resolve2(component.directory, "plugin.ts");
-    const virtualEntrypoint = join4(
+    const virtualEntrypoint = join5(
       codegenDir,
       `${component.manifest.compId}.ts`
     );
@@ -18186,7 +18226,7 @@ async function writeVirtualServicePluginExtensionFiles(model, codegenDir) {
 
         client.enableContext('global');
 
-        await import('${originalEntrypoint}');
+        await import('${toRelativePath2(virtualEntrypoint, originalEntrypoint)}');
 
         if (olderClient) {
           olderClient.enableContext('global');
@@ -18203,7 +18243,7 @@ async function writeVirtualServicePluginExtensionFiles(model, codegenDir) {
 // src/utils/writeVirtualWebhookExtensionFiles.ts
 init_esm_shims();
 import { rm as rm3, writeFile as writeFile4 } from "node:fs/promises";
-import { join as join5, resolve as resolve3 } from "node:path";
+import { join as join6, resolve as resolve3 } from "node:path";
 async function writeVirtualWebhookExtensionFiles(model, codegenDir) {
   const webhookComponents = model.components.filter(isValidWebhookComponent);
   const existingFiles = await globby(`*.ts`, {
@@ -18217,11 +18257,11 @@ async function writeVirtualWebhookExtensionFiles(model, codegenDir) {
     if (hasMatchingSourceFile) {
       continue;
     }
-    await rm3(join5(codegenDir, filename));
+    await rm3(join6(codegenDir, filename));
   }
   for (const component of webhookComponents) {
     const originalEntrypoint = resolve3(component.directory, "event.ts");
-    const virtualEntrypoint = join5(
+    const virtualEntrypoint = join6(
       codegenDir,
       `${component.manifest.compId}.ts`
     );
@@ -18245,7 +18285,7 @@ async function writeVirtualWebhookExtensionFiles(model, codegenDir) {
 
         client.enableContext('global');
 
-        await import('${originalEntrypoint}');
+        await import('${toRelativePath2(virtualEntrypoint, originalEntrypoint)}');
 
         if (olderClient) {
           olderClient.enableContext('global');
@@ -18271,10 +18311,10 @@ var createIntegration = () => {
         const appManifest = generateAppManifest(model);
         const outDir = fileURLToPath3(_config.outDir);
         const rootDir = fileURLToPath3(_config.root);
-        const appManifestPath = join6(outDir, "_wix/app-manifest.json");
+        const appManifestPath = join7(outDir, "_wix/app-manifest.json");
         await writeJson(appManifestPath, appManifest, { spaces: 2 });
         await writeJson(
-          join6(rootDir, GIT_IGNORED_DIR, "build-metadata.json"),
+          join7(rootDir, GIT_IGNORED_DIR, "build-metadata.json"),
           await resolveBuildMetadata(appManifestPath, _config),
           { spaces: 2 }
         );
@@ -18299,15 +18339,19 @@ var createIntegration = () => {
         injectScript(
           "before-hydration",
           defaultOutdent`
+            import { WIX_CLIENT_ID } from 'astro:env/client';
             import { setup } from '@wix/astro/context/before-hydration';
-            setup();
+
+            setup({ clientId: WIX_CLIENT_ID });
           `
         );
         injectScript(
           "page",
           defaultOutdent`
+            import { WIX_CLIENT_ID } from 'astro:env/client';
             import { setup } from '@wix/astro/context/page';
-            setup();
+
+            setup({ clientId: WIX_CLIENT_ID });
           `
         );
         addMiddleware({
@@ -18343,10 +18387,14 @@ var createIntegration = () => {
             service: passthroughImageService()
           },
           vite: {
-            plugins: [patchGlobal(), patchAstroInlineScripts()]
+            plugins: [
+              patchGlobal(),
+              patchAstroInlineScripts(),
+              setupSsrContext(rootDir)
+            ]
           }
         });
-        const webhookCodegenDir = join6(codegenDir, "extensions/webhooks");
+        const webhookCodegenDir = join7(codegenDir, "extensions/webhooks");
         await outputDir(webhookCodegenDir);
         if (command === "dev") {
           injectRoute({
@@ -18370,7 +18418,7 @@ var createIntegration = () => {
             isValidWebhookComponent
           );
           for (const component of webhookComponents) {
-            const virtualEntrypoint = join6(
+            const virtualEntrypoint = join7(
               webhookCodegenDir,
               `${component.manifest.compId}.ts`
             );
@@ -18381,7 +18429,7 @@ var createIntegration = () => {
           }
         }
         await writeVirtualWebhookExtensionFiles(model, webhookCodegenDir);
-        const servicePluginCodegenDir = join6(
+        const servicePluginCodegenDir = join7(
           codegenDir,
           "extensions/service-plugins"
         );
@@ -18411,7 +18459,7 @@ var createIntegration = () => {
             isValidServicePluginComponent
           );
           for (const component of servicePluginComponents) {
-            const virtualEntrypoint = join6(
+            const virtualEntrypoint = join7(
               servicePluginCodegenDir,
               `${component.manifest.compId}.ts`
             );
@@ -18425,7 +18473,7 @@ var createIntegration = () => {
           model,
           servicePluginCodegenDir
         );
-        const backofficeCodegenDir = join6(codegenDir, "extensions/backoffice");
+        const backofficeCodegenDir = join7(codegenDir, "extensions/backoffice");
         await outputDir(backofficeCodegenDir);
         if (command === "dev") {
           injectRoute({
@@ -18449,7 +18497,7 @@ var createIntegration = () => {
             isValidBackofficeComponent
           );
           for (const component of backofficeComponents) {
-            const virtualEntrypoint = join6(
+            const virtualEntrypoint = join7(
               backofficeCodegenDir,
               `${component.manifest.compId}.astro`
             );