Merge pull request #17 from magne4000/brillout/dev

migrate to `vike`
vikejs · Sep 25, 2023 · c792d30 · c792d30
2 parents bd03f44 + e7be37b
commit c792d30
Show file tree

Hide file tree

Showing 19 changed files with 56 additions and 56 deletions.
diff --git a/examples/basic/package.json b/examples/basic/package.json
@@ -11,7 +11,7 @@
     "node-fetch": "^3.3.2",
     "solid-js": "^1.7.11",
     "vike-solid": "workspace:*",
-    "vite-plugin-ssr": "^0.4.142"
+    "vike": "^0.4.142"
   },
   "devDependencies": {
     "typescript": "^5.1.6"

diff --git a/examples/basic/pages/+config.h.ts b/examples/basic/pages/+config.h.ts
@@ -1,4 +1,4 @@
-import type { Config } from "vite-plugin-ssr/types";
+import type { Config } from "vike/types";
 import vikeSolid from "vike-solid";
 import Layout from "../layouts/LayoutDefault";
 import Head from "./Head";

diff --git a/examples/basic/pages/star-wars/@id/+onBeforeRender.ts b/examples/basic/pages/star-wars/@id/+onBeforeRender.ts
@@ -1,7 +1,7 @@
 export default onBeforeRender;
 
 import fetch from "cross-fetch";
-import type { PageContext } from "vite-plugin-ssr/types";
+import type { PageContext } from "vike/types";
 import { filterMovieData } from "../filterMovieData";
 import type { MovieDetails } from "../types";
 

diff --git a/examples/ssr-spa/README.md b/examples/ssr-spa/README.md
@@ -1,5 +1,5 @@
 Example of selecting SPA or SSR on a per-page basis. See
-[SPA vs SSR (and more)](https://vite-plugin-ssr.com/SPA-vs-SSR).
+[SPA vs SSR (and more)](https://vike.dev/SPA-vs-SSR).
 
 ```bash
 git clone [email protected]:magne4000/vike-solid

diff --git a/examples/ssr-spa/package.json b/examples/ssr-spa/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "solid-js": "^1.7.11",
     "vike-solid": "workspace:*",
-    "vite-plugin-ssr": "^0.4.142"
+    "vike": "^0.4.142"
   },
   "devDependencies": {
     "typescript": "^5.1.6"

diff --git a/examples/ssr-spa/pages/+config.h.ts b/examples/ssr-spa/pages/+config.h.ts
@@ -1,4 +1,4 @@
-import type { Config } from "vite-plugin-ssr/types";
+import type { Config } from "vike/types";
 import vikeSolid from "vike-solid";
 import Layout from "../layouts/LayoutDefault";
 import Head from "./Head";

diff --git a/examples/ssr-spa/pages/spa/+config.h.ts b/examples/ssr-spa/pages/spa/+config.h.ts
@@ -1,4 +1,4 @@
-import type { Config } from "vite-plugin-ssr/types";
+import type { Config } from "vike/types";
 
 export default {
   ssr: false, // SPA

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/vike-solid/README.md b/vike-solid/README.md
@@ -1,12 +1,12 @@
-[<img src="https://avatars.githubusercontent.com/u/86403530?s=200&v=4" align="right" width="64" height="64">](https://vite-plugin-ssr.com)
+[<img src="https://avatars.githubusercontent.com/u/86403530?s=200&v=4" align="right" width="64" height="64">](https://vike.dev)
 [![npm version](https://img.shields.io/npm/v/vike-solid)](https://www.npmjs.com/package/vike-solid)
 
 # `vike-solid`
 
-SolidJS integration for [Vike](https://github.com/brillout/vite-plugin-ssr/issues/736) (using the
-[V1 design](https://vite-plugin-ssr.com/migration/v1-design)).
+SolidJS integration for [Vike](https://github.com/vikejs/vike/issues/736) (using the
+[V1 design](https://vike.dev/migration/v1-design)).
 
 > [!NOTE]  
-> For integrations with React and Vue, see the other [`vike-*` packages](https://vite-plugin-ssr.com/vike-packages).
+> For integrations with React and Vue, see the other [`vike-*` packages](https://vike.dev/vike-packages).
 
 See [examples/](https://github.com/magne4000/vike-solid/tree/main/examples).
diff --git a/vike-solid/cli/build.ts b/vike-solid/cli/build.ts
@@ -1,6 +1,6 @@
 import { build } from "vite";
 import config from "../vite.config";
-// import { prerender } from 'vite-plugin-ssr/prerender'
+// import { prerender } from 'vike/prerender'
 
 main();
 

diff --git a/vike-solid/package.json b/vike-solid/package.json
@@ -20,7 +20,7 @@
   "peerDependencies": {
     "solid-js": "^1.7.12",
     "vite": "^4.4.9",
-    "vite-plugin-ssr": "^0.4.142"
+    "vike": "^0.4.142"
   },
   "devDependencies": {
     "@babel/core": "^7.22.20",
@@ -37,7 +37,7 @@
     "tslib": "^2.6.2",
     "typescript": "^5.2.2",
     "vite": "^4.4.9",
-    "vite-plugin-ssr": "^0.4.142"
+    "vike": "^0.4.142"
   },
   "typesVersions": {
     "*": {

diff --git a/vike-solid/renderer/+config.ts b/vike-solid/renderer/+config.ts
@@ -1,10 +1,10 @@
-import type { Config, ConfigEffect, PageContext } from "vite-plugin-ssr/types";
+import type { Config, ConfigEffect, PageContext } from "vike/types";
 // We purposely define the ConfigVikeSolid interface in this file: that way we ensure it's always applied whenever the user `import vikeSolid from 'vike-solid'`
 import type { Component } from "./types.js";
 
 // Depending on the value of `config.meta.ssr`, set other config options' `env`
 // accordingly.
-// See https://vite-plugin-ssr.com/meta#modify-existing-configurations
+// See https://vike.dev/meta#modify-existing-configurations
 const toggleSsrRelatedConfig: ConfigEffect = ({
   configDefinedAt,
   configValue,
@@ -74,7 +74,7 @@ declare global {
        * If false, render mode is SPA. In other words, the page will only be
        * rendered in the browser.
        *
-       * See https://vite-plugin-ssr.com/render-modes
+       * See https://vike.dev/render-modes
        *
        * @default true
        *

diff --git a/vike-solid/renderer/+onRenderClient.tsx b/vike-solid/renderer/+onRenderClient.tsx
@@ -2,7 +2,7 @@ export default onRenderClient;
 
 import { hydrate, render } from "solid-js/web";
 import { getTitle } from "./getTitle";
-import type { PageContextClient } from "vite-plugin-ssr/types";
+import type { PageContextClient } from "vike/types";
 import { getPageElement } from "./getPageElement";
 import { createStore, reconcile } from "solid-js/store";
 

diff --git a/vike-solid/renderer/+onRenderHtml.tsx b/vike-solid/renderer/+onRenderHtml.tsx
@@ -8,10 +8,10 @@ import {
   escapeInject,
   dangerouslySkipEscape,
   stampPipe,
-} from "vite-plugin-ssr/server";
+} from "vike/server";
 import { getTitle } from "./getTitle";
 import { getPageElement } from "./getPageElement";
-import type { PageContext } from "vite-plugin-ssr/types";
+import type { PageContext } from "vike/types";
 import { PageContextProvider } from "./PageContextProvider";
 
 async function onRenderHtml(pageContext: PageContext) {

diff --git a/vike-solid/renderer/PageContextProvider.tsx b/vike-solid/renderer/PageContextProvider.tsx
@@ -3,7 +3,7 @@ export { usePageContext };
 
 import { useContext, createContext, type JSX } from "solid-js";
 import { type Store } from "solid-js/store";
-import type { PageContext } from "vite-plugin-ssr/types";
+import type { PageContext } from "vike/types";
 import { getGlobalObject } from "./utils/getGlobalObject";
 
 const { Context } = getGlobalObject("PageContextProvider.ts", {

diff --git a/vike-solid/renderer/getPageElement.tsx b/vike-solid/renderer/getPageElement.tsx
@@ -1,4 +1,4 @@
-import type { PageContext } from "vite-plugin-ssr/types";
+import type { PageContext } from "vike/types";
 import { PageContextProvider, usePageContext } from "./PageContextProvider";
 import type { JSX } from "solid-js";
 import { Dynamic } from "solid-js/web";

diff --git a/vike-solid/renderer/getTitle.ts b/vike-solid/renderer/getTitle.ts
@@ -1,6 +1,6 @@
 export { getTitle };
 
-import type { PageContext } from "vite-plugin-ssr/types";
+import type { PageContext } from "vike/types";
 
 function getTitle(pageContext: PageContext): null | string {
   if (typeof pageContext.title === "string") {

diff --git a/vike-solid/rollup.config.js b/vike-solid/rollup.config.js
@@ -11,7 +11,7 @@ export default [
       "./cli/index.ts",
     ],
     ssr: true,
-    external: ["vite-plugin-ssr/server", "vite-plugin-ssr/plugin"],
+    external: ["vike/server", "vike/plugin"],
   }),
   withSolid({
     input: [
@@ -20,7 +20,7 @@ export default [
       "./cli/index.ts",
     ],
     ssr: false,
-    external: ["vite-plugin-ssr/server", "vite-plugin-ssr/plugin"],
+    external: ["vike/server", "vike/plugin"],
   }),
   {
     input: [

diff --git a/vike-solid/vite-plugin-vike-solid.ts b/vike-solid/vite-plugin-vike-solid.ts
@@ -1,5 +1,5 @@
 import solidPlugin, { type Options as SolidOptions } from "vite-plugin-solid";
-import ssr, { UserConfig } from "vite-plugin-ssr/plugin";
+import ssr, { UserConfig } from "vike/plugin";
 import { mergeConfig, type Plugin } from "vite";
 
 export interface Options {