vike-solid 0.4.2 → 0.4.3

package/README.md

@@ -21,7 +21,7 @@ SolidJS integration for Vike, see [vike.dev/solid](https://vike.dev/solid).
 
 ## Scaffold new app
 
-Use [Bati](https://batijs.github.io/) to scaffold a Vike app using `vike-solid`.
+Use [Bati](https://batijs.dev/) to scaffold a Vike app using `vike-solid`.
 
 ## Add to existing app
 
@@ -54,7 +54,7 @@ export default {
 3. Extend your existing Vike config files with `vike-solid`:
 
 ```diff
- // /pages/+config.h.js
+ // /pages/+config.js
 
 +import vikeSolid from 'vike-solid/config'
 +

package/dist/components/ClientOnly.d.ts

@@ -1,5 +1,8 @@
-import { Component, JSX } from 'solid-js';
+import { Component, JSX, ComponentProps } from 'solid-js';
 
+/**
+ * @deprecated Replaced by {@link clientOnly}
+ */
 declare function ClientOnly<T>(props: {
     load: () => Promise<{
         default: Component<T>;
@@ -7,5 +10,14 @@ declare function ClientOnly<T>(props: {
     children: (Component: Component<T>) => JSX.Element;
     fallback: JSX.Element;
 }): JSX.Element;
+/**
+ * Same as `clientOnly` from solid-start
+ * @see {@link https://docs.solidjs.com/solid-start/reference/client/client-only}
+ */
+declare function clientOnly<T extends Component<any>>(fn: () => Promise<{
+    default: T;
+}>): (props: ComponentProps<T> & {
+    fallback?: JSX.Element;
+}) => any;
 
-export { ClientOnly };
+export { ClientOnly, clientOnly };

package/dist/components/ClientOnly.js

@@ -1,10 +1,14 @@
-import { createComponent, Dynamic, ssr, ssrHydrationKey } from 'solid-js/web';
-import { createSignal, createEffect, Suspense, lazy } from 'solid-js';
+import { createComponent, Dynamic, isServer, ssr, ssrHydrationKey } from 'solid-js/web';
+import { createSignal, createEffect, Suspense, splitProps, sharedConfig, onMount, createMemo, untrack, lazy } from 'solid-js';
 
 var _tmpl$ = ["<p", ">Error loading component.</p>"];
 function ClientOnlyError() {
   return ssr(_tmpl$, ssrHydrationKey());
 }
+
+/**
+ * @deprecated Replaced by {@link clientOnly}
+ */
 function ClientOnly(props) {
   const [getComponent, setComponent] = createSignal(undefined);
   createEffect(() => {
@@ -37,4 +41,24 @@ function ClientOnly(props) {
   });
 }
 
-export { ClientOnly };
+// Copied from https://github.com/solidjs/solid-start/blob/2d75d5fedfd11f739b03ca34decf23865868ac09/packages/start/src/shared/clientOnly.tsx#L7
+/**
+ * Same as `clientOnly` from solid-start
+ * @see {@link https://docs.solidjs.com/solid-start/reference/client/client-only}
+ */
+function clientOnly(fn) {
+  if (isServer) return props => props.fallback;
+  const [comp, setComp] = createSignal();
+  fn().then(m => setComp(() => m.default));
+  return props => {
+    let Comp;
+    let m;
+    const [, rest] = splitProps(props, ["fallback"]);
+    if ((Comp = comp()) && !sharedConfig.context) return Comp(rest);
+    const [mounted, setMounted] = createSignal(!sharedConfig.context);
+    onMount(() => setMounted(true));
+    return createMemo(() => (Comp = comp(), m = mounted(), untrack(() => Comp && m ? Comp(rest) : props.fallback)));
+  };
+}
+
+export { ClientOnly, clientOnly };

package/dist/main.js

@@ -1,4 +1,4 @@
 export { config } from './+config.js';
 
 // TODO/next-major-release: remove this file/export
-console.warn("[vike-solid][warning][deprecation] Replace `import vikeVue from 'vike-solid'` with `import vikeSolid from 'vike-solid/config'` (typically in your /pages/+config.h.js)");
+console.warn("[vike-solid][warning][deprecation] Replace `import vikeVue from 'vike-solid'` with `import vikeSolid from 'vike-solid/config'` (typically in your /pages/+config.js)");

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "vike-solid",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "type": "module",
   "dependencies": {
-    "vite-plugin-solid": "^2.10.1"
+    "vite-plugin-solid": "^2.10.2"
   },
   "peerDependencies": {
     "solid-js": "^1.8.7",
@@ -11,21 +11,21 @@
     "vite": "^4.4 || ^5.0.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.9",
-    "@babel/preset-env": "^7.23.9",
-    "@babel/preset-typescript": "^7.23.3",
+    "@babel/core": "^7.24.3",
+    "@babel/preset-env": "^7.24.3",
+    "@babel/preset-typescript": "^7.24.1",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/node": "^18.17.4",
-    "babel-preset-solid": "^1.8.15",
-    "bumpp": "^9.3.0",
-    "rollup": "^4.12.0",
+    "babel-preset-solid": "^1.8.16",
+    "bumpp": "^9.4.0",
+    "rollup": "^4.13.2",
     "rollup-plugin-dts": "^6.1.0",
-    "solid-js": "^1.8.15",
+    "solid-js": "^1.8.16",
     "tslib": "^2.6.2",
-    "typescript": "^5.3.3",
-    "vike": "^0.4.163",
-    "vite": "^5.1.4"
+    "typescript": "^5.4.3",
+    "vike": "^0.4.168",
+    "vite": "^5.2.7"
   },
   "exports": {
     ".": "./dist/main.js",