@blocklet/pages-kit-inner-components 0.4.40 → 0.4.41

package/lib/cjs/project-html.js

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

package/lib/es/project-html.js

@@ -3,14 +3,14 @@ import { initCronCrawlBlocklet as W, cancelCronCrawlBlocklet as N, initSEOMiddle
 import { PreloadComponentScriptModule as G } from "@blocklet/pages-kit/types";
 import { injectPreloadComponents as K } from "@blocklet/pages-kit/utils/preload";
 import { getComponentMountPoint as Q } from "@blocklet/sdk/lib/component";
-import s, { getBlockletJs as z } from "@blocklet/sdk/lib/config";
+import a, { getBlockletJs as z } from "@blocklet/sdk/lib/config";
 import * as I from "cheerio";
 import { Router as V } from "express";
 import { readFileSync as j } from "fs";
 import X from "mustache";
 import { resolve as U } from "path";
 import { withQuery as Y, joinURL as M } from "ufo";
-const Z = ["/assets/"], D = () => [!0, "true"].includes(s.env.preferences.allowCrawler);
+const Z = ["/assets/"], D = () => [!0, "true"].includes(a.env.preferences.allowCrawler);
 function O() {
   D() ? W({
     time: "30 30 */12 * * *",
@@ -18,19 +18,19 @@ function O() {
   }) : N();
 }
 O();
-s.events.on(s.Events.envUpdate, O);
+a.events.on(a.Events.envUpdate, O);
 function me({
   app: c,
-  viteDevServer: u,
+  viteDevServer: h,
   // projectId,
   state: n
 }) {
   let C;
-  if (u) {
+  if (h) {
     const t = j(U(process.cwd(), "./index.html"), "utf-8");
     c.use(async (b, $, y) => {
       const _ = b.originalUrl;
-      C = await u.transformIndexHtml(_, t), y();
+      C = await h.transformIndexHtml(_, t), y();
     });
   } else
     C = j(U(process.env.BLOCKLET_APP_DIR, "dist/index.html"), "utf-8");
@@ -42,34 +42,37 @@ function me({
     })
   ), k.get("/:path(*)?", async (t, b, $) => {
     var T, S, L;
-    if (Z.some((r) => t.path.startsWith(r))) {
+    if (Z.some((r) => {
+      var i;
+      return (i = t.path) == null ? void 0 : i.startsWith(r);
+    })) {
       $();
       return;
     }
     const y = performance.now(), _ = () => Math.round(performance.now() - y), R = "production";
-    let e, a, h = C;
+    let e, p, f = C;
     if (t.path.startsWith("/pages")) {
-      const r = t.params.lang, f = t.cookies.nf_lang, g = /* @__PURE__ */ new Set([...s.env.languages.map((d) => d.code)]);
-      let m = (r && g.has(r) ? r : void 0) || (g.has(f) ? f : void 0) || [...g][0];
-      if ((!m || !((T = n.supportedLocales) != null && T.find((d) => d.locale === m))) && (m = ((L = (S = n.supportedLocales) == null ? void 0 : S[0]) == null ? void 0 : L.locale) || ""), m) {
-        const d = [];
+      const r = t.params.lang, i = t.cookies.nf_lang, g = /* @__PURE__ */ new Set([...a.env.languages.map((u) => u.code)]);
+      let d = (r && g.has(r) ? r : void 0) || (g.has(i) ? i : void 0) || [...g][0];
+      if ((!d || !((T = n.supportedLocales) != null && T.find((u) => u.locale === d))) && (d = ((L = (S = n.supportedLocales) == null ? void 0 : S[0]) == null ? void 0 : L.locale) || ""), d) {
+        const u = [];
         Object.values(n.pages).forEach((l) => {
           const v = Object.values((l == null ? void 0 : l.sections) ?? {}).filter(
-            (i) => {
+            (s) => {
               var w;
-              return i.component === "custom-component" && ((w = i.config) == null ? void 0 : w.componentId);
+              return s.component === "custom-component" && ((w = s.config) == null ? void 0 : w.componentId);
             }
-          ).map((i) => {
+          ).map((s) => {
             var w, A;
             return {
-              id: i.id,
-              componentId: i.config.componentId,
-              useCache: i.config.useCache,
-              cacheDuration: i.config.cacheDuration,
-              properties: (A = (w = i.locales) == null ? void 0 : w[m]) == null ? void 0 : A.properties
+              id: s.id,
+              componentId: s.config.componentId,
+              useCache: s.config.useCache,
+              cacheDuration: s.config.cacheDuration,
+              properties: (A = (w = s.locales) == null ? void 0 : w[d]) == null ? void 0 : A.properties
             };
           });
-          d.push(...v);
+          u.push(...v);
         });
         const B = new Promise((l, v) => {
           setTimeout(() => {
@@ -83,11 +86,11 @@ function me({
               mode: R,
               req: t,
               state: n,
-              locale: m,
-              instances: d,
+              locale: d,
+              instances: u,
               module: G.UMD_FN
             }).then((l) => {
-              l && (a = K(l));
+              l && (p = K(l));
             })
           ]);
         } catch (l) {
@@ -96,20 +99,20 @@ function me({
       }
     }
     try {
-      const r = (e == null ? void 0 : e.title) || s.env.appName, f = (e == null ? void 0 : e.description) || s.env.appDescription, g = Y(M(s.env.appUrl, "/.well-known/service/blocklet/og.png"), {
+      const r = (e == null ? void 0 : e.title) || a.env.appName, i = (e == null ? void 0 : e.description) || a.env.appDescription, g = Y(M(a.env.appUrl, "/.well-known/service/blocklet/og.png"), {
         title: r,
-        description: f
+        description: i
       });
-      h = X.render(C, {
+      f = X.render(C, {
         ogTitle: r,
-        ogDescription: f,
+        ogDescription: i,
         ogImage: F(e == null ? void 0 : e.image) || g,
         pagesPublishedAt: (n == null ? void 0 : n.config.publishedAt) || (/* @__PURE__ */ new Date()).getTime()
       });
     } catch {
     }
-    const o = n == null ? void 0 : n.config.fontFamily, x = t.query.mode === "draft" || t.url.includes("preview"), p = I.load(h);
-    p("head").find("#injected-head-elements").replaceWith(`
+    const o = n == null ? void 0 : n.config.fontFamily, x = t.query.mode === "draft" || t.url.includes("preview"), m = I.load(f);
+    m("head").find("#injected-head-elements").replaceWith(`
         ${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">` : ""}
@@ -133,16 +136,16 @@ function me({
 <\/script>` : ""}
     `);
     const E = z();
-    if (E && p('script[src="__blocklet__.js"]').replaceWith(`<script>${E}<\/script>`), a != null && a.html && p("head").find("#injected-html-elements").replaceWith(a.html), t.cachedHtml) {
+    if (E && m('script[src="__blocklet__.js"]').replaceWith(`<script>${E}<\/script>`), p != null && p.html && m("head").find("#injected-html-elements").replaceWith(p.html), t.cachedHtml) {
       const r = I.load(t.cachedHtml);
-      p("body").html(r("body").html() || "");
+      m("body").html(r("body").html() || "");
     }
-    h = p.html(), b.send(h), P.info(`[html] render: ${t.path}, ${_()}ms`), p.root().children().remove(), h = null, e = null, a = null;
+    f = m.html(), b.send(f), P.info(`[html] render: ${t.path}, ${_()}ms`), m.root().children().remove(), f = null, e = null, p = null;
   }), c.use(k);
 }
 function F(c) {
-  const u = Q("image-bin");
-  return u && c && !/^(https?:\/\/|\/)/.test(c) ? s.env.appUrl + M(u, "uploads", c) : c;
+  const h = Q("image-bin");
+  return h && c && !/^(https?:\/\/|\/)/.test(c) ? a.env.appUrl + M(h, "uploads", c) : c;
 }
 export {
   me as default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/pages-kit-inner-components",
-  "version": "0.4.40",
+  "version": "0.4.41",
   "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.40",
-    "@blocklet/pages-kit-block-studio": "^0.4.40"
+    "@blocklet/pages-kit": "^0.4.41",
+    "@blocklet/pages-kit-block-studio": "^0.4.41"
   },
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "^5.2.1",