vike 0.4.149 → 0.4.150-commit-d0822a3

package/dist/cjs/node/runtime/renderPage/getPageAssets/retrieveAssetsDev.js

@@ -40,13 +40,21 @@ function collectCss(mod, styleUrls, visitedModules, importer) {
         if (mod.url.startsWith('/')) {
             styleUrls.add(mod.url);
         }
+        else if (mod.url.startsWith('\0')) {
+            // Virtual modules
+            //  - https://vitejs.dev/guide/api-plugin.html#virtual-modules-convention
+            //    - I believe some Vite plugins don't respect the \0 virtual module convention. What should we do then?
+            //  - https://github.com/vikejs/vike/issues/1327
+            //  - https://github.com/vikejs/vike/commit/3f7b9916dddc84e29e2c20d2b0df7211b6f1acbd
+            styleUrls.add(`/@id/${mod.url.substring(1)}`);
+        }
         else {
-            // Vuetify uses virtual SCSS modules which we skip
-            //  - We skip because `<link rel="stylesheet" type="text/css" href="virtual-module.css">` doesn't work
-            //  - Reproduction: https://github.com/vikejs/vike/issues/479
-            //  - Possible workaround: `<script>import 'virtual-module.css'</script>`
-            // logModule(mod)
+            // Is this useful? Maybe for virtual modules that don't respect the \0 virtual module convention?
+            styleUrls.add(`/@id/${mod.url}`);
         }
+        /* Debug:
+        logModule(mod)
+        //*/
     }
     mod.importedModules.forEach((dep) => {
         collectCss(dep, styleUrls, visitedModules, mod);

package/dist/cjs/node/runtime/renderPage/getPageAssets/sortPageAssetsForEarlyHintsHeader.js

@@ -22,6 +22,12 @@ function sortPageAssetsForEarlyHintsHeader(pageAssets) {
         if (assetType === 'image')
             return priority;
         priority--;
+        if (assetType === 'video')
+            return priority;
+        priority--;
+        if (assetType === 'audio')
+            return priority;
+        priority--;
         // Others
         if (assetType !== 'script')
             return priority;

package/dist/cjs/node/runtime/renderPage/getPageAssets.js

@@ -85,7 +85,7 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer, configVike) {
         const { createRequire } = (await (0, import_1.import_)('module')).default;
         const { dirname } = (await (0, import_1.import_)('path')).default;
         const { fileURLToPath } = (await (0, import_1.import_)('url')).default;
-        // @ts-ignore Shimed by dist-cjs-fixup.js for CJS build.
+        // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
         const importMetaUrl = `file://${__filename}`;
         const require_ = createRequire(importMetaUrl);
         const __dirname_ = dirname(fileURLToPath(importMetaUrl));

package/dist/cjs/node/runtime/renderPage/inferMediaType.js

@@ -36,6 +36,44 @@ function inferMediaType(href) {
     if (href.endsWith('.woff2')) {
         return { assetType: 'font', mediaType: 'font/woff2' };
     }
+    // Videos
+    if (href.endsWith('.mp4')) {
+        return { assetType: 'video', mediaType: 'video/mp4' };
+    }
+    if (href.endsWith('.webm')) {
+        return { assetType: 'video', mediaType: 'video/webm' };
+    }
+    if (href.endsWith('.ogv')) {
+        return { assetType: 'video', mediaType: 'video/ogg' };
+    }
+    if (href.endsWith('.mpeg') || href.endsWith('.mpg')) {
+        return { assetType: 'video', mediaType: 'video/mpeg' };
+    }
+    if (href.endsWith('.avi')) {
+        return { assetType: 'video', mediaType: 'video/x-msvideo' };
+    }
+    if (href.endsWith('.mov') || href.endsWith('.qt')) {
+        return { assetType: 'video', mediaType: 'video/quicktime' };
+    }
+    // Audios
+    if (href.endsWith('.mp3')) {
+        return { assetType: 'audio', mediaType: 'audio/mpeg' };
+    }
+    if (href.endsWith('.wav')) {
+        return { assetType: 'audio', mediaType: 'audio/wav' };
+    }
+    if (href.endsWith('.ogg')) {
+        return { assetType: 'audio', mediaType: 'audio/ogg' };
+    }
+    if (href.endsWith('.m4a')) {
+        return { assetType: 'audio', mediaType: 'audio/aac' };
+    }
+    if (href.endsWith('midi') || href.endsWith('.mid')) {
+        return { assetType: 'audio', mediaType: 'audio/midi' };
+    }
+    if (href.endsWith('.flac')) {
+        return { assetType: 'audio', mediaType: 'audio/flac' };
+    }
     return null;
 }
 exports.inferMediaType = inferMediaType;

package/dist/cjs/node/runtime/renderPage/renderPageAlreadyRouted.js

@@ -14,7 +14,7 @@ const globalContext_js_1 = require("../globalContext.js");
 const createHttpResponseObject_js_1 = require("./createHttpResponseObject.js");
 const loadPageFilesServerSide_js_1 = require("./loadPageFilesServerSide.js");
 const executeOnRenderHtmlHook_js_1 = require("./executeOnRenderHtmlHook.js");
-const executeOnBeforeRenderHook_js_1 = require("./executeOnBeforeRenderHook.js");
+const executeOnBeforeRenderAndDataHooks_js_1 = require("./executeOnBeforeRenderAndDataHooks.js");
 const loggerRuntime_js_1 = require("./loggerRuntime.js");
 const isNewError_js_1 = require("./isNewError.js");
 const preparePageContextForUserConsumptionServerSide_js_1 = require("./preparePageContextForUserConsumptionServerSide.js");
@@ -34,11 +34,11 @@ async function renderPageAlreadyRouted(pageContext) {
         await (0, executeGuardHook_js_1.executeGuardHook)(pageContext, (pageContext) => (0, preparePageContextForUserConsumptionServerSide_js_1.preparePageContextForUserConsumptionServerSide)(pageContext));
     }
     if (!isError) {
-        await (0, executeOnBeforeRenderHook_js_1.executeOnBeforeRenderHooks)(pageContext);
+        await (0, executeOnBeforeRenderAndDataHooks_js_1.executeOnBeforeRenderAndDataHooks)(pageContext);
     }
     else {
         try {
-            await (0, executeOnBeforeRenderHook_js_1.executeOnBeforeRenderHooks)(pageContext);
+            await (0, executeOnBeforeRenderAndDataHooks_js_1.executeOnBeforeRenderAndDataHooks)(pageContext);
         }
         catch (err) {
             if ((0, isNewError_js_1.isNewError)(err, pageContext.errorWhileRendering)) {
@@ -77,7 +77,7 @@ async function prerenderPage(pageContext) {
      *  - It isn't trivial to implement, as it requires to duplicate / factor out the isAbortError() handling
     await executeGuardHook(pageContext, (pageContext) => preparePageContextForUserConsumptionServerSide(pageContext))
     */
-    await (0, executeOnBeforeRenderHook_js_1.executeOnBeforeRenderHooks)(pageContext);
+    await (0, executeOnBeforeRenderAndDataHooks_js_1.executeOnBeforeRenderAndDataHooks)(pageContext);
     const { htmlRender, renderHook } = await (0, executeOnRenderHtmlHook_js_1.executeOnRenderHtmlHook)(pageContext);
     (0, utils_js_1.assertUsage)(htmlRender !== null, `Cannot pre-render ${picocolors_1.default.cyan(pageContext.urlOriginal)} because the ${renderHook.hookName}() hook defined by ${renderHook.hookFilePath} didn't return an HTML string.`);
     (0, utils_js_1.assert)(pageContext.isClientSideNavigation === false);

package/dist/cjs/shared/page-configs/assertExports.js

@@ -34,13 +34,20 @@ function assertExports(fileExports, filePathToShowToUser, configName) {
         if (exportsRelevant.length === 1) {
             return;
         }
-        else {
-            (0, utils_js_1.assert)(exportsRelevant.length === 0);
-            let errMsg = `${filePathToShowToUser} doesn't export any value, but it should have a ${picocolors_1.default.cyan('export default')}`;
+        const exportDefault = picocolors_1.default.cyan('export default');
+        const exportConfigName = picocolors_1.default.cyan(`export { ${configName} }`);
+        if (exportsRelevant.length === 0) {
+            let errMsg = `${filePathToShowToUser} doesn't export any value, but it should have a ${exportDefault}`;
             if (configName)
-                errMsg += ` or ${picocolors_1.default.cyan(`export { ${configName} }`)}`;
+                errMsg += ` or ${exportConfigName}`;
             (0, utils_js_1.assertUsage)(false, errMsg);
         }
+        else {
+            (0, utils_js_1.assert)(exportsRelevant.length === 2);
+            (0, utils_js_1.assertWarning)(false, `${filePathToShowToUser} remove ${exportConfigName} or ${exportDefault}`, {
+                onlyOnce: true
+            });
+        }
     }
     else {
         // !configName => isConfigFile

package/dist/cjs/shared/route/resolveRedirects.js

@@ -7,6 +7,7 @@ exports.resolveRouteStringRedirect = exports.resolveRedirects = void 0;
 const assertIsNotBrowser_js_1 = require("../../utils/assertIsNotBrowser.js");
 const parseUrl_extras_js_1 = require("../../utils/parseUrl-extras.js");
 const utils_js_1 = require("../utils.js");
+const resolveUrlPathname_js_1 = require("./resolveUrlPathname.js");
 const resolveRouteString_js_1 = require("./resolveRouteString.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)(); // Don't bloat the client
@@ -31,16 +32,7 @@ function resolveRouteStringRedirect(urlSource, urlTarget, urlPathname) {
     const match = (0, resolveRouteString_js_1.resolveRouteString)(urlSource, urlPathname);
     if (!match)
         return null;
-    let urlResolved = urlTarget;
-    Object.entries(match.routeParams).forEach(([key, val]) => {
-        if (key !== '*') {
-            key = `@${key}`;
-        }
-        urlResolved = urlResolved.replaceAll(key, val);
-    });
-    if (!urlResolved.startsWith('mailto:')) {
-        (0, utils_js_1.assertUsage)(!urlResolved.includes('@'), 'URL should not contain "@" unless it is a mailto link.');
-    }
+    const urlResolved = (0, resolveUrlPathname_js_1.resolveUrlPathname)(urlTarget, match.routeParams);
     if (urlResolved === urlPathname)
         return null;
     (0, utils_js_1.assert)(urlResolved.startsWith('/') || (0, parseUrl_extras_js_1.isUriWithProtocol)(urlResolved));

package/dist/cjs/shared/route/resolveUrlPathname.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveUrlPathname = void 0;
+const assertIsNotBrowser_js_1 = require("../../utils/assertIsNotBrowser.js");
+const utils_js_1 = require("../utils.js");
+(0, assertIsNotBrowser_js_1.assertIsNotBrowser)(); // Don't bloat the client
+/** Given a `routeString` and `routeParams`, resolve `urlPathname`.
+ *
+ * Basically, the correct implementation of following:
+ * ```js
+ * let urlPathname = routeString
+ * Object.entries(routeParams).forEach(([key, val]) => {
+ *   urlPathname = urlPathname.replaceAll(key, val)
+ * })
+ * ```
+ */
+function resolveUrlPathname(routeString, routeParams) {
+    let parts = [{ val: routeString, type: 'ROUTE_STRING' }];
+    Object.entries(routeParams).forEach(([key, val]) => {
+        if (key.startsWith('*')) {
+            (0, utils_js_1.assert)(key === '*' || /\d+/.test(key.slice(1)));
+            (0, utils_js_1.assertUsage)(key === '*', "Resolving URL with multiple globs isn't implemented yet");
+        }
+        else {
+            key = `@${key}`;
+        }
+        parts = parts
+            .map((part) => {
+            if (part.type === 'URL') {
+                return part;
+            }
+            else {
+                return part.val
+                    .split(key)
+                    .map((rest, i) => {
+                    const partURL = { val, type: 'URL' };
+                    const partRouteString = { val: rest, type: 'ROUTE_STRING' };
+                    return i === 0 ? [partRouteString] : [partURL, partRouteString];
+                })
+                    .flat();
+            }
+        })
+            .flat();
+    });
+    const urlPathname = parts.map((p) => p.val).join('');
+    return urlPathname;
+}
+exports.resolveUrlPathname = resolveUrlPathname;

package/dist/cjs/utils/debug.js

@@ -12,22 +12,10 @@ const getTerminWidth_js_1 = require("./getTerminWidth.js");
 globalThis.__brillout_debug_createDebugger = createDebugger;
 function createDebugger(namespace, optionsGlobal) {
     (0, checkType_js_1.checkType)(namespace);
-    const debugWithOptions = (options) => {
+    const debugWithOptions = (optionsLocal) => {
         return (...msgs) => {
-            if (!isDebugEnabled(namespace))
-                return;
-            let [msgFirst, ...msgsRest] = msgs;
-            const padding = ' '.repeat(namespace.length + 1);
-            const optionsResolved = { ...optionsGlobal, ...options };
-            msgFirst = formatMsg(msgFirst, optionsResolved, padding, 'FIRST');
-            msgsRest = msgsRest.map((msg, i) => {
-                const position = i === msgsRest.length - 1 ? 'LAST' : 'MIDDLE';
-                return formatMsg(msg, optionsResolved, padding, position);
-            });
-            console.log('\x1b[1m%s\x1b[0m', namespace, msgFirst);
-            msgsRest.forEach((msg) => {
-                console.log(msg);
-            });
+            const options = { ...optionsGlobal, ...optionsLocal };
+            debug_(namespace, options, ...msgs);
         };
     };
     const debug = (...msgs) => debugWithOptions({})(...msgs);
@@ -35,6 +23,32 @@ function createDebugger(namespace, optionsGlobal) {
     return debug;
 }
 exports.createDebugger = createDebugger;
+function debug_(namespace, options, ...msgs) {
+    if (!isDebugEnabled(namespace))
+        return;
+    let [msgFirst, ...msgsRest] = msgs;
+    const padding = ' '.repeat(namespace.length + 1);
+    msgFirst = formatMsg(msgFirst, options, padding, 'FIRST');
+    msgsRest = msgsRest.map((msg, i) => {
+        const position = i === msgsRest.length - 1 ? 'LAST' : 'MIDDLE';
+        return formatMsg(msg, options, padding, position);
+    });
+    let logFirst;
+    let logsRest;
+    const noNewLine = msgsRest.length <= 1 && [msgFirst, ...msgsRest].every((m) => typeof m === 'string' && !m.includes('\n'));
+    if (noNewLine) {
+        logFirst = [msgFirst, ...msgsRest].map((m) => String(m).trim());
+        logsRest = [];
+    }
+    else {
+        logFirst = [msgFirst];
+        logsRest = msgsRest;
+    }
+    console.log('\x1b[1m%s\x1b[0m', namespace, ...logFirst);
+    logsRest.forEach((msg) => {
+        console.log(msg);
+    });
+}
 function isDebugEnabled(namespace) {
     (0, checkType_js_1.checkType)(namespace);
     let DEBUG;

package/dist/cjs/utils/getDependencyPackageJson.js

@@ -17,7 +17,7 @@ const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const assertIsNotProductionRuntime_js_1 = require("./assertIsNotProductionRuntime.js");
 const module_1 = require("module");
-// @ts-ignore Shimed by dist-cjs-fixup.js for CJS build.
+// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
 (0, assertIsNotProductionRuntime_js_1.assertIsNotProductionRuntime)();

package/dist/cjs/utils/getFilePathAbsolute.js

@@ -11,7 +11,7 @@ const assertIsNotProductionRuntime_js_1 = require("./assertIsNotProductionRuntim
 const isNpmPackage_js_1 = require("./isNpmPackage.js");
 const assertPathIsFilesystemAbsolute_js_1 = require("./assertPathIsFilesystemAbsolute.js");
 const module_1 = require("module");
-// @ts-ignore Shimed by dist-cjs-fixup.js for CJS build.
+// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
 (0, assertIsNotProductionRuntime_js_1.assertIsNotProductionRuntime)();

package/dist/cjs/utils/getOutDirs.js

@@ -9,7 +9,10 @@ const assert_js_1 = require("./assert.js");
 const path_shim_js_1 = require("./path-shim.js");
 const filesystemPathHandling_js_1 = require("./filesystemPathHandling.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const debug_js_1 = require("./debug.js");
+const debug = (0, debug_js_1.createDebugger)('vike:outDir');
 function getOutDirs(config) {
+    debug('getOutDirs()', new Error().stack);
     let outDirRoot;
     {
         const outDir = getOutDirFromViteResolvedConfig(config);
@@ -23,12 +26,17 @@ function getOutDirs(config) {
             outDirRoot = outDir.slice(0, -1 * '/client'.length);
         }
     }
-    return getOutDirsAll(outDirRoot, config.root);
+    const outDirs = getOutDirsAll(outDirRoot, config.root);
+    debug('outDirRoot', outDirRoot);
+    debug('outDirs', outDirs);
+    return outDirs;
 }
 exports.getOutDirs = getOutDirs;
 /** Appends `client/` or `server/` to `config.build.outDir` */
 function resolveOutDir(config) {
+    debug('resolveOutDir()', new Error().stack);
     const outDir = getOutDirFromViteUserConfig(config) || 'dist';
+    debug('outDir', 'outDir');
     // outDir may already be resolved when using Telefunc + vike (because both Telefunc and vike use this logic)
     if (!isOutDirRoot(outDir)) {
         assertOutDirResolved(outDir, config);
@@ -37,9 +45,11 @@ function resolveOutDir(config) {
     else {
         const { outDirClient, outDirServer } = determineOutDirs(outDir);
         if ((0, viteIsSSR_js_1.viteIsSSR)(config)) {
+            debug('outDirServer', 'outDirServer');
             return outDirServer;
         }
         else {
+            debug('outDirClient', 'outDirClient');
             return outDirClient;
         }
     }

package/dist/cjs/utils/injectRollupInputs.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeRollupInput = exports.injectRollupInputs = void 0;
+const assert_js_1 = require("./assert.js");
+const isObject_js_1 = require("./isObject.js");
+function injectRollupInputs(inputsNew, config) {
+    const inputsCurrent = normalizeRollupInput(config.build.rollupOptions.input);
+    const input = {
+        ...inputsNew,
+        ...inputsCurrent
+    };
+    return input;
+}
+exports.injectRollupInputs = injectRollupInputs;
+function normalizeRollupInput(input) {
+    if (!input) {
+        return {};
+    }
+    // Usually `input` is an oject, but the user can set it as a `string` or `string[]`
+    if (typeof input === 'string') {
+        input = [input];
+    }
+    if (Array.isArray(input)) {
+        return Object.fromEntries(input.map((input) => [input, input]));
+    }
+    (0, assert_js_1.assert)((0, isObject_js_1.isObject)(input));
+    return input;
+}
+exports.normalizeRollupInput = normalizeRollupInput;

package/dist/cjs/utils/isPlainObject.js

@@ -10,7 +10,7 @@ function isPlainObject(value) {
         return true;
     }
     return (
-    /* Doesn't work in Cloudlfare Pages workers
+    /* Doesn't work in Cloudflare Pages workers
     value.constructor === Object
     */
     value.constructor.name === 'Object');

package/dist/cjs/utils/projectInfo.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
 const assertSingleInstance_js_1 = require("./assertSingleInstance.js");
-const PROJECT_VERSION = '0.4.149';
+const PROJECT_VERSION = '0.4.150-commit-d0822a3';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

package/dist/cjs/utils/requireResolve.js

@@ -7,7 +7,7 @@ const assertIsNotProductionRuntime_js_1 = require("./assertIsNotProductionRuntim
 const filesystemPathHandling_js_1 = require("./filesystemPathHandling.js");
 const isScriptFile_js_1 = require("./isScriptFile.js");
 const module_1 = require("module");
-// @ts-ignore Shimed by dist-cjs-fixup.js for CJS build.
+// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();