@moneko/solid 1.3.0 → 1.4.1

package/env.d.ts

@@ -40,7 +40,7 @@ declare module '@app/docs' {
 
   export default entry;
 }
-declare module '@app' {
+declare module '@app/info' {
   interface App {
     /** 应用名称 */
     name: string;

package/lib/entry.js

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

package/lib/entry.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/entry.tsx"],"sourcesContent":["import { type RouteDefinition, Router, useRoutes } from '@solidjs/router';\nimport { type JSXElement, createRoot, getOwner } from 'solid-js';\nimport { render } from 'solid-js/web';\nimport app from '@app';\nimport routeDefinition from '@app/routes';\n\ntype RenderAppProps = {\n  container?: HTMLElement;\n  basename?: string;\n  fallback?: JSXElement;\n  language?: string;\n};\n\nfunction renderApp(props: RenderAppProps = {}) {\n  const { container, basename = app.base, fallback, language, ...args } = props;\n  const _container = (container?.querySelector('#root') || document.getElementById('root')) as HTMLElement;\n\n  if (app.type === 'micro') {\n    window.mainApp = {\n      ...args,\n      container: _container as HTMLElement,\n    };\n  }\n  return createRoot(() => {\n    function App() {\n      const Routes = useRoutes(routeDefinition as RouteDefinition[]);\n\n      return (\n        <Router base={basename}>\n          <Routes />\n        </Router>\n      );\n    }\n    return render(App, _container);\n  }, getOwner());\n}\n\nexport default renderApp;\n"],"names":["Router","useRoutes","createRoot","getOwner","render","app","routeDefinition","props","container","basename","base","fallback","language","args","_container","querySelector","document","getElementById","type","window","mainApp","Routes"],"mappings":"8CAAA,QAA+BA,UAAAA,CAAM,CAAEC,aAAAA,CAAS,KAAQ,iBAAkB,AAC1E,QAA0BC,cAAAA,CAAU,CAAEC,YAAAA,CAAQ,KAAQ,UAAW,AACjE,QAASC,UAAAA,CAAM,KAAQ,cAAe,AACtC,QAAOC,MAAS,MAAO,AACvB,QAAOC,MAAqB,aAAc,AAiC1C,gBAxBA,SAAmBC,EAAwB,CAAC,CAAC,EAC3C,GAAM,CAAEC,UAAAA,CAAS,CAAEC,SAAAA,EAAWJ,EAAIK,IAAI,CAAEC,SAAAA,CAAQ,CAAEC,SAAAA,CAAQ,CAAE,GAAGC,EAAM,CAAGN,EAClEO,EAAcN,GAAWO,cAAc,UAAYC,SAASC,cAAc,CAAC,QAQjF,MANiB,UAAbZ,EAAIa,IAAI,EACVC,CAAAA,OAAOC,OAAO,CAAG,CACf,GAAGP,CAAI,CACPL,UAAWM,CACb,CAAA,EAEKZ,EAAW,IAUTE,EATP,WACE,IAAMiB,EAASpB,EAAUK,GAEzB,SACGN,QAAaS,0BACXY,QAGP,EACmBP,GAClBX,IACL"}
+{"version":3,"sources":["../src/entry.tsx"],"sourcesContent":["import { type RouteDefinition, Router, useRoutes } from '@solidjs/router';\nimport { type JSXElement, createRoot, getOwner } from 'solid-js';\nimport { render } from 'solid-js/web';\nimport app from '@app/info';\nimport routeDefinition from '@app/routes';\n\ntype RenderAppProps = {\n  container?: HTMLElement;\n  basename?: string;\n  fallback?: JSXElement;\n  language?: string;\n};\n\nfunction renderApp(props: RenderAppProps = {}) {\n  const { container, basename = app.base, fallback, language, ...args } = props;\n  const _container = (container?.querySelector('#root') || document.getElementById('root')) as HTMLElement;\n\n  if (app.type === 'micro') {\n    window.mainApp = {\n      ...args,\n      container: _container as HTMLElement,\n    };\n  }\n  return createRoot(() => {\n    function App() {\n      const Routes = useRoutes(routeDefinition as RouteDefinition[]);\n\n      return (\n        <Router base={basename}>\n          <Routes />\n        </Router>\n      );\n    }\n    return render(App, _container);\n  }, getOwner());\n}\n\nexport default renderApp;\n"],"names":["Router","useRoutes","createRoot","getOwner","render","app","routeDefinition","props","container","basename","base","fallback","language","args","_container","querySelector","document","getElementById","type","window","mainApp","Routes"],"mappings":"8CAAA,QAA+BA,UAAAA,CAAM,CAAEC,aAAAA,CAAS,KAAQ,iBAAkB,AAC1E,QAA0BC,cAAAA,CAAU,CAAEC,YAAAA,CAAQ,KAAQ,UAAW,AACjE,QAASC,UAAAA,CAAM,KAAQ,cAAe,AACtC,QAAOC,MAAS,WAAY,AAC5B,QAAOC,MAAqB,aAAc,AAiC1C,gBAxBA,SAAmBC,EAAwB,CAAC,CAAC,EAC3C,GAAM,CAAEC,UAAAA,CAAS,CAAEC,SAAAA,EAAWJ,EAAIK,IAAI,CAAEC,SAAAA,CAAQ,CAAEC,SAAAA,CAAQ,CAAE,GAAGC,EAAM,CAAGN,EAClEO,EAAcN,GAAWO,cAAc,UAAYC,SAASC,cAAc,CAAC,QAQjF,MANiB,UAAbZ,EAAIa,IAAI,EACVC,CAAAA,OAAOC,OAAO,CAAG,CACf,GAAGP,CAAI,CACPL,UAAWM,CACb,CAAA,EAEKZ,EAAW,IAUTE,EATP,WACE,IAAMiB,EAASpB,EAAUK,GAEzB,SACGN,QAAaS,0BACXY,QAGP,EACmBP,GAClBX,IACL"}

package/lib/get-pathname.js

@@ -1,2 +1,2 @@
-import t from"@app";let e=t.base.length,n=e>1?t.base.endsWith("/")?e:e+1:e;export default function(t){return t.pathname.substring(n)}
+import t from"@app/info";let e=t.base.length,n=e>1?t.base.endsWith("/")?e:e+1:e;export default function(t){return t.pathname.substring(n)}
 //# 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';\n\nconst len = app.base.length;\nconst prefix = len > 1 ? (app.base.endsWith('/') ? 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","location","pathname","substring"],"mappings":"AACA,OAAOA,MAAS,MAAO,CAEvB,IAAMC,EAAMD,EAAIE,IAAI,CAACC,MAAM,CACrBC,EAASH,EAAM,EAAKD,EAAIE,IAAI,CAACG,QAAQ,CAAC,KAAOJ,EAAMA,EAAM,EAAKA,CAMpE,gBAJA,SAAqBK,CAAkB,EACrC,OAAOA,EAASC,QAAQ,CAACC,SAAS,CAACJ,EACrC"}
+{"version":3,"sources":["../src/get-pathname.ts"],"sourcesContent":["import { type Location } from '@solidjs/router';\nimport app from '@app/info';\n\nconst len = app.base.length;\nconst prefix = len > 1 ? (app.base.endsWith('/') ? 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","location","pathname","substring"],"mappings":"AACA,OAAOA,MAAS,WAAY,CAE5B,IAAMC,EAAMD,EAAIE,IAAI,CAACC,MAAM,CACrBC,EAASH,EAAM,EAAKD,EAAIE,IAAI,CAACG,QAAQ,CAAC,KAAOJ,EAAMA,EAAM,EAAKA,CAMpE,gBAJA,SAAqBK,CAAkB,EACrC,OAAOA,EAASC,QAAQ,CAACC,SAAS,CAACJ,EACrC"}

package/mdx.d.ts

@@ -1,17 +1,16 @@
 import { type ParentProps, type JSX, type Component } from 'solid-js';
-export declare const MDXContext: import("solid-js").Context<{}>;
-export declare function useMDXComponents(components: MDXProviderProps['components']): Components;
+export interface MDXComponents {
+    [k: string]: (props: ParentProps) => JSX.Element;
+}
+export declare function useMDXComponents(components: MDXProviderProps['components']): MDXComponents;
 export declare function withMDXComponents(Comp: Component): (props: MDXProviderProps) => () => (Node & {
     [key: string]: any;
 }) | (Node & {
     [key: string]: any;
 })[];
-interface Components {
-    [k: string]: (props: ParentProps) => JSX.Element;
-}
-interface MDXProviderProps extends Component {
+export interface MDXProviderProps extends Component {
     children: JSX.Element;
-    components: Components | ((props: ParentProps) => Components);
+    components: MDXComponents | ((props: ParentProps) => MDXComponents);
     disableParentContext?: boolean;
 }
 export declare function MDXProvider({ components, children, disableParentContext }: MDXProviderProps): () => (Node & {
@@ -19,4 +18,3 @@ export declare function MDXProvider({ components, children, disableParentContext
 }) | (Node & {
     [key: string]: any;
 })[];
-export {};

package/mdx.js

@@ -1,3 +1,3 @@
-import{createContext as t,useContext as o}from"solid-js";import n from"solid-js/h";export const MDXContext=t({});export function useMDXComponents(t){let n=o(MDXContext);return"function"==typeof t?t(n):{...n,...t}}export function withMDXComponents(t){return function(o){let e=useMDXComponents(o.components);return n(t,{...o,allComponents:e})}}let e={};export function MDXProvider({components:t,children:o,disableParentContext:r}){let i;return i=r?"function"==typeof t?t({}):t||e:useMDXComponents(t),n(MDXContext.Provider,{value:i,children:o})}
+import{createContext as o,useContext as n}from"solid-js";import t from"solid-js/h";let e={},r=o(e);export function useMDXComponents(o){let t=n(r);return"function"==typeof o?o(t):{...t,...o}}export function withMDXComponents(o){return function(n){let e=useMDXComponents(n.components);return t(o,{...n,allComponents:e})}}export function MDXProvider({components:o,children:n,disableParentContext:i}){let u;return u=i?"function"==typeof o?o(e):o||e:useMDXComponents(o),t(r.Provider,{value:u,children:n})}
 
 //# sourceMappingURL=mdx.js.map

package/mdx.js.map

@@ -1 +1 @@
-{"version":3,"sources":["mdx.ts"],"names":[],"mappings":"AAAA,OAAS,iBAAA,CAAa,CAAE,cAAA,CAAU,KAAoD,UAAW,AACjG,QAAO,MAAO,YAAa,AAE3B,QAAO,MAAM,WAAa,EAAc,CAAC,EAAG,AAE5C,QAAO,SAAS,iBAAiB,CAA0C,EACzE,IAAM,EAAoB,EAAW,kBAErC,AAAI,AAAsB,YAAtB,OAAO,EACF,EAAW,GAGb,CAAE,GAAG,CAAiB,CAAE,GAAG,CAAU,AAAC,CAC/C,CACA,OAAO,SAAS,kBAAkB,CAAe,EAM/C,OALA,SAA2B,CAAuB,EAChD,IAAM,EAAgB,iBAAiB,EAAM,UAAU,EAEvD,OAAO,EAAE,EAAM,CAAE,GAAG,CAAK,CAAE,cAAA,CAAc,EAC3C,CAEF,CAUA,IAAM,EAAc,CAAC,CAErB,QAAO,SAAS,YAAY,CAAE,WAAA,CAAU,CAAE,SAAA,CAAQ,CAAE,qBAAA,CAAoB,CAAoB,EAC1F,IAAI,EAQJ,OALE,EADE,EACc,AAAsB,YAAtB,OAAO,EAA4B,EAAW,CAAC,GAAK,GAAc,EAElE,iBAAiB,GAG5B,EAAE,WAAW,QAAQ,CAAE,CAAE,MAAO,EAAe,SAAU,CAAS,EAC3E","file":"mdx.js","sourcesContent":["import { createContext, useContext, type ParentProps, type JSX, type Component } from 'solid-js';\nimport h from 'solid-js/h';\n\nexport const MDXContext = createContext({});\n\nexport function useMDXComponents(components: MDXProviderProps['components']) {\n  const contextComponents = useContext(MDXContext);\n\n  if (typeof components === 'function') {\n    return components(contextComponents);\n  }\n\n  return { ...contextComponents, ...components };\n}\nexport function withMDXComponents(Comp: Component) {\n  function boundMDXComponent(props: MDXProviderProps) {\n    const allComponents = useMDXComponents(props.components);\n\n    return h(Comp, { ...props, allComponents });\n  }\n  return boundMDXComponent;\n}\n\ninterface Components {\n  [k: string]: (props: ParentProps) => JSX.Element;\n}\ninterface MDXProviderProps extends Component {\n  children: JSX.Element;\n  components: Components | ((props: ParentProps) => Components);\n  disableParentContext?: boolean;\n}\nconst emptyObject = {};\n\nexport function MDXProvider({ components, children, disableParentContext }: MDXProviderProps) {\n  let allComponents;\n\n  if (disableParentContext) {\n    allComponents = typeof components === 'function' ? components({}) : components || emptyObject;\n  } else {\n    allComponents = useMDXComponents(components);\n  }\n\n  return h(MDXContext.Provider, { value: allComponents, children: children });\n}\n"]}
+{"version":3,"sources":["mdx.ts"],"names":[],"mappings":"AAAA,OAAS,iBAAA,CAAa,CAAE,cAAA,CAAU,KAAqE,UAAW,AAClH,QAAO,MAAO,YAAa,CAM3B,IAAM,EAAuC,CAAC,EACxC,EAAa,EAAc,EAEjC,QAAO,SAAS,iBAAiB,CAA0C,EACzE,IAAM,EAAoB,EAAW,SAErC,AAAI,AAAsB,YAAtB,OAAO,EACF,EAAW,GAGb,CAAE,GAAG,CAAiB,CAAE,GAAG,CAAU,AAAC,CAC/C,CACA,OAAO,SAAS,kBAAkB,CAAe,EAM/C,OALA,SAA2B,CAAuB,EAChD,IAAM,EAAgB,iBAAiB,EAAM,UAAU,EAEvD,OAAO,EAAE,EAAM,CAAE,GAAG,CAAK,CAAE,cAAA,CAAc,EAC3C,CAEF,CAQA,OAAO,SAAS,YAAY,CAAE,WAAA,CAAU,CAAE,SAAA,CAAQ,CAAE,qBAAA,CAAoB,CAAoB,EAC1F,IAAI,EAQJ,OALE,EADE,EACc,AAAsB,YAAtB,OAAO,EAA4B,EAAW,GAAe,GAAc,EAE3E,iBAAiB,GAG5B,EAAE,EAAW,QAAQ,CAAE,CAAE,MAAO,EAAe,SAAU,CAAS,EAC3E","file":"mdx.js","sourcesContent":["import { createContext, useContext, type ParentProps, type JSX, type Component, createComponent } from 'solid-js';\nimport h from 'solid-js/h';\n\nexport interface MDXComponents {\n  [k: string]: (props: ParentProps) => JSX.Element;\n}\n\nconst emptyObject: Readonly<MDXComponents> = {};\nconst MDXContext = createContext(emptyObject);\n\nexport function useMDXComponents(components: MDXProviderProps['components']) {\n  const contextComponents = useContext(MDXContext);\n\n  if (typeof components === 'function') {\n    return components(contextComponents);\n  }\n\n  return { ...contextComponents, ...components };\n}\nexport function withMDXComponents(Comp: Component) {\n  function boundMDXComponent(props: MDXProviderProps) {\n    const allComponents = useMDXComponents(props.components);\n\n    return h(Comp, { ...props, allComponents });\n  }\n  return boundMDXComponent;\n}\n\nexport interface MDXProviderProps extends Component {\n  children: JSX.Element;\n  components: MDXComponents | ((props: ParentProps) => MDXComponents);\n  disableParentContext?: boolean;\n}\n\nexport function MDXProvider({ components, children, disableParentContext }: MDXProviderProps) {\n  let allComponents: MDXComponents;\n\n  if (disableParentContext) {\n    allComponents = typeof components === 'function' ? components(emptyObject) : components || emptyObject;\n  } else {\n    allComponents = useMDXComponents(components);\n  }\n\n  return h(MDXContext.Provider, { value: allComponents, children: children });\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moneko/solid",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "description": "Solid js",
   "main": "lib/index.js",
   "scripts": {
@@ -12,18 +12,18 @@
   "type": "module",
   "license": "MIT",
   "dependencies": {
-    "@moneko/jsx-dom-expressions": "0.2.0",
-    "@solidjs/router": "0.8.3"
+    "@moneko/jsx-dom-expressions": "0.2.1",
+    "@solidjs/router": "0.9.1"
   },
   "devDependencies": {
-    "@swc/cli": "0.1.62",
-    "@swc/core": "1.3.94",
-    "@types/webpack-env": "1.18.3",
-    "eslint-config-neko": "2.0.2",
-    "solid-js": "1.8.4",
-    "stylelint-config-moneko": "1.0.18",
+    "@swc/cli": "0.1.63",
+    "@swc/core": "1.3.100",
+    "@types/webpack-env": "1.18.4",
+    "eslint-config-neko": "2.2.0",
+    "solid-js": "1.8.7",
+    "stylelint-config-moneko": "1.2.1",
     "swc-plugin-another-transform-imports": "0.2.7",
-    "typescript": "5.2.2"
+    "typescript": "5.3.2"
   },
   "files": [
     "lib",