@web-widget/vue 0.9.0 → 0.10.0

package/dist/vue.client.d.ts

@@ -157,6 +157,7 @@ type JSONProps = {
 };
 interface CreateVueRenderOptions {
     onCreatedApp?: (app: App<Element>, context: RenderContext, component: Component, props: ComponentProps) => Promise<void>;
+    /**@deprecated*/
     onPrefetchData?: (context: RenderContext, component: Component, props: ComponentProps) => Promise<JSONProps>;
 }
 

package/dist/vue.client.js

@@ -35,11 +35,16 @@ import {
   defineRender,
   getComponentDescriptor
 } from "@web-widget/schema/client-helpers";
-import { createApp, createSSRApp } from "vue";
+import { Suspense as Suspense2, createApp, createSSRApp, h as h2 } from "vue";
 
 // src/web-widget.ts
 import { parse } from "@web-widget/web-widget";
-import { h, defineComponent, Suspense, useAttrs } from "vue";
+import {
+  h,
+  defineComponent,
+  Suspense,
+  useAttrs
+} from "vue";
 var __ENV__ = {
   server: true
 };
@@ -165,6 +170,9 @@ var createVueRender = ({
   },
   onPrefetchData
 } = {}) => {
+  if (onPrefetchData) {
+    throw new Error(`"onPrefetchData" is not supported.`);
+  }
   return defineRender(async (context) => {
     const componentDescriptor = getComponentDescriptor(context);
     const { component, props } = componentDescriptor;
@@ -172,21 +180,18 @@ var createVueRender = ({
       throw new Error(`Container required.`);
     }
     let app;
+    const WrapSuspense = (props2) => h2(Suspense2, null, [h2(component, props2)]);
     return {
       async mount() {
-        const state = context.recovering ? context.container.querySelector(
-          "script[as=state]"
-        ) : null;
-        const stateContent = context.recovering && state ? JSON.parse(state.textContent) : onPrefetchData ? await onPrefetchData(context, component, props) : void 0;
-        state == null ? void 0 : state.remove();
-        const mergedProps = stateContent ? Object.assign(stateContent, props) : props;
         if (context.recovering) {
-          app = createSSRApp(component, mergedProps);
+          app = createSSRApp(WrapSuspense, props);
         } else {
-          app = createApp(component, mergedProps);
+          app = createApp(WrapSuspense, props);
         }
-        await onCreatedApp(app, context, component, mergedProps);
-        app.mount(context.container);
+        await onCreatedApp(app, context, component, props);
+        app.runWithContext(() => {
+          app.mount(context.container);
+        });
       },
       async unmount() {
         app == null ? void 0 : app.unmount();

package/dist/vue.server.d.ts

@@ -158,6 +158,7 @@ type JSONProps = {
 };
 interface CreateVueRenderOptions {
     onCreatedApp?: (app: App<Element>, context: RenderContext, component: Component, props: ComponentProps) => Promise<void>;
+    /**@deprecated*/
     onPrefetchData?: (context: RenderContext, component: Component, props: ComponentProps) => Promise<JSONProps>;
 }
 

package/dist/vue.server.js

@@ -35,12 +35,17 @@ import {
   defineRender,
   getComponentDescriptor
 } from "@web-widget/schema/server-helpers";
-import { Fragment, createSSRApp, h as h2 } from "vue";
+import { Suspense as Suspense2, createSSRApp, h as h2 } from "vue";
 import { renderToWebStream } from "vue/server-renderer";
 
 // src/web-widget.ts
 import { parse } from "@web-widget/web-widget";
-import { h, defineComponent, Suspense, useAttrs } from "vue";
+import {
+  h,
+  defineComponent,
+  Suspense,
+  useAttrs
+} from "vue";
 var __ENV__ = {
   server: true
 };
@@ -161,45 +166,22 @@ export * from "@web-widget/schema/server-helpers";
 Reflect.defineProperty(__ENV__, "server", {
   value: true
 });
-var ESCAPE_LOOKUP = {
-  ">": "\\u003e",
-  "<": "\\u003c",
-  "\u2028": "\\u2028",
-  "\u2029": "\\u2029"
-};
-var ESCAPE_REGEX = /[><\u2028\u2029]/g;
-function htmlEscapeJsonString(str) {
-  return str.replace(ESCAPE_REGEX, (match) => ESCAPE_LOOKUP[match]);
-}
 var createVueRender = ({
   onCreatedApp = async () => {
   },
   onPrefetchData
 } = {}) => {
+  if (onPrefetchData) {
+    throw new Error(`"onPrefetchData" is not supported.`);
+  }
   return defineRender(
     async (context, { vue: ssrContext } = {}) => {
       const componentDescriptor = getComponentDescriptor(context);
       const { component, props } = componentDescriptor;
-      const state = onPrefetchData ? await onPrefetchData(context, component, props) : void 0;
-      const mergedProps = state ? Object.assign({}, state, props) : props;
-      if (state) {
-        const stateStringify = htmlEscapeJsonString(JSON.stringify(state));
-        const vNode = h2(Fragment, null, [
-          h2(component, mergedProps),
-          h2("script", {
-            as: "state",
-            type: "application/json",
-            innerHTML: stateStringify
-          })
-        ]);
-        const app = createSSRApp(vNode);
-        await onCreatedApp(app, context, component, mergedProps);
-        return renderToWebStream(app, ssrContext);
-      } else {
-        const app = createSSRApp(component, mergedProps);
-        await onCreatedApp(app, context, component, mergedProps);
-        return renderToWebStream(app, ssrContext);
-      }
+      const WrapSuspense = (props2) => h2(Suspense2, null, [h2(component, props2)]);
+      const app = createSSRApp(WrapSuspense, props);
+      await onCreatedApp(app, context, component, props);
+      return app.runWithContext(() => renderToWebStream(app, ssrContext));
     }
   );
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web-widget/vue",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "type": "module",
   "exports": {
     ".": {
@@ -27,10 +27,10 @@
     "dist"
   ],
   "dependencies": {
-    "@web-widget/vite": "2.6.0",
-    "@web-widget/html": "0.1.4",
-    "@web-widget/schema": "0.3.0",
-    "@web-widget/web-widget": "1.4.0"
+    "@web-widget/vite": "2.7.0",
+    "@web-widget/html": "0.1.5",
+    "@web-widget/schema": "0.4.0",
+    "@web-widget/web-widget": "1.5.0"
   },
   "devDependencies": {
     "tsup": "^7.0.0",