@blocklet/pages-kit-inner-components 0.4.25 → 0.4.26

package/lib/cjs/project-html.js

@@ -1,10 +1,15 @@
-"use strict";const N=require("vite-plugin-node-polyfills/shims/process"),_=require("./_chunks/site-state-DNRKik3e.js"),P=require("@blocklet/crawler/middlewares"),J=require("@blocklet/pages-kit/types"),G=require("@blocklet/pages-kit/utils/preload"),W=require("@blocklet/sdk/lib/component"),R=require("@blocklet/sdk/lib/config"),K=require("express"),I=require("fs"),Q=require("mustache"),U=require("path"),S=require("ufo"),E=o=>o&&o.__esModule?o:{default:o},x=E(N),p=E(R),z=E(Q),V=["/assets/"],q=()=>[!0,"true"].includes(p.default.env.preferences.allowCrawler);function D(){q()?P.initCronCrawlBlocklet({time:"30 30 */12 * * *",options:{}}):P.cancelCronCrawlBlocklet()}D();p.default.events.on(p.default.Events.envUpdate,D);function X({app:o,viteDevServer:g,state:c}){let w;if(g){const n=I.readFileSync(U.resolve(x.default.cwd(),"./index.html"),"utf-8");o.use(async(y,T,k)=>{const b=y.originalUrl;w=await g.transformIndexHtml(b,n),k()})}else w=I.readFileSync(U.resolve(x.default.env.BLOCKLET_APP_DIR,"dist/index.html"),"utf-8");const C=K.Router();C.use(P.initSEOMiddleware({autoReturnHtml:!1,allowCrawler:q})),C.get("/:path(*)?",async(n,y,T)=>{var L,M,j;if(V.some(l=>n.path.startsWith(l))){T();return}const k=performance.now(),b=()=>Math.round(performance.now()-k),O="production";let e,u,s=w;if(n.path.startsWith("/pages")){const l=n.params.lang,i=n.cookies.nf_lang,d=new Set([...p.default.env.languages.map(f=>f.code)]);let m=(l&&d.has(l)?l:void 0)||(d.has(i)?i:void 0)||[...d][0];if((!m||!((L=c.supportedLocales)!=null&&L.find(f=>f.locale===m)))&&(m=((j=(M=c.supportedLocales)==null?void 0:M[0])==null?void 0:j.locale)||""),m){const f=[];Object.values(c.pages).forEach(r=>{const v=Object.values((r==null?void 0:r.sections)??{}).filter(a=>{var h;return a.component==="custom-component"&&((h=a.config)==null?void 0:h.componentId)}).map(a=>{var h,A;return{id:a.id,componentId:a.config.componentId,useCache:a.config.useCache,cacheDuration:a.config.cacheDuration,properties:(A=(h=a.locales)==null?void 0:h[m])==null?void 0:A.properties}});f.push(...v)});const H=new Promise((r,v)=>{setTimeout(()=>{v(new Error("getPreloadComponents timeout in promise race, skip it"))},90*1e3)});try{await Promise.race([H,_.getPreloadComponents({mode:O,req:n,state:c,locale:m,instances:f,module:J.PreloadComponentScriptModule.UMD_FN}).then(r=>{r&&(u=G.injectPreloadComponents(r))})])}catch(r){_.logger.warn("getPreloadComponents timeout in promise race, skip inject html elements"),_.logger.warn(r)}}}try{const l=(e==null?void 0:e.title)||p.default.env.appName,i=(e==null?void 0:e.description)||p.default.env.appDescription,d=S.withQuery(S.joinURL(p.default.env.appUrl,"/.well-known/service/blocklet/og.png"),{title:l,description:i});s=z.default.render(w,{ogTitle:l,ogDescription:i,ogImage:Y(e==null?void 0:e.image)||d,pagesPublishedAt:(c==null?void 0:c.config.publishedAt)||new Date().getTime()})}catch{}const t=c==null?void 0:c.config.fontFamily,B=n.query.mode==="draft"||n.url.includes("preview");s=s.replace('<script id="injected-head-elements"><\/script>',`
+"use strict";const N=require("vite-plugin-node-polyfills/shims/process"),_=require("./_chunks/site-state-DNRKik3e.js"),P=require("@blocklet/crawler/middlewares"),G=require("@blocklet/pages-kit/types"),J=require("@blocklet/pages-kit/utils/preload"),W=require("@blocklet/sdk/lib/component"),R=require("@blocklet/sdk/lib/config"),K=require("express"),M=require("fs"),Q=require("mustache"),x=require("path"),S=require("ufo"),T=o=>o&&o.__esModule?o:{default:o},U=T(N),p=T(R),z=T(Q),V=["/assets/"],q=()=>[!0,"true"].includes(p.default.env.preferences.allowCrawler);function D(){q()?P.initCronCrawlBlocklet({time:"30 30 */12 * * *",options:{}}):P.cancelCronCrawlBlocklet()}D();p.default.events.on(p.default.Events.envUpdate,D);function X({app:o,viteDevServer:g,state:c}){let w;if(g){const n=M.readFileSync(x.resolve(U.default.cwd(),"./index.html"),"utf-8");o.use(async(C,v,k)=>{const b=C.originalUrl;w=await g.transformIndexHtml(b,n),k()})}else w=M.readFileSync(x.resolve(U.default.env.BLOCKLET_APP_DIR,"dist/index.html"),"utf-8");const y=K.Router();y.use(P.initSEOMiddleware({autoReturnHtml:!1,allowCrawler:q})),y.get("/:path(*)?",async(n,C,v)=>{var $,L,j;if(V.some(r=>n.path.startsWith(r))){v();return}const k=performance.now(),b=()=>Math.round(performance.now()-k),O="production";let e,u,s=w;if(n.path.startsWith("/pages")){const r=n.params.lang,i=n.cookies.nf_lang,d=new Set([...p.default.env.languages.map(f=>f.code)]);let m=(r&&d.has(r)?r:void 0)||(d.has(i)?i:void 0)||[...d][0];if((!m||!(($=c.supportedLocales)!=null&&$.find(f=>f.locale===m)))&&(m=((j=(L=c.supportedLocales)==null?void 0:L[0])==null?void 0:j.locale)||""),m){const f=[];Object.values(c.pages).forEach(l=>{const E=Object.values((l==null?void 0:l.sections)??{}).filter(a=>{var h;return a.component==="custom-component"&&((h=a.config)==null?void 0:h.componentId)}).map(a=>{var h,I;return{id:a.id,componentId:a.config.componentId,useCache:a.config.useCache,cacheDuration:a.config.cacheDuration,properties:(I=(h=a.locales)==null?void 0:h[m])==null?void 0:I.properties}});f.push(...E)});const H=new Promise((l,E)=>{setTimeout(()=>{E(new Error("getPreloadComponents timeout in promise race, skip it"))},90*1e3)});try{await Promise.race([H,_.getPreloadComponents({mode:O,req:n,state:c,locale:m,instances:f,module:G.PreloadComponentScriptModule.UMD_FN}).then(l=>{l&&(u=J.injectPreloadComponents(l))})])}catch(l){_.logger.warn("getPreloadComponents timeout in promise race, skip inject html elements"),_.logger.warn(l)}}}try{const r=(e==null?void 0:e.title)||p.default.env.appName,i=(e==null?void 0:e.description)||p.default.env.appDescription,d=S.withQuery(S.joinURL(p.default.env.appUrl,"/.well-known/service/blocklet/og.png"),{title:r,description:i});s=z.default.render(w,{ogTitle:r,ogDescription:i,ogImage:Y(e==null?void 0:e.image)||d,pagesPublishedAt:(c==null?void 0:c.config.publishedAt)||new Date().getTime()})}catch{}const t=c==null?void 0:c.config.fontFamily,B=n.query.mode==="draft"||n.url.includes("preview");s=s.replace('<script id="injected-head-elements"><\/script>',`
         ${e!=null&&e.backgroundColor?`<meta name="theme-color" content="${e.backgroundColor}" /><style>html,body,#app {background-color: ${e.backgroundColor} !important;}</style>`:""}
         ${t!=null&&t.title?`<link rel="preload" as="style" href="https://fonts.googleapis.com/css?family=${t.title}&display=swap">`:""}
         ${t!=null&&t.description&&(t==null?void 0:t.description)!==(t==null?void 0:t.title)?`<link rel="preload" as="style" href="https://fonts.googleapis.com/css?family=${t.description}&display=swap">`:""}
+
+        <script type="application/json" id="__PAGE_STATE__">
+          ${JSON.stringify(c).replace(/</g,"\\u003c").replace(/>/g,"\\u003e").replace(/&/g,"\\u0026")}
+        <\/script>
+
         <script>
 
-        window.__PAGE_STATE__ = ${JSON.stringify(c)}
+        window.__PAGE_STATE__ = JSON.parse(document.getElementById('__PAGE_STATE__').textContent)
 
         document.querySelectorAll('link[rel="preload"][as="style"]').forEach(function (link) {
           const l = document.createElement('link');
@@ -20,4 +25,4 @@
     darkMode: "class",
   };
 <\/script>`:""}
-    `);const $=R.getBlockletJs();if($&&(s=s.replace('<script src="__blocklet__.js"><\/script>',`<script>${$}<\/script>`)),u!=null&&u.html&&(s=s.replace('<script id="injected-html-elements"><\/script>',u.html)),n.cachedHtml){const l=/<body>([\s\S]*?)<\/body>/,i=l.exec(n.cachedHtml),d=i?i[1]:"";s=s.replace(l,`<body>${d}</body>`)}y.send(s),_.logger.info(`[html] render: ${n.path}, ${b()}ms`),s=null,e=null,u=null}),o.use(C)}function Y(o){const g=W.getComponentMountPoint("image-bin");return g&&o&&!/^(https?:\/\/|\/)/.test(o)?p.default.env.appUrl+S.joinURL(g,"uploads",o):o}module.exports=X;
+    `);const A=R.getBlockletJs();if(A&&(s=s.replace('<script src="__blocklet__.js"><\/script>',`<script>${A}<\/script>`)),u!=null&&u.html&&(s=s.replace('<script id="injected-html-elements"><\/script>',u.html)),n.cachedHtml){const r=/<body>([\s\S]*?)<\/body>/,i=r.exec(n.cachedHtml),d=i?i[1]:"";s=s.replace(r,`<body>${d}</body>`)}C.send(s),_.logger.info(`[html] render: ${n.path}, ${b()}ms`),s=null,e=null,u=null}),o.use(y)}function Y(o){const g=W.getComponentMountPoint("image-bin");return g&&o&&!/^(https?:\/\/|\/)/.test(o)?p.default.env.appUrl+S.joinURL(g,"uploads",o):o}module.exports=X;

package/lib/es/project-html.js

@@ -1,102 +1,102 @@
-import A from "vite-plugin-node-polyfills/shims/process";
-import { b as B, l as v } from "./_chunks/site-state-B0nM69Rk.js";
-import { initCronCrawlBlocklet as H, cancelCronCrawlBlocklet as N, initSEOMiddleware as J } from "@blocklet/crawler/middlewares";
-import { PreloadComponentScriptModule as G } from "@blocklet/pages-kit/types";
+import I from "vite-plugin-node-polyfills/shims/process";
+import { b as D, l as E } from "./_chunks/site-state-B0nM69Rk.js";
+import { initCronCrawlBlocklet as H, cancelCronCrawlBlocklet as N, initSEOMiddleware as G } from "@blocklet/crawler/middlewares";
+import { PreloadComponentScriptModule as J } from "@blocklet/pages-kit/types";
 import { injectPreloadComponents as W } from "@blocklet/pages-kit/utils/preload";
 import { getComponentMountPoint as K } from "@blocklet/sdk/lib/component";
 import p, { getBlockletJs as Q } from "@blocklet/sdk/lib/config";
 import { Router as z } from "express";
-import { readFileSync as I } from "fs";
+import { readFileSync as L } from "fs";
 import V from "mustache";
 import { resolve as j } from "path";
-import { withQuery as X, joinURL as M } from "ufo";
-const Y = ["/assets/"], U = () => [!0, "true"].includes(p.env.preferences.allowCrawler);
-function x() {
-  U() ? H({
+import { withQuery as X, joinURL as x } from "ufo";
+const Y = ["/assets/"], M = () => [!0, "true"].includes(p.env.preferences.allowCrawler);
+function U() {
+  M() ? H({
     time: "30 30 */12 * * *",
     options: {}
   }) : N();
 }
-x();
-p.events.on(p.Events.envUpdate, x);
+U();
+p.events.on(p.Events.envUpdate, U);
 function me({
   app: s,
-  viteDevServer: h,
+  viteDevServer: g,
   // projectId,
   state: n
 }) {
   let w;
-  if (h) {
-    const t = I(j(A.cwd(), "./index.html"), "utf-8");
-    s.use(async (k, P, b) => {
-      const y = k.originalUrl;
-      w = await h.transformIndexHtml(y, t), b();
+  if (g) {
+    const t = L(j(I.cwd(), "./index.html"), "utf-8");
+    s.use(async (C, P, y) => {
+      const k = C.originalUrl;
+      w = await g.transformIndexHtml(k, t), y();
     });
   } else
-    w = I(j(A.env.BLOCKLET_APP_DIR, "dist/index.html"), "utf-8");
-  const C = z();
-  C.use(
-    J({
+    w = L(j(I.env.BLOCKLET_APP_DIR, "dist/index.html"), "utf-8");
+  const _ = z();
+  _.use(
+    G({
       autoReturnHtml: !1,
-      allowCrawler: U
+      allowCrawler: M
     })
-  ), C.get("/:path(*)?", async (t, k, P) => {
-    var E, S, T;
+  ), _.get("/:path(*)?", async (t, C, P) => {
+    var S, v, A;
     if (Y.some((c) => t.path.startsWith(c))) {
       P();
       return;
     }
-    const b = performance.now(), y = () => Math.round(performance.now() - b), R = "production";
+    const y = performance.now(), k = () => Math.round(performance.now() - y), O = "production";
     let e, d, r = w;
     if (t.path.startsWith("/pages")) {
       const c = t.params.lang, i = t.cookies.nf_lang, m = /* @__PURE__ */ new Set([...p.env.languages.map((f) => f.code)]);
       let u = (c && m.has(c) ? c : void 0) || (m.has(i) ? i : void 0) || [...m][0];
-      if ((!u || !((E = n.supportedLocales) != null && E.find((f) => f.locale === u))) && (u = ((T = (S = n.supportedLocales) == null ? void 0 : S[0]) == null ? void 0 : T.locale) || ""), u) {
+      if ((!u || !((S = n.supportedLocales) != null && S.find((f) => f.locale === u))) && (u = ((A = (v = n.supportedLocales) == null ? void 0 : v[0]) == null ? void 0 : A.locale) || ""), u) {
         const f = [];
         Object.values(n.pages).forEach((l) => {
-          const _ = Object.values((l == null ? void 0 : l.sections) ?? {}).filter(
+          const b = Object.values((l == null ? void 0 : l.sections) ?? {}).filter(
             (a) => {
-              var g;
-              return a.component === "custom-component" && ((g = a.config) == null ? void 0 : g.componentId);
+              var h;
+              return a.component === "custom-component" && ((h = a.config) == null ? void 0 : h.componentId);
             }
           ).map((a) => {
-            var g, L;
+            var h, $;
             return {
               id: a.id,
               componentId: a.config.componentId,
               useCache: a.config.useCache,
               cacheDuration: a.config.cacheDuration,
-              properties: (L = (g = a.locales) == null ? void 0 : g[u]) == null ? void 0 : L.properties
+              properties: ($ = (h = a.locales) == null ? void 0 : h[u]) == null ? void 0 : $.properties
             };
           });
-          f.push(..._);
+          f.push(...b);
         });
-        const O = new Promise((l, _) => {
+        const B = new Promise((l, b) => {
           setTimeout(() => {
-            _(new Error("getPreloadComponents timeout in promise race, skip it"));
+            b(new Error("getPreloadComponents timeout in promise race, skip it"));
           }, 90 * 1e3);
         });
         try {
           await Promise.race([
-            O,
-            B({
-              mode: R,
+            B,
+            D({
+              mode: O,
               req: t,
               state: n,
               locale: u,
               instances: f,
-              module: G.UMD_FN
+              module: J.UMD_FN
             }).then((l) => {
               l && (d = W(l));
             })
           ]);
         } catch (l) {
-          v.warn("getPreloadComponents timeout in promise race, skip inject html elements"), v.warn(l);
+          E.warn("getPreloadComponents timeout in promise race, skip inject html elements"), E.warn(l);
         }
       }
     }
     try {
-      const c = (e == null ? void 0 : e.title) || p.env.appName, i = (e == null ? void 0 : e.description) || p.env.appDescription, m = X(M(p.env.appUrl, "/.well-known/service/blocklet/og.png"), {
+      const c = (e == null ? void 0 : e.title) || p.env.appName, i = (e == null ? void 0 : e.description) || p.env.appDescription, m = X(x(p.env.appUrl, "/.well-known/service/blocklet/og.png"), {
         title: c,
         description: i
       });
@@ -108,16 +108,21 @@ function me({
       });
     } catch {
     }
-    const o = n == null ? void 0 : n.config.fontFamily, D = t.query.mode === "draft" || t.url.includes("preview");
+    const o = n == null ? void 0 : n.config.fontFamily, R = t.query.mode === "draft" || t.url.includes("preview");
     r = r.replace(
       '<script id="injected-head-elements"><\/script>',
       `
         ${e != null && e.backgroundColor ? `<meta name="theme-color" content="${e.backgroundColor}" /><style>html,body,#app {background-color: ${e.backgroundColor} !important;}</style>` : ""}
         ${o != null && o.title ? `<link rel="preload" as="style" href="https://fonts.googleapis.com/css?family=${o.title}&display=swap">` : ""}
         ${o != null && o.description && (o == null ? void 0 : o.description) !== (o == null ? void 0 : o.title) ? `<link rel="preload" as="style" href="https://fonts.googleapis.com/css?family=${o.description}&display=swap">` : ""}
+
+        <script type="application/json" id="__PAGE_STATE__">
+          ${JSON.stringify(n).replace(/</g, "\\u003c").replace(/>/g, "\\u003e").replace(/&/g, "\\u0026")}
+        <\/script>
+
         <script>
 
-        window.__PAGE_STATE__ = ${JSON.stringify(n)}
+        window.__PAGE_STATE__ = JSON.parse(document.getElementById('__PAGE_STATE__').textContent)
 
         document.querySelectorAll('link[rel="preload"][as="style"]').forEach(function (link) {
           const l = document.createElement('link');
@@ -127,7 +132,7 @@ function me({
         });
         <\/script>
 
-        ${D ? `<script src="https://cdn.tailwindcss.com"><\/script>
+        ${R ? `<script src="https://cdn.tailwindcss.com"><\/script>
 <script>
   window.tailwind.config = {
     darkMode: "class",
@@ -135,17 +140,17 @@ function me({
 <\/script>` : ""}
     `
     );
-    const $ = Q();
-    if ($ && (r = r.replace('<script src="__blocklet__.js"><\/script>', `<script>${$}<\/script>`)), d != null && d.html && (r = r.replace('<script id="injected-html-elements"><\/script>', d.html)), t.cachedHtml) {
+    const T = Q();
+    if (T && (r = r.replace('<script src="__blocklet__.js"><\/script>', `<script>${T}<\/script>`)), d != null && d.html && (r = r.replace('<script id="injected-html-elements"><\/script>', d.html)), t.cachedHtml) {
       const c = /<body>([\s\S]*?)<\/body>/, i = c.exec(t.cachedHtml), m = i ? i[1] : "";
       r = r.replace(c, `<body>${m}</body>`);
     }
-    k.send(r), v.info(`[html] render: ${t.path}, ${y()}ms`), r = null, e = null, d = null;
-  }), s.use(C);
+    C.send(r), E.info(`[html] render: ${t.path}, ${k()}ms`), r = null, e = null, d = null;
+  }), s.use(_);
 }
 function Z(s) {
-  const h = K("image-bin");
-  return h && s && !/^(https?:\/\/|\/)/.test(s) ? p.env.appUrl + M(h, "uploads", s) : s;
+  const g = K("image-bin");
+  return g && s && !/^(https?:\/\/|\/)/.test(s) ? p.env.appUrl + x(g, "uploads", s) : s;
 }
 export {
   me as default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/pages-kit-inner-components",
-  "version": "0.4.25",
+  "version": "0.4.26",
   "description": "Pages Kit inner components library",
   "publishConfig": {
     "access": "public"
@@ -202,8 +202,8 @@
     "yaml": "^2.5.0",
     "yjs": "^13.6.18",
     "zustand": "^4.5.5",
-    "@blocklet/pages-kit": "^0.4.25",
-    "@blocklet/pages-kit-block-studio": "^0.4.25"
+    "@blocklet/pages-kit": "^0.4.26",
+    "@blocklet/pages-kit-block-studio": "^0.4.26"
   },
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "^5.2.1",