vike 0.4.171-commit-6e37128 → 0.4.171-commit-3b2cb88

package/dist/cjs/node/plugin/plugins/devConfig/index.js

@@ -75,7 +75,8 @@ function devConfig() {
             configureServer: {
                 order: 'post',
                 handler(server) {
-                    if (config.server.middlewareMode)
+                    const hasHonoViteDevServer = !!config.plugins.find((p) => p.name === '@hono/vite-dev-server');
+                    if (config.server.middlewareMode || hasHonoViteDevServer)
                         return;
                     return () => {
                         (0, addSsrMiddleware_js_1.addSsrMiddleware)(server.middlewares);

package/dist/cjs/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.js

@@ -69,7 +69,6 @@ export const pageFilesExportNamesLazy = {};
 export const pageFilesExportNamesEager = {};
 export const pageFilesList = [];
 export const neverLoaded = {};
-export const isGeneratedFile = true;
 
 ${await (0, getVirtualFilePageConfigs_js_1.getVirtualFilePageConfigs)(isForClientSide, isDev, id, isClientRouting, config)}
 

package/dist/cjs/node/runtime/html/injectAssets/getHtmlTags.js

@@ -112,7 +112,7 @@ async function getHtmlTags(pageContext, injectToStream, injectFilter) {
         });
     }
     // The JavaScript entry <script> tag
-    const scriptEntry = await mergeScriptEntries(pageAssets, isProduction);
+    const scriptEntry = await mergeScriptEntries(pageAssets);
     if (scriptEntry) {
         htmlTags.push({
             htmlTag: scriptEntry,
@@ -134,11 +134,11 @@ async function getHtmlTags(pageContext, injectToStream, injectFilter) {
     return htmlTags;
 }
 exports.getHtmlTags = getHtmlTags;
-async function mergeScriptEntries(pageAssets, isProduction) {
+async function mergeScriptEntries(pageAssets) {
     const scriptEntries = pageAssets.filter((pageAsset) => pageAsset.isEntry && pageAsset.assetType === 'script');
     const viteScripts = await (0, getViteDevScripts_js_1.getViteDevScripts)();
     const scriptTagsHtml = `${viteScripts}${scriptEntries.map((asset) => (0, inferHtmlTags_js_1.inferAssetTag)(asset)).join('')}`;
-    const scriptTag = (0, mergeScriptTags_js_1.mergeScriptTags)(scriptTagsHtml, isProduction);
+    const scriptTag = (0, mergeScriptTags_js_1.mergeScriptTags)(scriptTagsHtml);
     return scriptTag;
 }
 function getPageContextJsonScriptTag(pageContext) {

package/dist/cjs/node/runtime/html/injectAssets/getViteDevScripts.js

@@ -21,7 +21,8 @@ async function getViteDevScripts() {
     (0, utils_js_1.assertUsage)(!fakeHtml.startsWith(fakeHtmlBegin.replace(' ', '')), 'Vite plugins that minify the HTML are not supported by vike, see https://github.com/vikejs/vike/issues/224');
     (0, utils_js_1.assertUsage)(fakeHtml.startsWith(fakeHtmlBegin) && fakeHtml.endsWith(fakeHtmlEnd), 'You are using a Vite Plugin that transforms the HTML in a way that conflicts with vike. Create a new GitHub ticket to discuss a solution.');
     const viteInjection = fakeHtml.slice(fakeHtmlBegin.length, -1 * fakeHtmlEnd.length);
-    (0, utils_js_1.assert)(viteInjection.includes('script'), { viteInjection });
+    (0, utils_js_1.assert)(viteInjection.includes('script'));
+    (0, utils_js_1.assertWarning)(!viteInjection.includes('import('), 'Unexpected Vite HMR code. Reach out to a Vike maintainer on GitHub.', { onlyOnce: true });
     const scriptTags = viteInjection;
     return scriptTags;
 }

package/dist/cjs/node/runtime/html/injectAssets/mergeScriptTags.js

@@ -6,7 +6,7 @@ const inferHtmlTags_js_1 = require("./inferHtmlTags.js");
 const scriptRE = /(<script\b(?:\s[^>]*>|>))(.*?)<\/script>/gims;
 const srcRE = /\bsrc\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im;
 const typeRE = /\btype\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im;
-function mergeScriptTags(scriptTagsHtml, isProduction) {
+function mergeScriptTags(scriptTagsHtml) {
     let scriptTag = '';
     const scripts = parseScripts(scriptTagsHtml);
     // We need to merge module scripts to ensure execution order
@@ -21,13 +21,7 @@ function mergeScriptTags(scriptTagsHtml, isProduction) {
                 const hasInnerHtml = !!innerHtml.trim();
                 if (src) {
                     (0, utils_js_1.assert)(!hasInnerHtml);
-                    if (isProduction) {
-                        contents.push(`import ${JSON.stringify(src)};`);
-                    }
-                    else {
-                        // Ensure HMR preamble code is executed before client entries
-                        contents.push(`import(${JSON.stringify(src)});`);
-                    }
+                    contents.push(`import ${JSON.stringify(src)};`);
                 }
                 else if (hasInnerHtml) {
                     innerHtml = innerHtml.split('\n').filter(Boolean).join('\n');

package/dist/cjs/shared/getPageFiles/parseGlobResults.js

@@ -1,16 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseGlobResults = void 0;
+// TODO/v1-release: remove old design code, and remove all assertions.
 const utils_js_1 = require("../utils.js");
 const assert_exports_old_design_js_1 = require("./assert_exports_old_design.js");
 const getPageFileObject_js_1 = require("./getPageFileObject.js");
 const fileTypes_js_1 = require("./fileTypes.js");
-const assertPageConfigsSerialized_js_1 = require("../page-configs/serialize/assertPageConfigsSerialized.js");
 const parsePageConfigs_js_1 = require("../page-configs/serialize/parsePageConfigs.js");
 function parseGlobResults(pageFilesExports) {
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports, 'isGeneratedFile'));
-    (0, utils_js_1.assert)(pageFilesExports.isGeneratedFile !== false, `vike was re-installed(/re-built). Restart your app.`);
-    (0, utils_js_1.assert)(pageFilesExports.isGeneratedFile === true, `\`isGeneratedFile === ${pageFilesExports.isGeneratedFile}\``);
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports, 'pageFilesLazy', 'object'));
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports, 'pageFilesEager', 'object'));
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports, 'pageFilesExportNamesLazy', 'object'));
@@ -21,8 +18,8 @@ function parseGlobResults(pageFilesExports) {
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports, 'pageConfigsSerialized'));
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports, 'pageConfigGlobalSerialized'));
     const { pageConfigsSerialized, pageConfigGlobalSerialized } = pageFilesExports;
-    (0, assertPageConfigsSerialized_js_1.assertPageConfigsSerialized)(pageConfigsSerialized);
-    (0, assertPageConfigsSerialized_js_1.assertPageConfigGlobalSerialized)(pageConfigGlobalSerialized);
+    assertPageConfigsSerialized(pageConfigsSerialized);
+    assertPageConfigGlobalSerialized(pageConfigGlobalSerialized);
     const { pageConfigs, pageConfigGlobal } = (0, parsePageConfigs_js_1.parsePageConfigs)(pageConfigsSerialized, pageConfigGlobalSerialized);
     const pageFilesMap = {};
     parseGlobResult(pageFilesExports.pageFilesLazy).forEach(({ filePath, pageFile, globValue }) => {
@@ -43,8 +40,6 @@ function parseGlobResults(pageFilesExports) {
         pageFile.loadExportNames = async () => {
             if (!('exportNames' in pageFile)) {
                 const moduleExports = await loadModule();
-                // Vite 2 seems to choke following assertion: https://github.com/vikejs/vike/issues/455
-                (0, utils_js_1.assertUsage)('exportNames' in moduleExports, 'You seem to be using Vite 2 but the latest vike versions only work with Vite 3');
                 (0, utils_js_1.assert)((0, utils_js_1.hasProp)(moduleExports, 'exportNames', 'string[]'), pageFile.filePath);
                 pageFile.exportNames = moduleExports.exportNames;
             }
@@ -91,3 +86,15 @@ function parseGlobResult(globObject) {
 function assertLoadModule(globValue) {
     (0, utils_js_1.assert)((0, utils_js_1.isCallable)(globValue));
 }
+function assertPageConfigsSerialized(pageConfigsSerialized) {
+    (0, utils_js_1.assert)((0, utils_js_1.isArray)(pageConfigsSerialized));
+    pageConfigsSerialized.forEach((pageConfigSerialized) => {
+        (0, utils_js_1.assert)((0, utils_js_1.isObject)(pageConfigSerialized));
+        (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageConfigSerialized, 'pageId', 'string'));
+        (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageConfigSerialized, 'routeFilesystem'));
+        (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageConfigSerialized, 'configValuesSerialized'));
+    });
+}
+function assertPageConfigGlobalSerialized(pageConfigGlobalSerialized) {
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageConfigGlobalSerialized, 'configValuesSerialized'));
+}

package/dist/cjs/shared/page-configs/serialize/assertPageConfigsSerialized.js

@@ -1,18 +1 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertPageConfigGlobalSerialized = exports.assertPageConfigsSerialized = void 0;
-const utils_js_1 = require("../../utils.js");
-function assertPageConfigsSerialized(pageConfigsSerialized) {
-    (0, utils_js_1.assert)((0, utils_js_1.isArray)(pageConfigsSerialized));
-    pageConfigsSerialized.forEach((pageConfigSerialized) => {
-        (0, utils_js_1.assert)((0, utils_js_1.isObject)(pageConfigSerialized));
-        (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageConfigSerialized, 'pageId', 'string'));
-        (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageConfigSerialized, 'routeFilesystem'));
-        (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageConfigSerialized, 'configValuesSerialized'));
-    });
-}
-exports.assertPageConfigsSerialized = assertPageConfigsSerialized;
-function assertPageConfigGlobalSerialized(pageConfigGlobalSerialized) {
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageConfigGlobalSerialized, 'configValuesSerialized'));
-}
-exports.assertPageConfigGlobalSerialized = assertPageConfigGlobalSerialized;

package/dist/cjs/utils/projectInfo.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
-const PROJECT_VERSION = '0.4.171-commit-6e37128';
+const PROJECT_VERSION = '0.4.171-commit-3b2cb88';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

package/dist/esm/client/client-routing-runtime/installClientRouter.js

@@ -7,22 +7,30 @@ import { onLinkClick } from './onLinkClick.js';
 import { setupNativeScrollRestoration } from './scrollRestoration.js';
 import { autoSaveScrollPosition } from './setScrollPosition.js';
 async function installClientRouter() {
-    setupNativeScrollRestoration();
-    initHistoryState();
-    autoSaveScrollPosition();
-    monkeyPatchHistoryPushState();
-    // First initial render
+    // Init navigation history and scroll restoration
+    initHistoryAndScroll();
+    // Render initial page
+    const renderPromise = render();
+    // Intercept <a> clicks
+    onLinkClick();
+    // Preserve stack track
+    await renderPromise;
+}
+function render() {
     assert(getRenderCount() === 0);
-    const promise = renderPageClientSide({
+    const renderPromise = renderPageClientSide({
         scrollTarget: 'preserve-scroll',
         isBackwardNavigation: null,
         isClientSideNavigation: false
     });
     assert(getRenderCount() === 1);
-    // Intercept <a> links
-    onLinkClick();
+    return renderPromise;
+}
+function initHistoryAndScroll() {
+    setupNativeScrollRestoration();
+    initHistoryState();
+    autoSaveScrollPosition();
+    monkeyPatchHistoryPushState();
     // Handle back-/forward navigation
     onBrowserHistoryNavigation();
-    // Only for full stack straces
-    await promise;
 }

package/dist/esm/node/plugin/plugins/devConfig/index.js

@@ -73,7 +73,8 @@ function devConfig() {
             configureServer: {
                 order: 'post',
                 handler(server) {
-                    if (config.server.middlewareMode)
+                    const hasHonoViteDevServer = !!config.plugins.find((p) => p.name === '@hono/vite-dev-server');
+                    if (config.server.middlewareMode || hasHonoViteDevServer)
                         return;
                     return () => {
                         addSsrMiddleware(server.middlewares);

package/dist/esm/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.js

@@ -63,7 +63,6 @@ export const pageFilesExportNamesLazy = {};
 export const pageFilesExportNamesEager = {};
 export const pageFilesList = [];
 export const neverLoaded = {};
-export const isGeneratedFile = true;
 
 ${await getVirtualFilePageConfigs(isForClientSide, isDev, id, isClientRouting, config)}
 

package/dist/esm/node/runtime/html/injectAssets/getHtmlTags.js

@@ -107,7 +107,7 @@ async function getHtmlTags(pageContext, injectToStream, injectFilter) {
         });
     }
     // The JavaScript entry <script> tag
-    const scriptEntry = await mergeScriptEntries(pageAssets, isProduction);
+    const scriptEntry = await mergeScriptEntries(pageAssets);
     if (scriptEntry) {
         htmlTags.push({
             htmlTag: scriptEntry,
@@ -128,11 +128,11 @@ async function getHtmlTags(pageContext, injectToStream, injectFilter) {
     });
     return htmlTags;
 }
-async function mergeScriptEntries(pageAssets, isProduction) {
+async function mergeScriptEntries(pageAssets) {
     const scriptEntries = pageAssets.filter((pageAsset) => pageAsset.isEntry && pageAsset.assetType === 'script');
     const viteScripts = await getViteDevScripts();
     const scriptTagsHtml = `${viteScripts}${scriptEntries.map((asset) => inferAssetTag(asset)).join('')}`;
-    const scriptTag = mergeScriptTags(scriptTagsHtml, isProduction);
+    const scriptTag = mergeScriptTags(scriptTagsHtml);
     return scriptTag;
 }
 function getPageContextJsonScriptTag(pageContext) {

package/dist/esm/node/runtime/html/injectAssets/getViteDevScripts.js

@@ -1,6 +1,6 @@
 export { getViteDevScripts };
 import { getGlobalContext } from '../../globalContext.js';
-import { assert, assertUsage } from '../../utils.js';
+import { assert, assertUsage, assertWarning } from '../../utils.js';
 import pc from '@brillout/picocolors';
 async function getViteDevScripts() {
     const globalContext = getGlobalContext();
@@ -16,7 +16,8 @@ async function getViteDevScripts() {
     assertUsage(!fakeHtml.startsWith(fakeHtmlBegin.replace(' ', '')), 'Vite plugins that minify the HTML are not supported by vike, see https://github.com/vikejs/vike/issues/224');
     assertUsage(fakeHtml.startsWith(fakeHtmlBegin) && fakeHtml.endsWith(fakeHtmlEnd), 'You are using a Vite Plugin that transforms the HTML in a way that conflicts with vike. Create a new GitHub ticket to discuss a solution.');
     const viteInjection = fakeHtml.slice(fakeHtmlBegin.length, -1 * fakeHtmlEnd.length);
-    assert(viteInjection.includes('script'), { viteInjection });
+    assert(viteInjection.includes('script'));
+    assertWarning(!viteInjection.includes('import('), 'Unexpected Vite HMR code. Reach out to a Vike maintainer on GitHub.', { onlyOnce: true });
     const scriptTags = viteInjection;
     return scriptTags;
 }

package/dist/esm/node/runtime/html/injectAssets/mergeScriptTags.d.ts

@@ -1,2 +1,2 @@
 export { mergeScriptTags };
-declare function mergeScriptTags(scriptTagsHtml: string, isProduction: boolean): string;
+declare function mergeScriptTags(scriptTagsHtml: string): string;

package/dist/esm/node/runtime/html/injectAssets/mergeScriptTags.js

@@ -4,7 +4,7 @@ import { scriptAttrs } from './inferHtmlTags.js';
 const scriptRE = /(<script\b(?:\s[^>]*>|>))(.*?)<\/script>/gims;
 const srcRE = /\bsrc\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im;
 const typeRE = /\btype\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im;
-function mergeScriptTags(scriptTagsHtml, isProduction) {
+function mergeScriptTags(scriptTagsHtml) {
     let scriptTag = '';
     const scripts = parseScripts(scriptTagsHtml);
     // We need to merge module scripts to ensure execution order
@@ -19,13 +19,7 @@ function mergeScriptTags(scriptTagsHtml, isProduction) {
                 const hasInnerHtml = !!innerHtml.trim();
                 if (src) {
                     assert(!hasInnerHtml);
-                    if (isProduction) {
-                        contents.push(`import ${JSON.stringify(src)};`);
-                    }
-                    else {
-                        // Ensure HMR preamble code is executed before client entries
-                        contents.push(`import(${JSON.stringify(src)});`);
-                    }
+                    contents.push(`import ${JSON.stringify(src)};`);
                 }
                 else if (hasInnerHtml) {
                     innerHtml = innerHtml.split('\n').filter(Boolean).join('\n');

package/dist/esm/shared/getPageFiles/parseGlobResults.js

@@ -1,14 +1,11 @@
 export { parseGlobResults };
-import { assert, hasProp, isCallable, isObject, cast, assertUsage } from '../utils.js';
+// TODO/v1-release: remove old design code, and remove all assertions.
+import { assert, hasProp, isCallable, isObject, cast, isArray } from '../utils.js';
 import { assertExportValues } from './assert_exports_old_design.js';
 import { getPageFileObject } from './getPageFileObject.js';
 import { fileTypes } from './fileTypes.js';
-import { assertPageConfigGlobalSerialized, assertPageConfigsSerialized } from '../page-configs/serialize/assertPageConfigsSerialized.js';
 import { parsePageConfigs } from '../page-configs/serialize/parsePageConfigs.js';
 function parseGlobResults(pageFilesExports) {
-    assert(hasProp(pageFilesExports, 'isGeneratedFile'));
-    assert(pageFilesExports.isGeneratedFile !== false, `vike was re-installed(/re-built). Restart your app.`);
-    assert(pageFilesExports.isGeneratedFile === true, `\`isGeneratedFile === ${pageFilesExports.isGeneratedFile}\``);
     assert(hasProp(pageFilesExports, 'pageFilesLazy', 'object'));
     assert(hasProp(pageFilesExports, 'pageFilesEager', 'object'));
     assert(hasProp(pageFilesExports, 'pageFilesExportNamesLazy', 'object'));
@@ -41,8 +38,6 @@ function parseGlobResults(pageFilesExports) {
         pageFile.loadExportNames = async () => {
             if (!('exportNames' in pageFile)) {
                 const moduleExports = await loadModule();
-                // Vite 2 seems to choke following assertion: https://github.com/vikejs/vike/issues/455
-                assertUsage('exportNames' in moduleExports, 'You seem to be using Vite 2 but the latest vike versions only work with Vite 3');
                 assert(hasProp(moduleExports, 'exportNames', 'string[]'), pageFile.filePath);
                 pageFile.exportNames = moduleExports.exportNames;
             }
@@ -88,3 +83,15 @@ function parseGlobResult(globObject) {
 function assertLoadModule(globValue) {
     assert(isCallable(globValue));
 }
+function assertPageConfigsSerialized(pageConfigsSerialized) {
+    assert(isArray(pageConfigsSerialized));
+    pageConfigsSerialized.forEach((pageConfigSerialized) => {
+        assert(isObject(pageConfigSerialized));
+        assert(hasProp(pageConfigSerialized, 'pageId', 'string'));
+        assert(hasProp(pageConfigSerialized, 'routeFilesystem'));
+        assert(hasProp(pageConfigSerialized, 'configValuesSerialized'));
+    });
+}
+function assertPageConfigGlobalSerialized(pageConfigGlobalSerialized) {
+    assert(hasProp(pageConfigGlobalSerialized, 'configValuesSerialized'));
+}

package/dist/esm/shared/page-configs/serialize/assertPageConfigsSerialized.d.ts

@@ -1,5 +1 @@
-export { assertPageConfigsSerialized };
-export { assertPageConfigGlobalSerialized };
-import type { PageConfigGlobalRuntimeSerialized, PageConfigRuntimeSerialized } from './PageConfigSerialized.js';
-declare function assertPageConfigsSerialized(pageConfigsSerialized: unknown): asserts pageConfigsSerialized is PageConfigRuntimeSerialized[];
-declare function assertPageConfigGlobalSerialized(pageConfigGlobalSerialized: unknown): asserts pageConfigGlobalSerialized is PageConfigGlobalRuntimeSerialized;
+export {};

package/dist/esm/shared/page-configs/serialize/assertPageConfigsSerialized.js

@@ -1,15 +1 @@
-export { assertPageConfigsSerialized };
-export { assertPageConfigGlobalSerialized };
-import { assert, isObject, hasProp, isArray } from '../../utils.js';
-function assertPageConfigsSerialized(pageConfigsSerialized) {
-    assert(isArray(pageConfigsSerialized));
-    pageConfigsSerialized.forEach((pageConfigSerialized) => {
-        assert(isObject(pageConfigSerialized));
-        assert(hasProp(pageConfigSerialized, 'pageId', 'string'));
-        assert(hasProp(pageConfigSerialized, 'routeFilesystem'));
-        assert(hasProp(pageConfigSerialized, 'configValuesSerialized'));
-    });
-}
-function assertPageConfigGlobalSerialized(pageConfigGlobalSerialized) {
-    assert(hasProp(pageConfigGlobalSerialized, 'configValuesSerialized'));
-}
+export {};

package/dist/esm/utils/projectInfo.d.ts

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.171-commit-6e37128";
+declare const PROJECT_VERSION: "0.4.171-commit-3b2cb88";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.171-commit-6e37128";
+    projectVersion: "0.4.171-commit-3b2cb88";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.171-commit-6e37128';
+const PROJECT_VERSION = '0.4.171-commit-3b2cb88';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.171-commit-6e37128",
+  "version": "0.4.171-commit-3b2cb88",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",