@web-widget/vue2 0.1.2 → 0.2.0-beta1

package/dist/vue2.server.cjs

@@ -69,6 +69,7 @@ __export(server_exports, {
 module.exports = __toCommonJS(server_exports);
 var import_server_helpers = require("@web-widget/schema/server-helpers");
 var import_node_stream = require("stream");
+var import_web = require("stream/web");
 var import_vue2 = __toESM(require("vue"), 1);
 var import_vue_server_renderer = require("vue-server-renderer");
 __reExport(server_exports, require("@web-widget/schema/server-helpers"), module.exports);
@@ -195,6 +196,7 @@ function defineWebWidget(loader, options) {
 }
 
 // src/server.ts
+var __FEATURE_STREAM__ = false;
 var ESCAPE_LOOKUP = {
   ">": "\\u003e",
   "<": "\\u003c",
@@ -205,6 +207,17 @@ var ESCAPE_REGEX = /[><\u2028\u2029]/g;
 function htmlEscapeJsonString(str) {
   return str.replace(ESCAPE_REGEX, (match) => ESCAPE_LOOKUP[match]);
 }
+function appendStringToReadableStream(stream, text) {
+  const encoder = new TextEncoder();
+  const uint8Array = encoder.encode(text);
+  return stream.pipeThrough(
+    new import_web.TransformStream({
+      flush(controller) {
+        controller.enqueue(uint8Array);
+      }
+    })
+  );
+}
 var defineVueRender = ({
   onBeforeCreateApp = () => ({}),
   onCreatedApp = () => {
@@ -214,38 +227,27 @@ var defineVueRender = ({
   return (0, import_server_helpers.defineRender)(async (context, component, props) => {
     const shellTag = "web-widget.shell";
     const state = onPrefetchData ? await onPrefetchData(context, component, props) : void 0;
-    const mergedProps = state ? Object.assign(state, props) : props;
+    const mergedProps = state ? Object.assign({}, state, props) : props;
     const renderer = (0, import_vue_server_renderer.createRenderer)();
-    const vNodeData = {
-      attrs: {
-        "data-vue2root": "true"
-      },
-      props: mergedProps
-    };
-    const shellTagVNodeData = {};
-    let render2;
-    if (state) {
-      const stateStringify = htmlEscapeJsonString(JSON.stringify(state));
-      render2 = (h2) => h2(shellTag, shellTagVNodeData, [
-        h2(component, vNodeData),
-        h2("script", {
+    const app = new import_vue2.default(__spreadValues({
+      render: (h2) => h2(shellTag, {}, [
+        h2(component, {
           attrs: {
-            as: "state",
-            type: "application/json"
+            "data-vue2root": "true"
           },
-          domProps: {
-            innerHTML: stateStringify
-          }
+          props: mergedProps
         })
-      ]);
-    } else {
-      render2 = (h2) => h2(shellTag, shellTagVNodeData, [h2(component, vNodeData)]);
-    }
-    const app = new import_vue2.default(__spreadValues({
-      render: render2
+      ])
     }, onBeforeCreateApp(context, component, mergedProps)));
     onCreatedApp(app, context, component, mergedProps);
-    return import_node_stream.Readable.toWeb ? import_node_stream.Readable.toWeb(renderer.renderToStream(app)) : renderer.renderToString(app);
+    const result = __FEATURE_STREAM__ && import_node_stream.Readable.toWeb ? import_node_stream.Readable.toWeb(renderer.renderToStream(app)) : await renderer.renderToString(app);
+    if (state) {
+      const json = htmlEscapeJsonString(JSON.stringify(state));
+      const script = `<script as="state" type="application/json">${json}</script>`;
+      return typeof result === "string" ? result + script : appendStringToReadableStream(result, script);
+    } else {
+      return result;
+    }
   });
 };
 var render = defineVueRender();

package/dist/vue2.server.js

@@ -33,6 +33,7 @@ var __objRest = (source, exclude) => {
 // src/server.ts
 import { defineRender } from "@web-widget/schema/server-helpers";
 import { Readable } from "stream";
+import { TransformStream } from "stream/web";
 import Vue from "vue";
 import { createRenderer } from "vue-server-renderer";
 export * from "@web-widget/schema/server-helpers";
@@ -159,6 +160,7 @@ function defineWebWidget(loader, options) {
 }
 
 // src/server.ts
+var __FEATURE_STREAM__ = false;
 var ESCAPE_LOOKUP = {
   ">": "\\u003e",
   "<": "\\u003c",
@@ -169,6 +171,17 @@ var ESCAPE_REGEX = /[><\u2028\u2029]/g;
 function htmlEscapeJsonString(str) {
   return str.replace(ESCAPE_REGEX, (match) => ESCAPE_LOOKUP[match]);
 }
+function appendStringToReadableStream(stream, text) {
+  const encoder = new TextEncoder();
+  const uint8Array = encoder.encode(text);
+  return stream.pipeThrough(
+    new TransformStream({
+      flush(controller) {
+        controller.enqueue(uint8Array);
+      }
+    })
+  );
+}
 var defineVueRender = ({
   onBeforeCreateApp = () => ({}),
   onCreatedApp = () => {
@@ -178,38 +191,27 @@ var defineVueRender = ({
   return defineRender(async (context, component, props) => {
     const shellTag = "web-widget.shell";
     const state = onPrefetchData ? await onPrefetchData(context, component, props) : void 0;
-    const mergedProps = state ? Object.assign(state, props) : props;
+    const mergedProps = state ? Object.assign({}, state, props) : props;
     const renderer = createRenderer();
-    const vNodeData = {
-      attrs: {
-        "data-vue2root": "true"
-      },
-      props: mergedProps
-    };
-    const shellTagVNodeData = {};
-    let render2;
-    if (state) {
-      const stateStringify = htmlEscapeJsonString(JSON.stringify(state));
-      render2 = (h2) => h2(shellTag, shellTagVNodeData, [
-        h2(component, vNodeData),
-        h2("script", {
+    const app = new Vue(__spreadValues({
+      render: (h2) => h2(shellTag, {}, [
+        h2(component, {
           attrs: {
-            as: "state",
-            type: "application/json"
+            "data-vue2root": "true"
           },
-          domProps: {
-            innerHTML: stateStringify
-          }
+          props: mergedProps
         })
-      ]);
-    } else {
-      render2 = (h2) => h2(shellTag, shellTagVNodeData, [h2(component, vNodeData)]);
-    }
-    const app = new Vue(__spreadValues({
-      render: render2
+      ])
     }, onBeforeCreateApp(context, component, mergedProps)));
     onCreatedApp(app, context, component, mergedProps);
-    return Readable.toWeb ? Readable.toWeb(renderer.renderToStream(app)) : renderer.renderToString(app);
+    const result = __FEATURE_STREAM__ && Readable.toWeb ? Readable.toWeb(renderer.renderToStream(app)) : await renderer.renderToString(app);
+    if (state) {
+      const json = htmlEscapeJsonString(JSON.stringify(state));
+      const script = `<script as="state" type="application/json">${json}</script>`;
+      return typeof result === "string" ? result + script : appendStringToReadableStream(result, script);
+    } else {
+      return result;
+    }
   });
 };
 var render = defineVueRender();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web-widget/vue2",
-  "version": "0.1.2",
+  "version": "0.2.0-beta1",
   "type": "module",
   "exports": {
     ".": {