payment-kit 1.29.1 → 1.29.3

package/cloudflare/vite.config.ts

@@ -4,6 +4,8 @@ import svgr from 'vite-plugin-svgr';
 import tsconfigPaths from 'vite-tsconfig-paths';
 import path from 'path';
 
+import { buildBootstrapScript, PAYMENT_KIT_DID } from '../scripts/bootstrap-inject';
+
 const coreDir = path.resolve(__dirname, '..');
 
 // Absolute path to the original session file we want to replace
@@ -30,54 +32,60 @@ export default defineConfig({
         return null;
       },
     },
-    // Inject window.blocklet + global polyfills into HTML
+    // Inject window.blocklet + global polyfills into HTML via the runtime-neutral
+    // bootstrap helper (P2 / README D2 — single source shared with vite.arc.config.ts).
+    // CF is a root deploy: uiPrefix='/', remoteBlockletUrl root-exact (the helper's
+    // T2.3 lock prevents the old `pfx + '__blocklet__.js'` prefix-join bug), prefix
+    // in localOnly (G3). navigation/componentMountPoints are this blocklet's own
+    // (AUTH_SERVICE doesn't know them) so they stay local.
     {
       name: 'cf-inject-blocklet',
       transformIndexHtml(html: string) {
-        const injection = `<script>
-window.global = globalThis;
-// Minimal bootstrap — full config loaded from __blocklet__.js
-if (!window.blocklet) {
-  window.blocklet = {
-    prefix: '/',
-    groupPrefix: '/',
-    appUrl: window.location.origin,
-    componentMountPoints: [{did:'z8ia1mAXo8ZE7ytGF36L5uBf9kD2kenhqFGp9',name:'Media Kit',mountPoint:'/media-kit',appId:'z8ia1mAXo8ZE7ytGF36L5uBf9kD2kenhqFGp9',status:'running',capabilities:{component:true}}],
-    navigation: [
-      {id:'payments',title:{en:'Payments',zh:'支付管理'},icon:'ion:card-outline',link:'/admin',section:['dashboard','sessionManager'],role:['admin','owner']},
-      {id:'integrations',title:{en:'Integrations',zh:'快速集成'},icon:'ion:flash-outline',link:'/integrations',section:['dashboard','sessionManager'],role:['admin','owner']},
-      {id:'billing',title:{en:'Billing',zh:'我的账单'},icon:'ion:receipt-outline',link:'/customer',private:true,section:['userCenter','sessionManager'],role:['owner','admin','member','guest']},
-    ],
-  };
-}
-// Load full config from /__blocklet__.js?type=json (served by worker, includes auth/branding/theme from AUTH_SERVICE).
-// Using type=json lets us JSON.parse the response directly instead of slicing out a { } substring from a JS assignment.
-(function() {
-  try {
-    var xhr = new XMLHttpRequest();
-    var pfx = (window.blocklet && window.blocklet.prefix) || '/';
-    xhr.open('GET', pfx + '__blocklet__.js?type=json&_t=' + Date.now(), false);
-    xhr.send();
-    if (xhr.status === 200) {
-      var remote = JSON.parse(xhr.responseText);
-      // navigation / componentMountPoints are owned by this blocklet — AUTH_SERVICE
-      // doesn't know about them, so we never want remote values to clobber the
-      // ones the bootstrap above set.
-      var localOnly = ['navigation', 'componentMountPoints'];
-      Object.keys(remote).forEach(function(k) {
-        if (localOnly.indexOf(k) === -1) {
-          window.blocklet[k] = remote[k];
-        }
-      });
-      if (!window.blocklet.env) window.blocklet.env = {};
-      window.blocklet.env.appName = window.blocklet.appName || '';
-      window.blocklet.env.appDescription = window.blocklet.appDescription || '';
-      window.blocklet.env.appLogo = window.blocklet.appLogo || '';
-      window.blocklet.env.appUrl = window.blocklet.appUrl || '';
-    }
-  } catch(e) { /* ignore */ }
-})();
-</script>`;
+        const injection = buildBootstrapScript({
+          uiPrefix: '/',
+          componentId: PAYMENT_KIT_DID,
+          remoteBlockletUrl: '/__blocklet__.js?type=json',
+          localOnly: ['prefix', 'navigation', 'componentMountPoints'],
+          extra: {
+            componentMountPoints: [
+              {
+                did: 'z8ia1mAXo8ZE7ytGF36L5uBf9kD2kenhqFGp9',
+                name: 'Media Kit',
+                mountPoint: '/media-kit',
+                appId: 'z8ia1mAXo8ZE7ytGF36L5uBf9kD2kenhqFGp9',
+                status: 'running',
+                capabilities: { component: true },
+              },
+            ],
+            navigation: [
+              {
+                id: 'payments',
+                title: { en: 'Payments', zh: '支付管理' },
+                icon: 'ion:card-outline',
+                link: '/admin',
+                section: ['dashboard', 'sessionManager'],
+                role: ['admin', 'owner'],
+              },
+              {
+                id: 'integrations',
+                title: { en: 'Integrations', zh: '快速集成' },
+                icon: 'ion:flash-outline',
+                link: '/integrations',
+                section: ['dashboard', 'sessionManager'],
+                role: ['admin', 'owner'],
+              },
+              {
+                id: 'billing',
+                title: { en: 'Billing', zh: '我的账单' },
+                icon: 'ion:receipt-outline',
+                link: '/customer',
+                private: true,
+                section: ['userCenter', 'sessionManager'],
+                role: ['owner', 'admin', 'member', 'guest'],
+              },
+            ],
+          },
+        });
         return html.replace('<head>', '<head>' + injection);
       },
     },