@moneko/solid 1.10.5 → 1.11.0

package/env.d.ts

@@ -63,39 +63,34 @@ declare module '@app/docs' {
   export default entry;
 }
 declare module '@app/info' {
-  interface App {
-    /** 应用名称 */
+  /** 应用名称 */
+  export const name: string;
+  /** 应用描述 */
+  export const description: string;
+  /** 应用版本 */
+  export const version: string;
+  /** 应用类型 */
+  export const type: 'mobile' | 'site' | 'backstage' | 'micro' | 'library';
+  /** 开发者 */
+  export const author: {
     name: string;
-    /** 应用描述 */
-    description: string;
-    /** 应用版本 */
-    version: string;
-    /** 应用类型 */
-    type: 'mobile' | 'site' | 'backstage' | 'micro' | 'library';
-    /** 开发者 */
-    author: {
-      name: string;
-      url?: string;
-      email?: string;
-    };
-    /** 存储库 */
-    repository: {
-      type?: string;
-      url?: string;
-      directory?: string;
-    };
-    /** 路由模式 */
-    routerMode: 'hash' | 'browser';
-    /** 根路由 */
-    base: string;
-    prefixCls?: string;
-    theme?: string;
-    projectName: string;
-    ssr: boolean;
-  }
-  const app: App;
-
-  export default app;
+    url?: string;
+    email?: string;
+  };
+  /** 存储库 */
+  export const repository: {
+    type?: string;
+    url?: string;
+    directory?: string;
+  };
+  /** 路由模式 */
+  export const routerMode: 'hash' | 'browser';
+  /** 根路由 */
+  export const base: string;
+  export const prefixCls: string;
+  export const theme: string;
+  export const projectName: string;
+  export const ssr: boolean;
 }
 declare module '@app/routes' {
   import { RouteDefinition } from '@solidjs/router';
@@ -220,10 +215,7 @@ declare module '@app/locales' {
    * @param {Argument} values 用于替换占位符的值，按照占位符出现的顺序排列
    * @returns {string} 替换后的字符串
    */
-  export function interpolateString<T extends string>(
-    str: string,
-    values: InterpolationType<T>,
-  ): string;
+  export function template<T extends string>(str: string, values: InterpolationType<T>): string;
   /** 设置语言
    * @param {string} localeName 语言名称
    * @returns {void}

package/lib/entry.js

@@ -1,2 +1,2 @@
-import{createComponent as o}from"solid-js/web";import{createRoot as e,getOwner as r}from"solid-js";import{render as t,hydrate as n}from"solid-js/web";import p from"@app/info";import{Router as a,HashRouter as i}from"@solidjs/router";import m from"@app/routes";let s="hash"===p.routerMode?i:a,l=p.ssr?n:t;export function App(e){return o(s,{get base(){return e.basename},children:m})}export default function(t={}){let{container:n,basename:a=p.base,fallback:i,language:m,...s}=t,u=n?.querySelector("#root")||document.getElementById("root");return"micro"===p.type&&window&&(window.mainApp={...s,container:u}),e(()=>l(()=>o(App,{basename:a}),u),r())}
+import{createComponent as o}from"solid-js/web";import{createRoot as e,getOwner as r}from"solid-js";import{render as t,hydrate as n}from"solid-js/web";import{routerMode as i,ssr as m,base as p,type as a}from"@app/info";import{Router as s,HashRouter as l}from"@solidjs/router";import u from"@app/routes";let f="hash"===i?l:s,d=m?n:t;export function App(e){return o(f,{get base(){return e.basename},children:u})}export default function(t={}){let{container:n,basename:i=p,fallback:m,language:s,...l}=t,u=n?.querySelector("#root")||document.getElementById("root");return"micro"===a&&window&&(window.mainApp={...l,container:u}),e(()=>d(()=>o(App,{basename:i,fallback:m,language:s}),u),r())}
 //# sourceMappingURL=entry.js.map

package/lib/entry.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/entry.tsx"],"sourcesContent":["import { createRoot, getOwner } from 'solid-js';\nimport { render, hydrate } from 'solid-js/web';\nimport info from '@app/info';\nimport { Router as BrowserRouter, HashRouter } from '@solidjs/router';\nimport routeDefinition from '@app/routes';\nimport type { RenderAppProps } from './index.js';\n\nconst isHashRouter = info.routerMode === 'hash';\nconst Router = isHashRouter ? HashRouter : BrowserRouter;\n\nconst root = info.ssr ? hydrate : render;\n\nexport function App(props: RenderAppProps) {\n  return <Router base={props.basename}>{routeDefinition}</Router>;\n}\n\nfunction renderApp(props: RenderAppProps = {}) {\n  const { container, basename = info.base, fallback: _fallback, language: _language, ...args } = props;\n  const _container = (container?.querySelector('#root') ||\n    document.getElementById('root')) as HTMLElement;\n\n  if (info.type === 'micro' && window) {\n    window.mainApp = {\n      ...args,\n      container: _container as HTMLElement,\n    };\n  }\n  return createRoot(() => root(() => <App basename={basename} />, _container), getOwner());\n}\n\nexport default renderApp;\n"],"names":["createRoot","getOwner","render","hydrate","info","Router","BrowserRouter","HashRouter","routeDefinition","isHashRouter","routerMode","root","ssr","App","props","basename","container","base","fallback","_fallback","language","_language","args","_container","querySelector","document","getElementById","type","window","mainApp"],"mappings":"8CAAA,QAASA,cAAAA,CAAU,CAAEC,YAAAA,CAAQ,KAAQ,UAAW,AAChD,QAASC,UAAAA,CAAM,CAAEC,WAAAA,CAAO,KAAQ,cAAe,AAC/C,QAAOC,MAAU,WAAY,AAC7B,QAASC,UAAUC,CAAa,CAAEC,cAAAA,CAAU,KAAQ,iBAAkB,AACtE,QAAOC,MAAqB,aAAc,CAI1C,IAAMH,EAASI,AADML,AAAoB,SAApBA,EAAKM,UAAU,CACNH,EAAaD,EAErCK,EAAOP,EAAKQ,GAAG,CAAGT,EAAUD,CAElC,QAAO,SAASW,IAAIC,CAAqB,EACvC,SAAQT,qBAAaS,EAAMC,QAAQ,WAAGP,GACxC,CAgBA,eAdA,SAAmBM,EAAwB,CAAC,CAAC,EAC3C,GAAM,CAAEE,UAAAA,CAAS,CAAED,SAAAA,EAAWX,EAAKa,IAAI,CAAEC,SAAUC,CAAS,CAAEC,SAAUC,CAAS,CAAE,GAAGC,EAAM,CAAGR,EACzFS,EAAcP,GAAWQ,cAAc,UAC3CC,SAASC,cAAc,CAAC,QAQ1B,MANkB,UAAdtB,EAAKuB,IAAI,EAAgBC,QAC3BA,CAAAA,OAAOC,OAAO,CAAG,CACf,GAAGP,CAAI,CACPN,UAAWO,CACb,CAAA,EAEKvB,EAAW,IAAMW,EAAK,MAAOE,cAAcE,IAAcQ,GAAatB,IAC/E"}
+{"version":3,"sources":["../src/entry.tsx"],"sourcesContent":["import { createRoot, getOwner } from 'solid-js';\nimport { render, hydrate } from 'solid-js/web';\nimport { routerMode, ssr, base, type } from '@app/info';\nimport { Router as BrowserRouter, HashRouter } from '@solidjs/router';\nimport routeDefinition from '@app/routes';\nimport type { RenderAppProps } from './index.js';\n\nconst isHashRouter = routerMode === 'hash';\nconst Router = isHashRouter ? HashRouter : BrowserRouter;\nconst root = ssr ? hydrate : render;\n\nexport function App(props: RenderAppProps) {\n  return <Router base={props.basename}>{routeDefinition}</Router>;\n}\n\nfunction renderApp(props: RenderAppProps = {}) {\n  const { container, basename = base, fallback, language, ...args } = props;\n  const _container = (container?.querySelector('#root') ||\n    document.getElementById('root')) as HTMLElement;\n\n  if (type === 'micro' && window) {\n    window.mainApp = {\n      ...args,\n      container: _container as HTMLElement,\n    };\n  }\n  return createRoot(\n    () =>\n      root(() => <App basename={basename} fallback={fallback} language={language} />, _container),\n    getOwner()\n  );\n}\n\nexport default renderApp;\n"],"names":["createRoot","getOwner","render","hydrate","routerMode","ssr","base","type","Router","BrowserRouter","HashRouter","routeDefinition","isHashRouter","root","App","props","basename","container","fallback","language","args","_container","querySelector","document","getElementById","window","mainApp"],"mappings":"8CAAA,QAASA,cAAAA,CAAU,CAAEC,YAAAA,CAAQ,KAAQ,UAAW,AAChD,QAASC,UAAAA,CAAM,CAAEC,WAAAA,CAAO,KAAQ,cAAe,AAC/C,QAASC,cAAAA,CAAU,CAAEC,OAAAA,CAAG,CAAEC,QAAAA,CAAI,CAAEC,QAAAA,CAAI,KAAQ,WAAY,AACxD,QAASC,UAAUC,CAAa,CAAEC,cAAAA,CAAU,KAAQ,iBAAkB,AACtE,QAAOC,MAAqB,aAAc,CAI1C,IAAMH,EAASI,AADMR,AAAe,SAAfA,EACSM,EAAaD,EACrCI,EAAOR,EAAMF,EAAUD,CAE7B,QAAO,SAASY,IAAIC,CAAqB,EACvC,SAAQP,qBAAaO,EAAMC,QAAQ,WAAGL,GACxC,CAoBA,eAlBA,SAAmBI,EAAwB,CAAC,CAAC,EAC3C,GAAM,CAAEE,UAAAA,CAAS,CAAED,SAAAA,EAAWV,CAAI,CAAEY,SAAAA,CAAQ,CAAEC,SAAAA,CAAQ,CAAE,GAAGC,EAAM,CAAGL,EAC9DM,EAAcJ,GAAWK,cAAc,UAC3CC,SAASC,cAAc,CAAC,QAQ1B,MANa,UAATjB,GAAoBkB,QACtBA,CAAAA,OAAOC,OAAO,CAAG,CACf,GAAGN,CAAI,CACPH,UAAWI,CACb,CAAA,EAEKrB,EACL,IACEa,EAAK,MAAOC,cAAcE,WAAoBE,WAAoBC,IAAcE,GAClFpB,IAEJ"}

package/lib/get-pathname.js

@@ -1,2 +1,2 @@
-import t from"@app/info";let e=t.base.length,n=e>1&&!function(t,e){let n=t.length;return!(1>n)&&t.lastIndexOf("/")===n-1}(t.base,0)?e+1:e;export default function(t){return t.pathname.substring(n)}
+import{base as t}from"@app/info";let n=t.length,e=n>1&&!function(t,n){let e=t.length;return!(1>e)&&t.lastIndexOf("/")===e-1}(t,0)?n+1:n;export default function(t){return t.pathname.substring(e)}
 //# sourceMappingURL=get-pathname.js.map

package/lib/get-pathname.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/get-pathname.ts"],"sourcesContent":["import type { Location } from '@solidjs/router';\nimport app from '@app/info';\n\nfunction endsWith(str: string, suffix: string): boolean {\n  const strLen = str.length;\n  const suffixLen = suffix.length;\n\n  if (suffixLen > strLen) {\n    return false;\n  }\n  return str.lastIndexOf(suffix) === strLen - suffixLen;\n}\nconst len = app.base.length;\nconst prefix = len > 1 ? (endsWith(app.base, '/') ? len : len + 1) : len;\n\nfunction getPathName(location: Location) {\n  return location.pathname.substring(prefix);\n}\n\nexport default getPathName;\n"],"names":["app","len","base","length","prefix","endsWith","str","suffix","strLen","suffixLen","lastIndexOf","location","pathname","substring"],"mappings":"AACA,OAAOA,MAAS,WAAY,CAW5B,IAAMC,EAAMD,EAAIE,IAAI,CAACC,MAAM,CACrBC,EAASH,EAAM,IAAKI,AAV1B,SAAkBC,CAAW,CAAEC,CAAc,EAC3C,IAAMC,EAASF,EAAIH,MAAM,OAGzB,CAAIM,CAAAA,AAMuC,EAN3BD,CAAK,GAGdF,EAAII,WAAW,CAGqB,OAHRF,EAGQ,CAF7C,EAEmCR,EAAIE,IAAI,CAAE,GAAaD,EAAM,EAAZA,CAMpD,gBAJA,SAAqBU,CAAkB,EACrC,OAAOA,EAASC,QAAQ,CAACC,SAAS,CAACT,EACrC"}
+{"version":3,"sources":["../src/get-pathname.ts"],"sourcesContent":["import type { Location } from '@solidjs/router';\nimport { base } from '@app/info';\n\nfunction endsWith(str: string, suffix: string): boolean {\n  const strLen = str.length;\n  const suffixLen = suffix.length;\n\n  if (suffixLen > strLen) {\n    return false;\n  }\n  return str.lastIndexOf(suffix) === strLen - suffixLen;\n}\nconst len = base.length;\nconst prefix = len > 1 ? (endsWith(base, '/') ? len : len + 1) : len;\n\nfunction getPathName(location: Location) {\n  return location.pathname.substring(prefix);\n}\n\nexport default getPathName;\n"],"names":["base","len","length","prefix","endsWith","str","suffix","strLen","suffixLen","lastIndexOf","location","pathname","substring"],"mappings":"AACA,OAASA,QAAAA,CAAI,KAAQ,WAAY,CAWjC,IAAMC,EAAMD,EAAKE,MAAM,CACjBC,EAASF,EAAM,IAAKG,AAV1B,SAAkBC,CAAW,CAAEC,CAAc,EAC3C,IAAMC,EAASF,EAAIH,MAAM,OAGzB,CAAIM,CAAAA,AAMmC,EANvBD,CAAK,GAGdF,EAAII,WAAW,CAGiB,OAHJF,EAGI,CAFzC,EAEmCP,EAAM,GAAaC,EAAM,EAAZA,CAMhD,gBAJA,SAAqBS,CAAkB,EACrC,OAAOA,EAASC,QAAQ,CAACC,SAAS,CAACT,EACrC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moneko/solid",
-  "version": "1.10.5",
+  "version": "1.11.0",
   "description": "Solid js",
   "main": "lib/index.js",
   "scripts": {
@@ -21,8 +21,8 @@
     "@moneko/transform-imports": "0.6.1",
     "@swc/cli": "0.4.0",
     "@swc/core": "1.6.13",
-    "solid-js": "1.9.2",
-    "typescript": "5.6.2"
+    "solid-js": "1.8.23",
+    "typescript": "5.5.4"
   },
   "files": [
     "lib",