vikejs · Aug 30, 2023 · Aug 30, 2023 · Aug 30, 2023 · Aug 30, 2023 · Aug 30, 2023
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -50,7 +50,7 @@ jobs:
           cache: "pnpm"
 
       - run: pnpm install
-      - run: pnpm exec playwright install chromium # Needed for Windows/MacOS
+      - run: pnpm exec playwright install chromium
       - run: pnpm run build
 
       - name: Run tests

diff --git a/.github/workflows/ci/getTestJobs.mjs b/.github/workflows/ci/getTestJobs.mjs
@@ -38,13 +38,13 @@ async function getTestJobs() {
       jobName: 'Unit Tests',
       jobCmd: 'pnpm run test:units',
       jobTestFiles: specFiles,
-      jobSetups: [{ os: 'ubuntu-latest', node_version: '20' }]
+      jobSetups: [{ os: 'ubuntu-latest', node_version: '18' }]
     },
     // Typecheck `.ts` files
     {
       jobName: 'TypeScript',
       jobCmd: 'pnpm run test:types',
-      jobSetups: [{ os: 'ubuntu-latest', node_version: '20' }]
+      jobSetups: [{ os: 'ubuntu-latest', node_version: '18' }]
     },
     // E2e tests
     ...(await crawlE2eJobs(testFiles))

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,44 @@
+## [0.4.141](https://github.com/brillout/vite-plugin-ssr/compare/v0.4.140...v0.4.141) (2023-09-15)
+
+
+### Bug Fixes
+
+* `throw redirect(/some-url/, 301)` (fix [#1104](https://github.com/brillout/vite-plugin-ssr/issues/1104)) ([64f684f](https://github.com/brillout/vite-plugin-ssr/commit/64f684f8e8709b1e0fb8ae06570120b4291e72be))
+* +config.h.js prerender flag ([2c58da8](https://github.com/brillout/vite-plugin-ssr/commit/2c58da83abbcd3b2d6720838040f39ceb996a451))
+* add hint to error message upon invalid route string ([c1537dc](https://github.com/brillout/vite-plugin-ssr/commit/c1537dcf2bd7725ae9690606cd31ec9f51b7dc69))
+* add missing config type to PageContextBuiltInServer ([362d69c](https://github.com/brillout/vite-plugin-ssr/commit/362d69c3cb98b165038de8262a04aab2203d29a1))
+* avoid overriding meta ([f2ec4bd](https://github.com/brillout/vite-plugin-ssr/commit/f2ec4bd44d98dcf8a0604234da702f3019f36765))
+* enable vike-* packages to seamlessly extend Config using interface merging ([894c039](https://github.com/brillout/vite-plugin-ssr/commit/894c03903265f0fc7ed4d09e8d4c126316b10198))
+* external redirects (fix [#1103](https://github.com/brillout/vite-plugin-ssr/issues/1103)) ([7343a85](https://github.com/brillout/vite-plugin-ssr/commit/7343a85f11fc7115a41659c0aeb76a6eb1fc1b4b))
+* further discourage loading multiple versions (fix [#1108](https://github.com/brillout/vite-plugin-ssr/issues/1108)) ([3a66e95](https://github.com/brillout/vite-plugin-ssr/commit/3a66e952396b739bbedb6f8f8d7bac1d64026e90))
+* further use colors instead of backtick in error messages ([3cdb970](https://github.com/brillout/vite-plugin-ssr/commit/3cdb9707bd6ad0969dd004612efebaaf5fb3861e))
+* further use colors instead of backtick in error messages ([6739302](https://github.com/brillout/vite-plugin-ssr/commit/6739302e8e71eb4fc1f5c6098caf6a75f785fbdb))
+* further use colors instead of backtick in error messages ([0f23c0d](https://github.com/brillout/vite-plugin-ssr/commit/0f23c0d2ac9c22d46f2828e3bb0b0bc52d733e46))
+* further use colors instead of backtick in error messages ([b178539](https://github.com/brillout/vite-plugin-ssr/commit/b1785391d5ecf2f85ec5f38143503012125db313))
+* further use colors instead of backtick in error messages ([2296914](https://github.com/brillout/vite-plugin-ssr/commit/229691493d90e505a2cae9b74da2f03171f0bcb9))
+* improve error message about non-default exports ([58f8b2f](https://github.com/brillout/vite-plugin-ssr/commit/58f8b2fb5fbcea2f3ee28cbc9b0c741440c8d225))
+* improve error message upon code defined inside header files ([687c5b2](https://github.com/brillout/vite-plugin-ssr/commit/687c5b25b42a264d7730bbdec8a4b8bfb7106643))
+* improve JSDoc of `throw redirect()` ([2ce54a2](https://github.com/brillout/vite-plugin-ssr/commit/2ce54a2d6834d133a271b4d787530d4260be537c))
+* improve log colors ([b936aee](https://github.com/brillout/vite-plugin-ssr/commit/b936aee111a78ead7274f6929000e4897b906039))
+* improve serialization error message ([1bedc8a](https://github.com/brillout/vite-plugin-ssr/commit/1bedc8a76f7388fb269c188f3d0ba782e744713c))
+* improve wrong redirection usage error ([83f8586](https://github.com/brillout/vite-plugin-ssr/commit/83f8586f47f59eda03613fe5bd53a4eb2ab0dd44))
+* intercept log for `throw redirect()` ([950ebd0](https://github.com/brillout/vite-plugin-ssr/commit/950ebd0212c7717be5135c28d0e253ca4aacb561))
+* make inheritence check consider whole path segments (fix [#1109](https://github.com/brillout/vite-plugin-ssr/issues/1109)) ([5bd8c1e](https://github.com/brillout/vite-plugin-ssr/commit/5bd8c1e128cad87d04ba5d54af1eda788dc69f54))
+* set Page type to unknown instead of any by default ([412a26a](https://github.com/brillout/vite-plugin-ssr/commit/412a26aed262b868ef250265173372525d706a07))
+* set pageContext.is404 upon throw render(404) (fix [#1107](https://github.com/brillout/vite-plugin-ssr/issues/1107)) ([9dd96c3](https://github.com/brillout/vite-plugin-ssr/commit/9dd96c31104e34f2cd9dc9313ccce0906a81dff1))
+* use colors instead of backtick in error messages ([a052d52](https://github.com/brillout/vite-plugin-ssr/commit/a052d52656fd084d2df5f44502ddfad892aec97b))
+* use colors instead of quotes in error messages ([ceb7af8](https://github.com/brillout/vite-plugin-ssr/commit/ceb7af8ec059159e0eea90f2a60b084af8691591))
+
+
+### Features
+
+* [V1 design] cumulative ([25af958](https://github.com/brillout/vite-plugin-ssr/commit/25af9587611e0bdf8df993f7c8f027460c0206aa))
+* new namespace `Vike` to enable users to refine type `Config` ([c0e909d](https://github.com/brillout/vite-plugin-ssr/commit/c0e909d4e4e58ff506f02889773f0e927d4ccfde))
+* static external redirections ([#926](https://github.com/brillout/vite-plugin-ssr/issues/926)) ([fa02b0e](https://github.com/brillout/vite-plugin-ssr/commit/fa02b0e0d1b1fc38689888482a6da629374f9e1b))
+* static glob redirections ([#926](https://github.com/brillout/vite-plugin-ssr/issues/926)) ([80a15a1](https://github.com/brillout/vite-plugin-ssr/commit/80a15a110f3140001486e776af55e07a1917e00b))
+
+
+
 ## [0.4.140](https://github.com/brillout/vite-plugin-ssr/compare/v0.4.139...v0.4.140) (2023-08-30)
 
 

diff --git a/boilerplates/boilerplate-react-ts/package.json b/boilerplates/boilerplate-react-ts/package.json
@@ -30,7 +30,7 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.1.6",
     "vite": "^4.4.9",
-    "vite-plugin-ssr": "^0.4.140"
+    "vite-plugin-ssr": "^0.4.141"
   },
   "type": "module"
 }
diff --git a/boilerplates/boilerplate-react-ts/server/tsconfig.json b/boilerplates/boilerplate-react-ts/server/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../tsconfig.json",
+  // Make IDEs complain about missing file extension .js in import paths.
+  // Alternatively, we could always set "module" to "Node16" and add the file extension .js to import paths everywhere.
+  "compilerOptions": {
+    "module": "Node16",
+    "moduleResolution": "Node16"
+  }
+}
diff --git a/boilerplates/boilerplate-react-ts/tsconfig.json b/boilerplates/boilerplate-react-ts/tsconfig.json
@@ -3,7 +3,8 @@
     "strict": true,
     "module": "ES2020",
     "target": "ES2020",
-    "moduleResolution": "Node",
+    // Doesn't apply to server/, see ts-node config down below and server/tsconfig.json
+    "moduleResolution": "Bundler",
     "lib": ["DOM", "DOM.Iterable", "ESNext"],
     "types": ["vite/client"],
     "jsx": "react-jsx",
@@ -14,6 +15,7 @@
     "transpileOnly": true,
     "esm": true,
     "compilerOptions": {
+      "module": "Node16",
       "moduleResolution": "Node16"
     }
   }

diff --git a/boilerplates/boilerplate-react/package.json b/boilerplates/boilerplate-react/package.json
@@ -21,7 +21,7 @@
     "react-dom": "^18.2.0",
     "sirv": "^2.0.3",
     "vite": "^4.4.9",
-    "vite-plugin-ssr": "^0.4.140"
+    "vite-plugin-ssr": "^0.4.141"
   },
   "type": "module"
 }
diff --git a/boilerplates/boilerplate-vue-ts/package.json b/boilerplates/boilerplate-vue-ts/package.json
@@ -21,7 +21,7 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.1.6",
     "vite": "^4.4.9",
-    "vite-plugin-ssr": "^0.4.140",
+    "vite-plugin-ssr": "^0.4.141",
     "vue": "^3.3.4"
   },
   "type": "module"

diff --git a/boilerplates/boilerplate-vue-ts/server/tsconfig.json b/boilerplates/boilerplate-vue-ts/server/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../tsconfig.json",
+  // Make IDEs complain about missing file extension .js in import paths.
+  // Alternatively, we could always set "module" to "Node16" and add the file extension .js to import paths everywhere.
+  "compilerOptions": {
+    "module": "Node16",
+    "moduleResolution": "Node16"
+  }
+}
diff --git a/boilerplates/boilerplate-vue-ts/tsconfig.json b/boilerplates/boilerplate-vue-ts/tsconfig.json
@@ -3,7 +3,8 @@
     "strict": true,
     "module": "ES2020",
     "target": "ES2020",
-    "moduleResolution": "Node",
+    // Doesn't apply to server/, see ts-node config down below and server/tsconfig.json
+    "moduleResolution": "Bundler",
     "lib": ["DOM", "DOM.Iterable", "ESNext"],
     "types": ["vite/client"],
     "skipLibCheck": true,
@@ -13,6 +14,7 @@
     "transpileOnly": true,
     "esm": true,
     "compilerOptions": {
+      "module": "Node16",
       "moduleResolution": "Node16"
     }
   }

diff --git a/boilerplates/boilerplate-vue/package.json b/boilerplates/boilerplate-vue/package.json
@@ -15,7 +15,7 @@
     "express": "^4.18.2",
     "sirv": "^2.0.3",
     "vite": "^4.4.9",
-    "vite-plugin-ssr": "^0.4.140",
+    "vite-plugin-ssr": "^0.4.141",
     "vue": "^3.3.4"
   },
   "type": "module"

diff --git a/boilerplates/package.json b/boilerplates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-vite-plugin-ssr",
-  "version": "0.0.301",
+  "version": "0.0.303",
   "license": "MIT",
   "bin": {
     "create-vite-plugin-ssr": "index.js"

diff --git a/docs/components/static-host.tsx b/docs/components/static-host.tsx
@@ -2,6 +2,7 @@ export { StaticHostDocIntro }
 export { StaticHostDocStrategies }
 export { StaticHostDocOutro }
 
+import { Link } from '@brillout/docpress'
 import React from 'react'
 
 function StaticHostDocIntro({ staticHostLink }: { staticHostLink?: JSX.Element }) {
@@ -10,6 +11,14 @@ function StaticHostDocIntro({ staticHostLink }: { staticHostLink?: JSX.Element }
       By <a href="/pre-rendering">pre-rendering</a> your pages, you can remove the need for a production server. You can
       then deploy your app to any static host
       {staticHostLink}.
+      <blockquote>
+        <p>
+          Static hosts always expect one <code>.html</code> file per URL. This means you need to pre-render <em>all</em>{' '}
+          your pages, regardless of <Link text="render mode" href="/render-modes" />. For example, if you have SPA
+          pages, then you also need to pre-render them which will generate <code>.html</code> files with an empty{' '}
+          <code>&lt;body&gt;</code>.
+        </p>
+      </blockquote>
     </p>
   )
 }
@@ -27,6 +36,11 @@ function StaticHostDocStrategies({ name = 'the static host' }: { name?: string }
         </li>
         <li>Let {name} build your app.</li>
       </ul>
+      <blockquote>
+        <p>
+          The <code>$ vite build</code> command generates <code>dist/client/</code> containing all static assets.
+        </p>
+      </blockquote>
     </>
   )
 }
@@ -45,12 +59,6 @@ function StaticHostDocOutro({ baseUrlAddendum }: { baseUrlAddendum?: JSX.Element
         </a>
         .
       </p>
-      <blockquote>
-        <p>
-          The <code>$ vite build</code> command generates a directory <code>dist/client/</code> that contains all static
-          assets.
-        </p>
-      </blockquote>
       <blockquote>
         <p>
           If you don't deploy your app at your domain root <code>https://my-domain.com</code>, but at{' '}

diff --git a/docs/package.json b/docs/package.json
@@ -12,7 +12,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.0.3",
-    "vite-plugin-ssr": "0.4.140"
+    "vite-plugin-ssr": "0.4.141"
   },
   "type": "module"
 }
diff --git a/docs/pages/markdown.page.server.mdx b/docs/pages/markdown.page.server.mdx
@@ -3,7 +3,7 @@ import { RepoLink, Link } from '@brillout/docpress'
 
 ## Vue
 
-If you use Vue, you can use [`vite-plugin-md`](https://github.com/antfu/vite-plugin-md).
+If you use Vue, you can use [`unplugin-vue-markdown`](https://github.com/antfu/unplugin-vue-markdown), or [`vite-plugin-md`](https://github.com/antfu/vite-plugin-md) (make sure to use at least `vite-plugin-md@0.22.x`, see [this bug report](https://github.com/antfu/vite-plugin-md/issues/112#issuecomment-1353626379)).
 
 Example:
  - <RepoLink path='/examples/vue-full/vite.config.ts' />

diff --git a/docs/pages/pre-rendering.page.server.mdx b/docs/pages/pre-rendering.page.server.mdx
@@ -44,15 +44,15 @@ export default {
 }
 ```
 
-Pre-render configuration: <Link href="/prerender-config" />.
+List of options: <Link href="/prerender-config" />.
 
 Your pages' HTML will be rendered when you run `$ vite build` and the generated HTML files are available at `dist/client/`.
 
 For a page with a parameterized route (e.g. `/movie/@movieId`), you have to use the [`prerender()` hook](/prerender) in order to provide the list of URLs that are to be pre-rendered. The `prerender()` hook can also be used to accelerate the pre-rendering process.
 
 By default, all pages are pre-rendered. To pre-render only some pages, use the <Link href="/prerender-config#partial" text={<><code>partial</code> option</>} /> with <Link href="/doNotPrerender" text={<code>.page.server.js#doNotPrerender</code>} />.
 
-If you pre-render all your pages, then you can use Vite's CLI instead of a server (`$ vite dev`, `$ vite build`, and `$ vite preview`). See linked examples below.
+If you pre-render all your pages, then you can use Vite's CLI instead of a server (`$ vite dev` and `$ vite preview`). See linked examples below.
 
 You can programmatically invoke the pre-rendering process, see <Link href="/prerender-programmatic" />.
 

diff --git a/docs/pages/redirect.page.server.mdx b/docs/pages/redirect.page.server.mdx
@@ -20,7 +20,7 @@ function onSomeHook() {
 }
 ```
 
-> `throw redirect()` makes temporary redirections (HTTP status code `302`). For permanent redirections (HTTP status code `301`) use <Link href="/redirects" noBreadcrumb={true} /> instead. (If you need programmatically defined permanent redirections then let us know: there is a hidden option to change the status code.)
+> `throw redirect()` makes temporary redirections (HTTP status code `302`). For permanent redirections (HTTP status code `301`), you can set <Link href="/redirects" noBreadcrumb={true} /> or pass a second argument `throw redirect('/some-url', 301)`.
 
 While it's most commonly used with [`guard()`](/guard) or [`onBeforeRender()`](/onBeforeRender) you can use it with any hook.
 

diff --git a/docs/pages/redirects.page.server.mdx b/docs/pages/redirects.page.server.mdx
@@ -17,7 +17,11 @@ export default {
       redirects: {
         '/about-us': '/about',
         // Parameterized redirections
-        '/product/@id': '/buy/@id'
+        '/product/@id': '/buy/@id',
+        // Glob redirections
+        '/admin/*': '/private/*',
+        // External redirections
+        '/admin/*': 'https://admin.example.org/*'
       }
     })
   ]

diff --git a/docs/pages/route-function.page.server.mdx b/docs/pages/route-function.page.server.mdx
@@ -1,14 +1,14 @@
 import { Link } from '@brillout/docpress'
 
-Route Functions enable full programmatic flexibility to implement advanced routing logic.
+Route Functions give you full programmatic flexibility to define routes.
 
 ```js
 // /pages/product/edit.page.route.js
 
 import partRegex from 'part-regex'
 
 export default (pageContext) => {
-  // Route guard
+  // Route guard (we can also use a guard() hook instead)
   if (!pageContext.user.isAdmin) {
     return false
   }
@@ -26,9 +26,12 @@ export default (pageContext) => {
 }
 ```
 
+If you merely want to guard your page, then you can use a <Link text="Route String" href="/route-string" /> with a <Link text={<code>guard()</code>} href="/guard" /> hook instead of a Route Function, which is usually a better approach.
+
 You can use any routing tool you want, such as:
  - Vite-plugin-ssr's <Link text="Route String" href="/route-string" /> resolver [`resolveRoute()`](#resolveroute)
  - [partRegex](https://github.com/brillout/part-regex)
+ - [path-to-regexp](https://www.npmjs.com/package/path-to-regexp) (the router used by Express.js)
 
 
 ## Precedence

diff --git a/docs/pages/url-normalization.page.server.mdx b/docs/pages/url-normalization.page.server.mdx
@@ -17,7 +17,7 @@ export default {
   plugins: [
     ssr({
       // Make URLs end with a trailing slash.
-      // For example: /some//path/ -> /some/path/
+      // For example: /some//path -> /some/path/
       trailingSlash: true,
 
       // Or completely disable automatic URL normalization.

diff --git a/docs/utils/projectInfo.tsx b/docs/utils/projectInfo.tsx
@@ -1,4 +1,4 @@
-const PROJECT_VERSION = '0.4.140'
+const PROJECT_VERSION = '0.4.141'
 
 import React from 'react'
 

diff --git a/examples/auth/components/Counter.jsx → examples/auth/components/Counter.tsx b/examples/auth/components/Counter.jsx → examples/auth/components/Counter.tsx
diff --git a/examples/auth/package.json b/examples/auth/package.json
@@ -18,7 +18,7 @@
     "typescript": "^5.0.2",
     "vike-react": "^0.1.6",
     "vite": "^4.0.3",
-    "vite-plugin-ssr": "0.4.140"
+    "vite-plugin-ssr": "0.4.141"
   },
   "type": "module"
 }
diff --git a/examples/auth/pages/+config.h.ts b/examples/auth/pages/+config.h.ts
@@ -4,11 +4,6 @@ import vikeReact from 'vike-react'
 
 export default {
   Layout,
-  passToClient: [
-    'userFullName',
-    // https://github.com/vikejs/vike-react/issues/4
-    'pageProps',
-    'title'
-  ],
+  passToClient: ['userFullName'],
   extends: vikeReact
 } satisfies Config
diff --git a/examples/base-url-cdn-v1/package.json b/examples/base-url-cdn-v1/package.json
@@ -17,7 +17,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "vite": "^4.0.3",
-    "vite-plugin-ssr": "0.4.140"
+    "vite-plugin-ssr": "0.4.141"
   },
   "type": "module"
 }
diff --git a/examples/base-url-cdn/package.json b/examples/base-url-cdn/package.json
@@ -17,7 +17,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "vite": "^4.0.3",
-    "vite-plugin-ssr": "0.4.140"
+    "vite-plugin-ssr": "0.4.141"
   },
   "type": "module"
 }
diff --git a/examples/base-url-server-v1/package.json b/examples/base-url-server-v1/package.json
@@ -17,7 +17,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "vite": "^4.0.3",
-    "vite-plugin-ssr": "0.4.140"
+    "vite-plugin-ssr": "0.4.141"
   },
   "type": "module"
 }
diff --git a/examples/base-url-server/package.json b/examples/base-url-server/package.json
@@ -17,7 +17,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "vite": "^4.0.3",
-    "vite-plugin-ssr": "0.4.140"
+    "vite-plugin-ssr": "0.4.141"
   },
   "type": "module"
 }
diff --git a/examples/base-url-v1/package.json b/examples/base-url-v1/package.json
@@ -9,7 +9,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "vite": "^4.0.3",
-    "vite-plugin-ssr": "0.4.140"
+    "vite-plugin-ssr": "0.4.141"
   },
   "type": "module"
 }
diff --git a/examples/base-url/package.json b/examples/base-url/package.json
@@ -9,7 +9,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "vite": "^4.0.3",
-    "vite-plugin-ssr": "0.4.140"
+    "vite-plugin-ssr": "0.4.141"
   },
   "type": "module"
 }