Merge pull request #26 from magne4000/vike-renaming

refactor: Vike renaming
magne4000 · Sep 25, 2023 · 1af3245 · 1af3245 · vercel · Sep 25, 2023
2 parents ea68ccb + 0c2e577
commit 1af3245
Show file tree

Hide file tree

Showing 54 changed files with 159 additions and 167 deletions.
diff --git a/examples/demo-vps-0.4/package.json b/examples/demo-vps-0.4/package.json
@@ -12,7 +12,7 @@
     "test:02": "vitest run --dir tests/02-additional-endpoints --config tests/02-additional-endpoints/vitest.config.ts",
     "test:03": "vitest run --dir tests/03-prerender --config tests/03-prerender/vitest.config.ts",
     "test:04": "vitest run --dir tests/04-isr --config tests/04-isr/vitest.config.ts",
-    "test:05": "vite build && vitest run --dir tests/05-vite-plugin-ssr --config tests/05-vite-plugin-ssr/vitest.config.ts"
+    "test:05": "vite build && vitest run --dir tests/05-vike --config tests/05-vike/vitest.config.ts"
   },
   "license": "MIT",
   "devDependencies": {
@@ -37,7 +37,7 @@
     "react-dom": "^18.2.0",
     "typescript": "^5.2.2",
     "vite": "^4.4.9",
-    "vite-plugin-ssr": "^0.4.141",
+    "vike": "^0.4.142",
     "vite-plugin-vercel": "workspace:*"
   },
   "version": null

diff --git a/examples/demo-vps-0.4/pages/function/index.page.route.ts b/examples/demo-vps-0.4/pages/function/index.page.route.ts
@@ -1,4 +1,4 @@
-import { PageContextBuiltInServer } from 'vite-plugin-ssr/types';
+import { PageContextBuiltInServer } from 'vike/types';
 
 export default (pageContext: PageContextBuiltInServer) => {
   if (!pageContext.urlOriginal.startsWith('/function/')) return false;

diff --git a/examples/demo-vps-0.4/pages/named/index.page.server.ts b/examples/demo-vps-0.4/pages/named/index.page.server.ts
@@ -1,4 +1,4 @@
-import { PageContextBuiltInServer } from 'vite-plugin-ssr/types';
+import { PageContextBuiltInServer } from 'vike/types';
 
 export function onBeforeRender(pageContext: PageContextBuiltInServer) {
   return {

diff --git a/examples/demo-vps-0.4/renderer/_default.page.client.tsx b/examples/demo-vps-0.4/renderer/_default.page.client.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { createRoot, hydrateRoot, Root } from 'react-dom/client';
-import type { PageContextBuiltInClientWithClientRouting as PageContextBuiltInClient } from 'vite-plugin-ssr/types';
+import type { PageContextBuiltInClientWithClientRouting as PageContextBuiltInClient } from 'vike/types';
 import { PageWrapper } from './PageWrapper';
 import type { PageContext } from './types';
 

diff --git a/examples/demo-vps-0.4/renderer/_default.page.server.tsx b/examples/demo-vps-0.4/renderer/_default.page.server.tsx
@@ -1,14 +1,14 @@
 import ReactDOMServer from 'react-dom/server';
 import React from 'react';
 import { PageWrapper } from './PageWrapper';
-import { escapeInject, dangerouslySkipEscape } from 'vite-plugin-ssr/server';
+import { escapeInject, dangerouslySkipEscape } from 'vike/server';
 import logoUrl from './logo.svg';
 import type { PageContext } from './types';
-import type { PageContextBuiltInServer } from 'vite-plugin-ssr/types';
+import type { PageContextBuiltInServer } from 'vike/types';
 
 export { render };
 
-// See https://vite-plugin-ssr.com/data-fetching
+// See https://vike.dev/data-fetching
 export const passToClient = ['pageProps', 'urlPathname', 'documentProps'];
 
 async function render(pageContext: PageContextBuiltInServer & PageContext) {
@@ -19,12 +19,11 @@ async function render(pageContext: PageContextBuiltInServer & PageContext) {
     </PageWrapper>,
   );
 
-  // See https://vite-plugin-ssr.com/html-head
+  // See https://vike.dev/html-head
   const { documentProps } = pageContext;
   const title = (documentProps && documentProps.title) || 'Vite SSR app';
   const desc =
-    (documentProps && documentProps.description) ||
-    'App using Vite + vite-plugin-ssr';
+    (documentProps && documentProps.description) || 'App using Vite + vike';
 
   const injected = escapeInject`<!DOCTYPE html>
     <html lang="en">

diff --git a/examples/demo-vps-0.4/renderer/usePageContext.tsx b/examples/demo-vps-0.4/renderer/usePageContext.tsx
@@ -1,5 +1,5 @@
 // `usePageContext` allows us to access `pageContext` in any React component.
-// More infos: https://vite-plugin-ssr.com/pageContext-anywhere
+// More infos: https://vike.dev/pageContext-anywhere
 
 import React, { useContext } from 'react';
 import type { PageContext } from './types';

diff --git a/examples/demo-vps-0.4/server/index.ts b/examples/demo-vps-0.4/server/index.ts
@@ -1,7 +1,7 @@
 /// <reference types="vite/client" />
 
 import express from 'express';
-import { renderPage } from 'vite-plugin-ssr/server';
+import { renderPage } from 'vike/server';
 import * as vite from 'vite';
 import { fileURLToPath } from 'url';
 import path from 'path';

diff --git a/...4/tests/05-vite-plugin-ssr/config.test.ts → ...demo-vps-0.4/tests/05-vike/config.test.ts b/...4/tests/05-vite-plugin-ssr/config.test.ts → ...demo-vps-0.4/tests/05-vike/config.test.ts
diff --git a/...s-0.4/tests/05-vite-plugin-ssr/fs.test.ts → ...les/demo-vps-0.4/tests/05-vike/fs.test.ts b/...s-0.4/tests/05-vite-plugin-ssr/fs.test.ts → ...les/demo-vps-0.4/tests/05-vike/fs.test.ts
@@ -3,7 +3,7 @@ import glob from 'fast-glob';
 import { describe, expect, it } from 'vitest';
 
 describe('fs', function () {
-  const buildManifest = require('../../dist/client/manifest.json');
+  const buildManifest = require('../../dist/assets.json');
 
   const generatedFiles = Array.from(
     new Set(
@@ -23,8 +23,7 @@ describe('fs', function () {
     '/functions/api/post.func/.vc-config.json',
     '/functions/edge.func/index.js',
     '/functions/edge.func/.vc-config.json',
-    '/static/vite-plugin-ssr.json',
-    '/static/manifest.json',
+    '/static/vike.json',
     // ISR + Static pages
     '/functions/ssr_.func/index.js',
     '/functions/ssr_.func/.vc-config.json',

diff --git a/...ests/05-vite-plugin-ssr/prerender.test.ts → ...o-vps-0.4/tests/05-vike/prerender.test.ts b/...ests/05-vite-plugin-ssr/prerender.test.ts → ...o-vps-0.4/tests/05-vike/prerender.test.ts
diff --git a/...vps-0.4/tests/05-vite-plugin-ssr/utils.ts → examples/demo-vps-0.4/tests/05-vike/utils.ts b/...vps-0.4/tests/05-vite-plugin-ssr/utils.ts → examples/demo-vps-0.4/tests/05-vike/utils.ts
diff --git a/...ests/05-vite-plugin-ssr/vc-config.test.ts → ...o-vps-0.4/tests/05-vike/vc-config.test.ts b/...ests/05-vite-plugin-ssr/vc-config.test.ts → ...o-vps-0.4/tests/05-vike/vc-config.test.ts
diff --git a/.../05-vite-plugin-ssr/vite.config._test_.js → ...s-0.4/tests/05-vike/vite.config._test_.js b/.../05-vite-plugin-ssr/vite.config._test_.js → ...s-0.4/tests/05-vike/vite.config._test_.js
@@ -1,5 +1,5 @@
 import react from '@vitejs/plugin-react';
-import ssr from 'vite-plugin-ssr/plugin';
+import ssr from 'vike/plugin';
 import vercel from 'vite-plugin-vercel';
 
 export default {

diff --git a/...tests/05-vite-plugin-ssr/vitest.config.ts → ...mo-vps-0.4/tests/05-vike/vitest.config.ts b/...tests/05-vite-plugin-ssr/vitest.config.ts → ...mo-vps-0.4/tests/05-vike/vitest.config.ts
diff --git a/examples/demo-vps-0.4/vite.config.js b/examples/demo-vps-0.4/vite.config.js
@@ -1,7 +1,7 @@
 /// <reference types="vitest" />
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
-import ssr from 'vite-plugin-ssr/plugin';
+import ssr from 'vike/plugin';
 import vercel from 'vite-plugin-vercel';
 
 export default defineConfig(async () => {

diff --git a/examples/demo/package.json b/examples/demo/package.json
@@ -11,7 +11,7 @@
     "test:02": "vitest run --dir tests/02-additional-endpoints --config tests/02-additional-endpoints/vitest.config.ts",
     "test:03": "vitest run --dir tests/03-prerender --config tests/03-prerender/vitest.config.ts",
     "test:04": "vitest run --dir tests/04-isr --config tests/04-isr/vitest.config.ts",
-    "test:05": "vite build && vitest run --dir tests/05-vite-plugin-ssr --config tests/05-vite-plugin-ssr/vitest.config.ts"
+    "test:05": "vite build && vitest run --dir tests/05-vike --config tests/05-vike/vitest.config.ts"
   },
   "dependencies": {
     "@mdx-js/mdx": "^2.3.0",
@@ -31,7 +31,7 @@
     "react-dom": "^18.2.0",
     "typescript": "^5.2.2",
     "vite": "^4.4.9",
-    "vite-plugin-ssr": "^0.4.141",
+    "vike": "^0.4.142",
     "vite-plugin-vercel": "workspace:*"
   },
   "type": "module",

diff --git a/examples/demo/pages/catch-all/+config.h.ts b/examples/demo/pages/catch-all/+config.h.ts
@@ -1,4 +1,4 @@
-import { Config } from 'vite-plugin-ssr/types';
+import { Config } from 'vike/types';
 
 export default {
   isr: { expiration: 15 },

diff --git a/examples/demo/pages/catch-all/+onBeforeRender.ts b/examples/demo/pages/catch-all/+onBeforeRender.ts
@@ -1,6 +1,6 @@
-import { PageContextBuiltInServer } from 'vite-plugin-ssr/types';
+import { PageContextBuiltInServer } from 'vike/types';
 
-// https://vite-plugin-ssr.com/onBeforeRender
+// https://vike.dev/onBeforeRender
 export default function onBeforeRender() {
   return {
     pageContext: {

diff --git a/examples/demo/pages/dynamic/+onBeforeRender.ts b/examples/demo/pages/dynamic/+onBeforeRender.ts
@@ -1,6 +1,6 @@
-import { PageContextBuiltInServer } from 'vite-plugin-ssr/types';
+import { PageContextBuiltInServer } from 'vike/types';
 
-// https://vite-plugin-ssr.com/onBeforeRender
+// https://vike.dev/onBeforeRender
 export default function onBeforeRender() {
   return {
     pageContext: {

diff --git a/examples/demo/pages/function/+config.h.ts b/examples/demo/pages/function/+config.h.ts
@@ -1,4 +1,4 @@
-import { Config } from 'vite-plugin-ssr/types';
+import { Config } from 'vike/types';
 
 export default {
   // Should warn when building because it's incompatible with route function

diff --git a/examples/demo/pages/function/+onBeforeRender.ts b/examples/demo/pages/function/+onBeforeRender.ts
@@ -1,6 +1,6 @@
-import { PageContextBuiltInServer } from 'vite-plugin-ssr/types';
+import { PageContextBuiltInServer } from 'vike/types';
 
-// https://vite-plugin-ssr.com/onBeforeRender
+// https://vike.dev/onBeforeRender
 export default function onBeforeRender() {
   return {
     pageContext: {

diff --git a/examples/demo/pages/function/+route.ts b/examples/demo/pages/function/+route.ts
@@ -1,4 +1,4 @@
-import { PageContextBuiltInServer } from 'vite-plugin-ssr/types';
+import { PageContextBuiltInServer } from 'vike/types';
 
 export default function (pageContext: PageContextBuiltInServer) {
   if (!pageContext.urlPathname.startsWith('/function/')) return false;

diff --git a/examples/demo/pages/isr/+config.h.ts b/examples/demo/pages/isr/+config.h.ts
@@ -1,4 +1,4 @@
-import { Config } from 'vite-plugin-ssr/types';
+import { Config } from 'vike/types';
 
 export default {
   isr: { expiration: 15 },

diff --git a/examples/demo/pages/isr/+onBeforeRender.ts b/examples/demo/pages/isr/+onBeforeRender.ts
@@ -1,4 +1,4 @@
-// https://vite-plugin-ssr.com/onBeforeRender
+// https://vike.dev/onBeforeRender
 export default function onBeforeRender() {
   return {
     pageContext: {

diff --git a/examples/demo/pages/named/+config.h.ts b/examples/demo/pages/named/+config.h.ts
@@ -1,4 +1,4 @@
-import { Config } from 'vite-plugin-ssr/types';
+import { Config } from 'vike/types';
 
 export default {
   isr: true,

diff --git a/examples/demo/pages/named/+onBeforeRender.ts b/examples/demo/pages/named/+onBeforeRender.ts
@@ -1,6 +1,6 @@
-import { PageContextBuiltInServer } from 'vite-plugin-ssr/types';
+import { PageContextBuiltInServer } from 'vike/types';
 
-// https://vite-plugin-ssr.com/onBeforeRender
+// https://vike.dev/onBeforeRender
 export default function onBeforeRender(pageContext: PageContextBuiltInServer) {
   return {
     pageContext: {

diff --git a/examples/demo/pages/static/+onBeforeRender.ts b/examples/demo/pages/static/+onBeforeRender.ts
@@ -1,4 +1,4 @@
-// https://vite-plugin-ssr.com/onBeforeRender
+// https://vike.dev/onBeforeRender
 export default function onBeforeRender() {
   return {
     pageContext: {

diff --git a/examples/demo/renderer/+config.h.ts b/examples/demo/renderer/+config.h.ts
@@ -1,12 +1,12 @@
-import type { Config } from 'vite-plugin-ssr/types';
+import type { Config } from 'vike/types';
 import config from '@vite-plugin-vercel/vike/config';
 
-// https://vite-plugin-ssr.com/config
+// https://vike.dev/config
 export default {
   passToClient: ['pageProps', 'title', 'someAsyncProps'],
   clientRouting: true,
   hydrationCanBeAborted: true,
-  // https://vite-plugin-ssr.com/meta
+  // https://vike.dev/meta
   meta: {
     // Create new config 'title'
     title: {

diff --git a/examples/demo/renderer/+onRenderClient.tsx b/examples/demo/renderer/+onRenderClient.tsx
@@ -1,4 +1,4 @@
-// https://vite-plugin-ssr.com/onRenderClient
+// https://vike.dev/onRenderClient
 export default onRenderClient;
 
 import './css/index.css';

diff --git a/examples/demo/renderer/+onRenderHtml.tsx b/examples/demo/renderer/+onRenderHtml.tsx
@@ -1,9 +1,9 @@
-// https://vite-plugin-ssr.com/onRenderHtml
+// https://vike.dev/onRenderHtml
 export default onRenderHtml;
 
 import ReactDOMServer from 'react-dom/server';
 import React from 'react';
-import { escapeInject } from 'vite-plugin-ssr/server';
+import { escapeInject } from 'vike/server';
 import { PageShell } from './PageShell';
 import { getPageTitle } from './getPageTitle';
 import type { PageContextServer } from './types';
@@ -31,7 +31,7 @@ async function onRenderHtml(pageContext: PageContextServer) {
 
   return {
     documentHtml,
-    // See https://vite-plugin-ssr.com/stream#initial-data-after-stream-end
+    // See https://vike.dev/stream#initial-data-after-stream-end
     pageContext: async () => {
       return {
         someAsyncProps: 42,

diff --git a/examples/demo/renderer/types.ts b/examples/demo/renderer/types.ts
@@ -6,13 +6,13 @@ export type { PageProps };
 import type {
   PageContextBuiltInServer,
   //*
-  // When using Client Routing https://vite-plugin-ssr.com/clientRouting
+  // When using Client Routing https://vike.dev/clientRouting
   PageContextBuiltInClientWithClientRouting as PageContextBuiltInClient,
   /*/
   // When using Server Routing
   PageContextBuiltInClientWithServerRouting as PageContextBuiltInClient
   //*/
-} from 'vite-plugin-ssr/types';
+} from 'vike/types';
 
 type Page = (pageProps: PageProps) => React.ReactElement;
 type PageProps = Record<string, unknown>;

diff --git a/...o/tests/05-vite-plugin-ssr/config.test.ts → examples/demo/tests/05-vike/config.test.ts b/...o/tests/05-vite-plugin-ssr/config.test.ts → examples/demo/tests/05-vike/config.test.ts
diff --git a/.../demo/tests/05-vite-plugin-ssr/fs.test.ts → examples/demo/tests/05-vike/fs.test.ts b/.../demo/tests/05-vite-plugin-ssr/fs.test.ts → examples/demo/tests/05-vike/fs.test.ts
@@ -3,7 +3,7 @@ import glob from 'fast-glob';
 import { describe, expect, it } from 'vitest';
 
 describe('fs', function () {
-  const buildManifest = require('../../dist/client/manifest.json');
+  const buildManifest = require('../../dist/assets.json');
 
   const generatedFiles = Array.from(
     new Set(
@@ -28,8 +28,7 @@ describe('fs', function () {
     new RegExp('/functions/og.func/.*.ttf'),
     '/functions/og.func/resvg.wasm',
     '/functions/og.func/yoga.wasm',
-    '/static/vite-plugin-ssr.json',
-    '/static/manifest.json',
+    '/static/vike.json',
     // ISR + Static pages
     '/functions/ssr_.func/index.js',
     '/functions/ssr_.func/.vc-config.json',

diff --git a/...ests/05-vite-plugin-ssr/prerender.test.ts → ...ples/demo/tests/05-vike/prerender.test.ts b/...ests/05-vite-plugin-ssr/prerender.test.ts → ...ples/demo/tests/05-vike/prerender.test.ts
diff --git a/...es/demo/tests/05-vite-plugin-ssr/utils.ts → examples/demo/tests/05-vike/utils.ts b/...es/demo/tests/05-vite-plugin-ssr/utils.ts → examples/demo/tests/05-vike/utils.ts
diff --git a/...ests/05-vite-plugin-ssr/vc-config.test.ts → ...ples/demo/tests/05-vike/vc-config.test.ts b/...ests/05-vite-plugin-ssr/vc-config.test.ts → ...ples/demo/tests/05-vike/vc-config.test.ts
diff --git a/.../05-vite-plugin-ssr/vite.config._test_.js → .../demo/tests/05-vike/vite.config._test_.js b/.../05-vite-plugin-ssr/vite.config._test_.js → .../demo/tests/05-vike/vite.config._test_.js
@@ -1,5 +1,5 @@
 import react from '@vitejs/plugin-react';
-import ssr from 'vite-plugin-ssr/plugin';
+import ssr from 'vike/plugin';
 import vercel from 'vite-plugin-vercel';
 
 export default {

diff --git a/...tests/05-vite-plugin-ssr/vitest.config.ts → examples/demo/tests/05-vike/vitest.config.ts b/...tests/05-vite-plugin-ssr/vitest.config.ts → examples/demo/tests/05-vike/vitest.config.ts
diff --git a/examples/demo/vite.config.ts b/examples/demo/vite.config.ts
@@ -1,5 +1,5 @@
 import react from '@vitejs/plugin-react-swc';
-import ssr from 'vite-plugin-ssr/plugin';
+import ssr from 'vike/plugin';
 import vercel from 'vite-plugin-vercel';
 import { UserConfig } from 'vite';
 
@@ -28,7 +28,7 @@ export default {
       },
     ],
   },
-  // We manually add a list of dependencies to be pre-bundled, in order to avoid a page reload at dev start which breaks vite-plugin-ssr's CI
+  // We manually add a list of dependencies to be pre-bundled, in order to avoid a page reload at dev start which breaks vike's CI
   // (The 'react/jsx-runtime' entry is not needed in Vite 3 anymore.)
   optimizeDeps: { include: ['cross-fetch', 'react/jsx-runtime'] },
 } as UserConfig;
diff --git a/packages/vercel/CHANGELOG.md b/packages/vercel/CHANGELOG.md
@@ -11,7 +11,7 @@
 
 ### Patch Changes
 
-- Add support for vite-plugin-ssr V1 design
+- Add support for vike V1 design
 - Updated dependencies
   - @vite-plugin-vercel/vike@0.3.3
 
@@ -44,7 +44,7 @@
 
 ### Patch Changes
 
-- fix use case without vite-plugin-ssr
+- fix use case without vike
 
 ## 0.2.0
 
@@ -96,7 +96,7 @@
 
 ### Patch Changes
 
-- Create a dedicated package for vite-plugin-ssr integration
+- Create a dedicated package for vike integration
 
 ## 0.1.0