@wix/origami-site 0.1.19 → 0.1.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/origami-site",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "description": "Runs an exported Wix origami site: file-based routing, Wix dynamic pages, popups and build checks. Use with @wix/origami-site-astro or @wix/origami-site-express.",
   "type": "module",
   "files": [
@@ -48,9 +48,11 @@
     "@wix/origami-types": "1.4.0",
     "@wix/builder-error-pages": "^1.1.6",
     "@wix/builder-piler-components": "^1.6.7",
-    "@wix/origami-transforms": "0.1.11",
+    "@wix/origami-transforms": "0.1.12",
     "@babel/parser": "^7.25.0",
-    "@wix/system-core-components": "^1.3.10"
+    "@wix/system-core-components": "^1.3.10",
+    "@wix/origami-services": "1.0.0",
+    "@wix/services-manager-react": "^1.0.8"
   },
   "exports": {
     "./server": {
@@ -91,5 +93,5 @@
       "optional": true
     }
   },
-  "falconPackageHash": "0c04ba80f9a2e61581387449cc08422f3616a50308d1d5691f31751f"
+  "falconPackageHash": "e514bdb7045f0acc5bb6538bca6aa81fdd740d9a7d70429ebf1309b5"
 }

package/src/browser/index.js

@@ -1,5 +1,8 @@
 import { createElement, StrictMode } from 'react'
 import { createRoot } from 'react-dom/client'
+import { registeredServicesConfigs, sealServicesConfigs } from '@wix/origami-services/internal'
+import { servicesMap } from '@wix/origami-services'
+import { WixServices } from '@wix/services-manager-react'
 import { PilerPage } from '@wix/builder-piler-components'
 
 let hasReadPageData = false
@@ -49,9 +52,13 @@ export async function mountPage(element, { pages, beforeMount }) {
     } catch (error) {
         console.error(error)
     }
-    // Generated page providers read PageData.services during this import.
+    // Loading the page registers its globals and own DM configs before services are created.
     const { default: Page } = await loadPage()
+    const map = servicesMap({ servicesConfigs: registeredServicesConfigs(), requestConfigs: data?.services ?? {}, url: location.href })
+    sealServicesConfigs()
     const root = createRoot(element)
-    root.render(createElement(StrictMode, null, createElement(PilerPage, { Page })))
+    // Stage 3: PopupHost belongs inside WixServices so popups share page services.
+    root.render(createElement(StrictMode, null,
+        createElement(WixServices, { servicesMap: map, children: createElement(PilerPage, { Page }) })))
     return () => root.unmount()
 }

package/src/build/sharedPackages.js

@@ -6,6 +6,7 @@ export function sharedPackages() {
             'react',
             'react-dom',
             '@wix/services-manager-react',
+            '@wix/origami-services',
             '@wix/sdk-react-context',
             '@preact/signals-react',
             '@preact/signals-core',

package/src/server/requests/createSite.js

@@ -79,7 +79,9 @@ export async function createSite(options) {
      * @param {import('../index.js').PageData['route']} routeData @param {Record<string, unknown>} services @param {HeadersInit} [headers] */
     function pageResolution(route, status, routeData, services = {}, headers = {}) {
         const page = { key: route.key, title: route.title, ...(route.itemPath === undefined ? {} : { itemPath: route.itemPath }) }
-        return { kind: /** @type {const} */ ('page'), status, page, data: { page: page.key, route: routeData, services }, headers: new Headers(headers) }
+        // Identity and dynamic-route configs use different services; merge per service if server layers ever overlap.
+        const identity = wix.siteId ? { '@wix/viewer-service-environment': { metaSiteId: wix.siteId } } : {}
+        return { kind: /** @type {const} */ ('page'), status, page, data: { page: page.key, route: routeData, services: { ...identity, ...services } }, headers: new Headers(headers) }
     }
     /** @param {Extract<import('../index.js').RouteMatch, { kind: 'router' }>} match @param {URL} url @param {string} path */
     async function resolveRouter(match, url, path, current, request, context) {
@@ -109,11 +111,8 @@ export async function createSite(options) {
             const { status, statusText, body } = denied.response
             return { kind: /** @type {const} */ ('response'), response: new Response(body, { status, statusText, headers }) }
         }
-        const externalBaseUrl = url.origin
         return pageResolution(rolePage, 200, { kind: 'router', url: path, role: rolePage.role }, {
             '@wix/viewer-service-dynamic-route': { dynamicRouteData: { pageData: answer.data, publicData: answer.publicData } },
-            '@wix/site-service-url': { externalBaseUrl },
-            '@wix/viewer-service-url': { externalBaseUrl },
         }, noStore)
     }
     return {