vike 0.4.166-commit-a5e2596 → 0.4.167

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

@@ -25,7 +25,7 @@ async function determineOptimizeDeps(config, isDev) {
     */
     config.optimizeDeps.include = [...include, ...normalizeInclude(config.optimizeDeps.include)];
     config.optimizeDeps.entries = [...entries, ...normalizeEntries(config.optimizeDeps.entries)];
-    if (debug.isEnabled)
+    if (debug.isActivated)
         debug('config.optimizeDeps', {
             'config.optimizeDeps.entries': config.optimizeDeps.entries,
             'config.optimizeDeps.include': config.optimizeDeps.include

package/dist/cjs/node/plugin/plugins/extractAssetsPlugin.js

@@ -21,9 +21,7 @@ exports.extractAssetsRE = extractAssetsRE;
 const rawRE = /(\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;
 const EMPTY_MODULE_ID = 'virtual:vike:empty-module';
-const debugNamespace = 'vike:extractAssets';
-const debug = (0, utils_js_1.createDebugger)(debugNamespace);
-const debugEnabled = (0, utils_js_1.isDebugEnabled)(debugNamespace);
+const debug = (0, utils_js_1.createDebugger)('vike:extractAssets');
 function extractAssetsPlugin() {
     let config;
     let configVike;
@@ -129,7 +127,7 @@ function extractAssetsPlugin() {
                 }
             },
             config() {
-                if (debugEnabled) {
+                if (debug.isActivated) {
                     return { logLevel: 'silent' };
                 }
             }

package/dist/cjs/node/plugin/plugins/extractExportNamesPlugin.js

@@ -6,9 +6,7 @@ const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 exports.extractExportNamesRE = extractExportNamesRE;
-const debugNamespace = 'vike:extractExportNames';
-const debug = (0, utils_js_1.createDebugger)(debugNamespace);
-const debugEnabled = (0, utils_js_1.isDebugEnabled)(debugNamespace);
+const debug = (0, utils_js_1.createDebugger)('vike:extractExportNames');
 const globalObject = (0, utils_js_1.getGlobalObject)('extractExportNamesPlugin.ts', {});
 function extractExportNamesPlugin() {
     let isDev = false;
@@ -27,7 +25,7 @@ function extractExportNamesPlugin() {
             isDev = true;
         },
         config() {
-            if (debugEnabled) {
+            if (debug.isActivated) {
                 return { logLevel: 'silent' };
             }
         }

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getConfigFileExport.js

@@ -9,9 +9,9 @@ const assertPlusFileExport_js_1 = require("../../../../../shared/page-configs/as
 const utils_js_1 = require("../../../utils.js");
 function getConfigFileExport(fileExports, filePathToShowToUser) {
     (0, assertPlusFileExport_js_1.assertPlusFileExport)(fileExports, filePathToShowToUser, 'config');
-    const fileExport = fileExports.default || fileExports.config;
-    (0, utils_js_1.assert)('default' in fileExports !== 'config' in fileExports);
-    const exportName = picocolors_1.default.cyan('default' in fileExports ? 'export default' : 'export { config }');
+    const usesNamedExport = !!fileExports.config;
+    const fileExport = usesNamedExport ? fileExports.config : fileExports.default;
+    const exportName = picocolors_1.default.cyan(usesNamedExport ? 'export { config }' : 'export default');
     (0, utils_js_1.assertUsage)((0, utils_js_1.isObject)(fileExport), `The ${exportName} of ${filePathToShowToUser} should be an object (but it's ${picocolors_1.default.cyan(`typeof exportedValue === ${JSON.stringify(typeof fileExport)}`)} instead)`);
     return fileExport;
 }

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.js

@@ -40,10 +40,10 @@ async function transpileFile(filePath, transformImports, userRootDir) {
     const { filePathAbsoluteFilesystem, filePathToShowToUserResolved } = filePath;
     (0, utils_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
     getVikeConfig_js_1.vikeConfigDependencies.add(filePathAbsoluteFilesystem);
-    if (debug.isEnabled)
+    if (debug.isActivated)
         debug('transpile', filePathToShowToUserResolved);
     let { code, pointerImports } = await transpileWithEsbuild(filePath, userRootDir, transformImports);
-    if (debug.isEnabled)
+    if (debug.isActivated)
         debug(`code, post esbuild (${filePathToShowToUserResolved})`, code);
     let isImportTransformed = false;
     if (transformImports) {
@@ -51,12 +51,12 @@ async function transpileFile(filePath, transformImports, userRootDir) {
         if (codeMod) {
             code = codeMod;
             isImportTransformed = true;
-            if (debug.isEnabled)
+            if (debug.isActivated)
                 debug(`code, post transformImports() (${filePathToShowToUserResolved})`, code);
         }
     }
     if (!isImportTransformed) {
-        if (debug.isEnabled)
+        if (debug.isActivated)
             debug(`code, no transformImports() (${filePathToShowToUserResolved})`);
     }
     return code;
@@ -128,7 +128,7 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                         const isExternal = isPointerImport ||
                             // npm package imports that aren't pointer imports (e.g. importing a Vite plugin)
                             resolved.path.includes('/node_modules/');
-                        if (debug.isEnabled)
+                        if (debug.isActivated)
                             debug('onResolved()', { args, resolved, isPointerImport, isExternal });
                         if (isExternal) {
                             return { external: true, path: resolved.path };

package/dist/cjs/node/plugin/shared/isErrorDebug.js

@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isErrorDebug = void 0;
 const utils_js_1 = require("../utils.js");
 function isErrorDebug() {
-    return (0, utils_js_1.isDebugEnabled)('vike:error');
+    return (0, utils_js_1.isDebugActivated)('vike:error');
 }
 exports.isErrorDebug = isErrorDebug;

package/dist/cjs/node/runtime/html/stream.js

@@ -375,7 +375,7 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
         const writeChunk = (chunk) => {
             (0, utils_js_1.assert)(writableOriginal);
             writableOriginal.write(chunk);
-            if (debug.isEnabled) {
+            if (debug.isActivated) {
                 debug('data written (Node.js Writable)', String(chunk));
             }
         };
@@ -448,7 +448,7 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
         const writeChunk = (chunk) => {
             (0, utils_js_1.assert)(writerOriginal);
             writerOriginal.write(encodeForWebStream(chunk));
-            if (debug.isEnabled) {
+            if (debug.isActivated) {
                 debug('data written (Web Writable)', String(chunk));
             }
         };
@@ -541,12 +541,12 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
             // If readableOriginal doesn't implement readableOriginal.cancel() then it may still emit data after we close the stream. We therefore need to check whether we closed `controllerProxy`.
             !controllerProxyIsClosed) {
                 controllerProxy.enqueue(encodeForWebStream(chunk));
-                if (debug.isEnabled) {
+                if (debug.isActivated) {
                     debug('data written (Web Readable)', String(chunk));
                 }
             }
             else {
-                if (debug.isEnabled) {
+                if (debug.isActivated) {
                     debug('data emitted but not written (Web Readable)', String(chunk));
                 }
             }
@@ -568,7 +568,7 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
         }
         const writeChunk = (chunk) => {
             readableProxy.push(chunk);
-            if (debug.isEnabled) {
+            if (debug.isActivated) {
                 debug('data written (Node.js Readable)', String(chunk));
             }
         };

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

@@ -28,9 +28,7 @@ function assertPlusFileExport(fileExports, filePathToShowToUser, configName) {
         }
         else {
             (0, utils_js_1.assert)(exportsAll.length === 2); // because `exportsInvalid.length === 0`
-            (0, utils_js_1.assertWarning)(false, `${filePathToShowToUser} remove ${exportNamed} or ${exportDefault}`, {
-                onlyOnce: true
-            });
+            (0, utils_js_1.assertWarning)(false, `The exports of ${filePathToShowToUser} are ambiguous: remove ${exportDefault} or ${exportNamed}`, { onlyOnce: true });
         }
     }
     else {

package/dist/cjs/utils/assertIsNotProductionRuntime.js

@@ -14,35 +14,35 @@ exports.vikeVitePluginLoadedInProductionError = vikeVitePluginLoadedInProduction
 const env = (0, getGlobalObject_js_1.getGlobalObject)('utils/assertIsNotProductionRuntime.ts', {});
 // Called by Vike modules that want to ensure that they aren't loaded by the server runtime in production
 function assertIsNotProductionRuntime() {
-    if (debug.isEnabled)
+    if (debug.isActivated)
         debug('assertIsNotProductionRuntime()', new Error().stack);
     env.shouldNotBeProduction = true;
 }
 exports.assertIsNotProductionRuntime = assertIsNotProductionRuntime;
 // Called by Vite hook configureServer()
 function markEnvAsViteDev() {
-    if (debug.isEnabled)
+    if (debug.isActivated)
         debug('markEnvAsViteDev()', new Error().stack);
     env.isViteDev = true;
 }
 exports.markEnvAsViteDev = markEnvAsViteDev;
 // Called by Vite hook configurePreviewServer()
 function markEnvAsVitePreview() {
-    if (debug.isEnabled)
+    if (debug.isActivated)
         debug('markEnvAsVitePreview()', new Error().stack);
     env.isVitePreview = true;
 }
 exports.markEnvAsVitePreview = markEnvAsVitePreview;
 // Called by ../node/plugin/index.ts
 function markEnvAsVikePluginLoaded() {
-    if (debug.isEnabled)
+    if (debug.isActivated)
         debug('markEnvAsVikePluginLoaded()', new Error().stack);
     env.isVikePluginLoaded = true;
 }
 exports.markEnvAsVikePluginLoaded = markEnvAsVikePluginLoaded;
 // Called by ../node/runtime/index.ts
 function assertEnv() {
-    if (debug.isEnabled)
+    if (debug.isActivated)
         debug('assertEnv()', new Error().stack);
     if ((0, isVitest_js_1.isVitest)())
         return;

package/dist/cjs/utils/debug.js

@@ -1,17 +1,39 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDebugEnabled = exports.createDebugger = void 0;
+exports.isDebugActivated = exports.createDebugger = void 0;
 const isBrowser_js_1 = require("./isBrowser.js");
 const isCallable_js_1 = require("./isCallable.js");
 const objectAssign_js_1 = require("./objectAssign.js");
 const assert_js_1 = require("./assert.js");
 const checkType_js_1 = require("./checkType.js");
 const getTerminWidth_js_1 = require("./getTerminWidth.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 // Avoid this to be loaded in the browser. For isomorphic code: instead of `import { createDebugger } from './utils.js'`, use `globalThis.createDebugger()`.
 (0, assert_js_1.assert)(!(0, isBrowser_js_1.isBrowser)());
 globalThis.__brillout_debug_createDebugger = createDebugger;
+const flags = [
+    'vike:error',
+    'vike:extractAssets',
+    'vike:extractExportNames',
+    'vike:glob',
+    'vike:log',
+    'vike:optimizeDeps',
+    'vike:outDir',
+    'vike:pageFiles',
+    'vike:pointer-imports',
+    'vike:routing',
+    'vike:setup',
+    'vike:stream',
+    'vike:virtual-files'
+];
+const flagRegex = /\bvike:[a-zA-Z-]+/g;
+assertDEBUG();
 function createDebugger(flag, optionsGlobal) {
     (0, checkType_js_1.checkType)(flag);
+    (0, assert_js_1.assert)(flags.includes(flag));
     const debugWithOptions = (optionsLocal) => {
         return (...msgs) => {
             const options = { ...optionsGlobal, ...optionsLocal };
@@ -19,12 +41,12 @@ function createDebugger(flag, optionsGlobal) {
         };
     };
     const debug = (...msgs) => debugWithOptions({})(...msgs);
-    (0, objectAssign_js_1.objectAssign)(debug, { options: debugWithOptions, isEnabled: isDebugEnabled(flag) });
+    (0, objectAssign_js_1.objectAssign)(debug, { options: debugWithOptions, isActivated: isDebugActivated(flag) });
     return debug;
 }
 exports.createDebugger = createDebugger;
 function debug_(flag, options, ...msgs) {
-    if (!isDebugEnabled(flag))
+    if (!isDebugActivated(flag))
         return;
     let [msgFirst, ...msgsRest] = msgs;
     const padding = ' '.repeat(flag.length + 1);
@@ -49,19 +71,14 @@ function debug_(flag, options, ...msgs) {
         console.log(msg);
     });
 }
-function isDebugEnabled(flag) {
+function isDebugActivated(flag) {
     (0, checkType_js_1.checkType)(flag);
-    let DEBUG;
-    // - `process` can be undefined in edge workers
-    // - We want bundlers to be able to statically replace `process.env.*`
-    try {
-        DEBUG = process.env.DEBUG;
-    }
-    catch { }
-    const isEnabled = DEBUG?.includes(flag) ?? false;
-    return isEnabled;
+    (0, assert_js_1.assert)(flags.includes(flag));
+    const DEBUG = getDEBUG();
+    const isActivated = DEBUG?.includes(flag) ?? false;
+    return isActivated;
 }
-exports.isDebugEnabled = isDebugEnabled;
+exports.isDebugActivated = isDebugActivated;
 function formatMsg(info, options, padding, position) {
     if (info === undefined) {
         return undefined;
@@ -122,3 +139,20 @@ function replaceFunctionSerializer(_key, value) {
     }
     return value;
 }
+function assertDEBUG() {
+    const DEBUG = getDEBUG() ?? '';
+    const flagsActivated = DEBUG.match(flagRegex) ?? [];
+    flagsActivated.forEach((flag) => {
+        (0, assert_js_1.assertUsage)(flags.includes(flag), `Unknown DEBUG flag ${picocolors_1.default.cyan(flag)}. Valid flags:\n${flags.map((f) => `  ${picocolors_1.default.cyan(f)}`).join('\n')}`);
+    });
+}
+function getDEBUG() {
+    let DEBUG;
+    // - `process` can be undefined in edge workers
+    // - We want bundlers to be able to statically replace `process.env.*`
+    try {
+        DEBUG = process.env.DEBUG;
+    }
+    catch { }
+    return DEBUG;
+}

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.166-commit-a5e2596';
+const PROJECT_VERSION = '0.4.167';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

package/dist/cjs/utils/trackLogs.js

@@ -7,7 +7,7 @@ const debug_js_1 = require("./debug.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
-if ((0, debug_js_1.isDebugEnabled)('vike:log')) {
+if ((0, debug_js_1.isDebugActivated)('vike:log')) {
     trackLogs();
 }
 // https://stackoverflow.com/questions/45395369/how-to-get-console-log-line-numbers-shown-in-nodejs/75109905#75109905

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

@@ -22,7 +22,7 @@ async function renderPageClientSide(renderArgs) {
     const { scrollTarget, urlOriginal = getCurrentUrl(), overwriteLastHistoryEntry = false, isBackwardNavigation, pageContextsFromRewrite = [], redirectCount = 0, isUserLandPushStateNavigation, isClientSideNavigation = true } = renderArgs;
     // isHydrationRender <=> the first render attempt
     const { isRenderOutdated, setHydrationCanBeAborted, isHydrationRender } = getIsRenderOutdated();
-    assert(isClientSideNavigation === !isHydrationRender);
+    assert(isClientSideNavigation === !isHydrationRender); // isHydrationRender === (renderNumber === 1)
     assertNoInfiniteAbortLoop(pageContextsFromRewrite.length, redirectCount);
     if (globalObject.clientRoutingIsDisabled) {
         serverSideRouteTo(urlOriginal);
@@ -37,6 +37,31 @@ async function renderPageClientSide(renderArgs) {
         const pageContext = await getPageContextBegin();
         if (isRenderOutdated())
             return;
+        // onPageTransitionStart()
+        if (globalObject.isFirstRenderDone) {
+            const { previousPageContext } = globalObject;
+            assert(previousPageContext);
+            // We use the hook of the previous page in order to be able to call onPageTransitionStart() before fetching the files of the next page.
+            // https://github.com/vikejs/vike/issues/1560
+            assertHook(previousPageContext, 'onPageTransitionStart');
+            if (!globalObject.isTransitioning) {
+                globalObject.isTransitioning = true;
+                const onPageTransitionStartHook = getHook(previousPageContext, 'onPageTransitionStart');
+                if (onPageTransitionStartHook) {
+                    const hook = onPageTransitionStartHook;
+                    const { hookFn } = hook;
+                    try {
+                        await executeHook(() => hookFn(pageContext), hook);
+                    }
+                    catch (err) {
+                        await onError(err);
+                        return;
+                    }
+                    if (isRenderOutdated())
+                        return;
+                }
+            }
+        }
         // Route
         let pageContextRouted;
         if (isHydrationRender) {
@@ -104,27 +129,6 @@ async function renderPageClientSide(renderArgs) {
         // There wasn't any `await` but result may change because we just called setHydrationCanBeAborted()
         if (isRenderOutdated())
             return;
-        // onPageTransitionStart()
-        if (!isHydrationRender) {
-            assertHook(pageContext, 'onPageTransitionStart');
-            if (!globalObject.isTransitioning) {
-                globalObject.isTransitioning = true;
-                const onPageTransitionStartHook = getHook(pageContext, 'onPageTransitionStart');
-                if (onPageTransitionStartHook) {
-                    const hook = onPageTransitionStartHook;
-                    const { hookFn } = hook;
-                    try {
-                        await executeHook(() => hookFn(pageContext), hook);
-                    }
-                    catch (err) {
-                        await onError(err);
-                        return;
-                    }
-                    if (isRenderOutdated())
-                        return;
-                }
-            }
-        }
         // Get pageContext from hooks (fetched from server, and/or directly called on the client-side)
         if (isHydrationRender) {
             assert(hasProp(pageContext, '_hasPageContextFromServer', 'true'));
@@ -328,6 +332,7 @@ async function renderPageClientSide(renderArgs) {
                 onRenderClientError = err;
             }
             globalObject.onRenderClientPromise = undefined;
+            globalObject.isFirstRenderDone = true;
             return onRenderClientError;
         })();
         const onRenderClientError = await globalObject.onRenderClientPromise;
@@ -365,8 +370,10 @@ async function renderPageClientSide(renderArgs) {
         // onPageTransitionEnd()
         if (globalObject.isTransitioning) {
             globalObject.isTransitioning = undefined;
-            assertHook(pageContext, 'onPageTransitionEnd');
-            const hook = getHook(pageContext, 'onPageTransitionEnd');
+            const { previousPageContext } = globalObject;
+            assert(previousPageContext);
+            assertHook(previousPageContext, 'onPageTransitionEnd');
+            const hook = getHook(previousPageContext, 'onPageTransitionEnd');
             if (hook) {
                 const { hookFn } = hook;
                 try {

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

@@ -23,7 +23,7 @@ async function determineOptimizeDeps(config, isDev) {
     */
     config.optimizeDeps.include = [...include, ...normalizeInclude(config.optimizeDeps.include)];
     config.optimizeDeps.entries = [...entries, ...normalizeEntries(config.optimizeDeps.entries)];
-    if (debug.isEnabled)
+    if (debug.isActivated)
         debug('config.optimizeDeps', {
             'config.optimizeDeps.entries': config.optimizeDeps.entries,
             'config.optimizeDeps.include': config.optimizeDeps.include

package/dist/esm/node/plugin/plugins/extractAssetsPlugin.js

@@ -6,7 +6,7 @@
 //  - This appraoch supports import path aliases `vite.config.js#resolve.alias` https://vitejs.dev/config/#resolve-alias
 export { extractAssetsPlugin };
 export { extractAssetsRE };
-import { viteIsSSR_options, assert, assertPosixPath, styleFileRE, createDebugger, isDebugEnabled, isScriptFile, resolveVirtualFileId, isVirtualFileId, getVirtualFileId, assertUsage } from '../utils.js';
+import { viteIsSSR_options, assert, assertPosixPath, styleFileRE, createDebugger, isScriptFile, resolveVirtualFileId, isVirtualFileId, getVirtualFileId, assertUsage } from '../utils.js';
 import { extractAssetsAddQuery } from '../../shared/extractAssetsQuery.js';
 import { getConfigVike } from '../../shared/getConfigVike.js';
 import { isAsset } from '../shared/isAsset.js';
@@ -20,9 +20,7 @@ const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 const rawRE = /(\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;
 const EMPTY_MODULE_ID = 'virtual:vike:empty-module';
-const debugNamespace = 'vike:extractAssets';
-const debug = createDebugger(debugNamespace);
-const debugEnabled = isDebugEnabled(debugNamespace);
+const debug = createDebugger('vike:extractAssets');
 function extractAssetsPlugin() {
     let config;
     let configVike;
@@ -128,7 +126,7 @@ function extractAssetsPlugin() {
                 }
             },
             config() {
-                if (debugEnabled) {
+                if (debug.isActivated) {
                     return { logLevel: 'silent' };
                 }
             }

package/dist/esm/node/plugin/plugins/extractExportNamesPlugin.js

@@ -1,13 +1,11 @@
 export { extractExportNamesPlugin };
 export { isUsingClientRouter };
 export { extractExportNamesRE };
-import { assert, getFileExtension, viteIsSSR_options, createDebugger, isDebugEnabled, getGlobalObject, assertUsage } from '../utils.js';
+import { assert, getFileExtension, viteIsSSR_options, createDebugger, getGlobalObject, assertUsage } from '../utils.js';
 import { getExportNames } from '../shared/parseEsModule.js';
 import { sourceMapRemove } from '../shared/rollupSourceMap.js';
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
-const debugNamespace = 'vike:extractExportNames';
-const debug = createDebugger(debugNamespace);
-const debugEnabled = isDebugEnabled(debugNamespace);
+const debug = createDebugger('vike:extractExportNames');
 const globalObject = getGlobalObject('extractExportNamesPlugin.ts', {});
 function extractExportNamesPlugin() {
     let isDev = false;
@@ -26,7 +24,7 @@ function extractExportNamesPlugin() {
             isDev = true;
         },
         config() {
-            if (debugEnabled) {
+            if (debug.isActivated) {
                 return { logLevel: 'silent' };
             }
         }

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/debug.d.ts

@@ -4,5 +4,5 @@ export declare const debug: ((...msgs: unknown[]) => void) & {
             emptyArray?: string | undefined;
         } | undefined;
     }) => (...msgs: unknown[]) => void;
-    isEnabled: boolean;
+    isActivated: boolean;
 };

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getConfigFileExport.js

@@ -1,12 +1,12 @@
 export { getConfigFileExport };
 import pc from '@brillout/picocolors';
 import { assertPlusFileExport } from '../../../../../shared/page-configs/assertPlusFileExport.js';
-import { assert, assertUsage, isObject } from '../../../utils.js';
+import { assertUsage, isObject } from '../../../utils.js';
 function getConfigFileExport(fileExports, filePathToShowToUser) {
     assertPlusFileExport(fileExports, filePathToShowToUser, 'config');
-    const fileExport = fileExports.default || fileExports.config;
-    assert('default' in fileExports !== 'config' in fileExports);
-    const exportName = pc.cyan('default' in fileExports ? 'export default' : 'export { config }');
+    const usesNamedExport = !!fileExports.config;
+    const fileExport = usesNamedExport ? fileExports.config : fileExports.default;
+    const exportName = pc.cyan(usesNamedExport ? 'export { config }' : 'export default');
     assertUsage(isObject(fileExport), `The ${exportName} of ${filePathToShowToUser} should be an object (but it's ${pc.cyan(`typeof exportedValue === ${JSON.stringify(typeof fileExport)}`)} instead)`);
     return fileExport;
 }

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.js

@@ -37,10 +37,10 @@ async function transpileFile(filePath, transformImports, userRootDir) {
     const { filePathAbsoluteFilesystem, filePathToShowToUserResolved } = filePath;
     assertPosixPath(filePathAbsoluteFilesystem);
     vikeConfigDependencies.add(filePathAbsoluteFilesystem);
-    if (debug.isEnabled)
+    if (debug.isActivated)
         debug('transpile', filePathToShowToUserResolved);
     let { code, pointerImports } = await transpileWithEsbuild(filePath, userRootDir, transformImports);
-    if (debug.isEnabled)
+    if (debug.isActivated)
         debug(`code, post esbuild (${filePathToShowToUserResolved})`, code);
     let isImportTransformed = false;
     if (transformImports) {
@@ -48,12 +48,12 @@ async function transpileFile(filePath, transformImports, userRootDir) {
         if (codeMod) {
             code = codeMod;
             isImportTransformed = true;
-            if (debug.isEnabled)
+            if (debug.isActivated)
                 debug(`code, post transformImports() (${filePathToShowToUserResolved})`, code);
         }
     }
     if (!isImportTransformed) {
-        if (debug.isEnabled)
+        if (debug.isActivated)
             debug(`code, no transformImports() (${filePathToShowToUserResolved})`);
     }
     return code;
@@ -125,7 +125,7 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                         const isExternal = isPointerImport ||
                             // npm package imports that aren't pointer imports (e.g. importing a Vite plugin)
                             resolved.path.includes('/node_modules/');
-                        if (debug.isEnabled)
+                        if (debug.isActivated)
                             debug('onResolved()', { args, resolved, isPointerImport, isExternal });
                         if (isExternal) {
                             return { external: true, path: resolved.path };

package/dist/esm/node/plugin/shared/isErrorDebug.js

@@ -1,5 +1,5 @@
 export { isErrorDebug };
-import { isDebugEnabled } from '../utils.js';
+import { isDebugActivated } from '../utils.js';
 function isErrorDebug() {
-    return isDebugEnabled('vike:error');
+    return isDebugActivated('vike:error');
 }

package/dist/esm/node/runtime/html/stream.js

@@ -379,7 +379,7 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
         const writeChunk = (chunk) => {
             assert(writableOriginal);
             writableOriginal.write(chunk);
-            if (debug.isEnabled) {
+            if (debug.isActivated) {
                 debug('data written (Node.js Writable)', String(chunk));
             }
         };
@@ -452,7 +452,7 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
         const writeChunk = (chunk) => {
             assert(writerOriginal);
             writerOriginal.write(encodeForWebStream(chunk));
-            if (debug.isEnabled) {
+            if (debug.isActivated) {
                 debug('data written (Web Writable)', String(chunk));
             }
         };
@@ -545,12 +545,12 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
             // If readableOriginal doesn't implement readableOriginal.cancel() then it may still emit data after we close the stream. We therefore need to check whether we closed `controllerProxy`.
             !controllerProxyIsClosed) {
                 controllerProxy.enqueue(encodeForWebStream(chunk));
-                if (debug.isEnabled) {
+                if (debug.isActivated) {
                     debug('data written (Web Readable)', String(chunk));
                 }
             }
             else {
-                if (debug.isEnabled) {
+                if (debug.isActivated) {
                     debug('data emitted but not written (Web Readable)', String(chunk));
                 }
             }
@@ -572,7 +572,7 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
         }
         const writeChunk = (chunk) => {
             readableProxy.push(chunk);
-            if (debug.isEnabled) {
+            if (debug.isActivated) {
                 debug('data written (Node.js Readable)', String(chunk));
             }
         };

package/dist/esm/shared/page-configs/assertPlusFileExport.js

@@ -23,9 +23,7 @@ function assertPlusFileExport(fileExports, filePathToShowToUser, configName) {
         }
         else {
             assert(exportsAll.length === 2); // because `exportsInvalid.length === 0`
-            assertWarning(false, `${filePathToShowToUser} remove ${exportNamed} or ${exportDefault}`, {
-                onlyOnce: true
-            });
+            assertWarning(false, `The exports of ${filePathToShowToUser} are ambiguous: remove ${exportDefault} or ${exportNamed}`, { onlyOnce: true });
         }
     }
     else {

package/dist/esm/utils/assertIsNotProductionRuntime.js

@@ -16,31 +16,31 @@ const vikeVitePluginLoadedInProductionError = `Loading Vike's Vite plugin (the v
 const env = getGlobalObject('utils/assertIsNotProductionRuntime.ts', {});
 // Called by Vike modules that want to ensure that they aren't loaded by the server runtime in production
 function assertIsNotProductionRuntime() {
-    if (debug.isEnabled)
+    if (debug.isActivated)
         debug('assertIsNotProductionRuntime()', new Error().stack);
     env.shouldNotBeProduction = true;
 }
 // Called by Vite hook configureServer()
 function markEnvAsViteDev() {
-    if (debug.isEnabled)
+    if (debug.isActivated)
         debug('markEnvAsViteDev()', new Error().stack);
     env.isViteDev = true;
 }
 // Called by Vite hook configurePreviewServer()
 function markEnvAsVitePreview() {
-    if (debug.isEnabled)
+    if (debug.isActivated)
         debug('markEnvAsVitePreview()', new Error().stack);
     env.isVitePreview = true;
 }
 // Called by ../node/plugin/index.ts
 function markEnvAsVikePluginLoaded() {
-    if (debug.isEnabled)
+    if (debug.isActivated)
         debug('markEnvAsVikePluginLoaded()', new Error().stack);
     env.isVikePluginLoaded = true;
 }
 // Called by ../node/runtime/index.ts
 function assertEnv() {
-    if (debug.isEnabled)
+    if (debug.isActivated)
         debug('assertEnv()', new Error().stack);
     if (isVitest())
         return;

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

@@ -1,7 +1,8 @@
 export { createDebugger };
-export { isDebugEnabled };
+export { isDebugActivated };
 export type { Debug };
-type Flag = 'vike:routing' | 'vike:error' | 'vike:stream' | 'vike:log' | 'vike:virtual-files' | 'vike:outDir' | 'vike:extractExportNames' | 'vike:extractAssets' | 'vike:glob' | 'vike:pageFiles' | 'vike:setup' | 'vike:pointer-imports' | 'vike:optimizeDeps';
+declare const flags: readonly ["vike:error", "vike:extractAssets", "vike:extractExportNames", "vike:glob", "vike:log", "vike:optimizeDeps", "vike:outDir", "vike:pageFiles", "vike:pointer-imports", "vike:routing", "vike:setup", "vike:stream", "vike:virtual-files"];
+type Flag = (typeof flags)[number];
 type Debug = ReturnType<typeof createDebugger>;
 type Options = {
     serialization?: {
@@ -10,6 +11,6 @@ type Options = {
 };
 declare function createDebugger(flag: Flag, optionsGlobal?: Options): ((...msgs: unknown[]) => void) & {
     options: (optionsLocal: Options) => (...msgs: unknown[]) => void;
-    isEnabled: boolean;
+    isActivated: boolean;
 };
-declare function isDebugEnabled(flag: Flag): boolean;
+declare function isDebugActivated(flag: Flag): boolean;

package/dist/esm/utils/debug.js

@@ -1,16 +1,35 @@
 export { createDebugger };
-export { isDebugEnabled };
+export { isDebugActivated };
 import { isBrowser } from './isBrowser.js';
 import { isCallable } from './isCallable.js';
 import { objectAssign } from './objectAssign.js';
-import { assert } from './assert.js';
+import { assert, assertUsage } from './assert.js';
 import { checkType } from './checkType.js';
 import { getTerminalWidth } from './getTerminWidth.js';
+import pc from '@brillout/picocolors';
 // Avoid this to be loaded in the browser. For isomorphic code: instead of `import { createDebugger } from './utils.js'`, use `globalThis.createDebugger()`.
 assert(!isBrowser());
 globalThis.__brillout_debug_createDebugger = createDebugger;
+const flags = [
+    'vike:error',
+    'vike:extractAssets',
+    'vike:extractExportNames',
+    'vike:glob',
+    'vike:log',
+    'vike:optimizeDeps',
+    'vike:outDir',
+    'vike:pageFiles',
+    'vike:pointer-imports',
+    'vike:routing',
+    'vike:setup',
+    'vike:stream',
+    'vike:virtual-files'
+];
+const flagRegex = /\bvike:[a-zA-Z-]+/g;
+assertDEBUG();
 function createDebugger(flag, optionsGlobal) {
     checkType(flag);
+    assert(flags.includes(flag));
     const debugWithOptions = (optionsLocal) => {
         return (...msgs) => {
             const options = { ...optionsGlobal, ...optionsLocal };
@@ -18,11 +37,11 @@ function createDebugger(flag, optionsGlobal) {
         };
     };
     const debug = (...msgs) => debugWithOptions({})(...msgs);
-    objectAssign(debug, { options: debugWithOptions, isEnabled: isDebugEnabled(flag) });
+    objectAssign(debug, { options: debugWithOptions, isActivated: isDebugActivated(flag) });
     return debug;
 }
 function debug_(flag, options, ...msgs) {
-    if (!isDebugEnabled(flag))
+    if (!isDebugActivated(flag))
         return;
     let [msgFirst, ...msgsRest] = msgs;
     const padding = ' '.repeat(flag.length + 1);
@@ -47,17 +66,12 @@ function debug_(flag, options, ...msgs) {
         console.log(msg);
     });
 }
-function isDebugEnabled(flag) {
+function isDebugActivated(flag) {
     checkType(flag);
-    let DEBUG;
-    // - `process` can be undefined in edge workers
-    // - We want bundlers to be able to statically replace `process.env.*`
-    try {
-        DEBUG = process.env.DEBUG;
-    }
-    catch { }
-    const isEnabled = DEBUG?.includes(flag) ?? false;
-    return isEnabled;
+    assert(flags.includes(flag));
+    const DEBUG = getDEBUG();
+    const isActivated = DEBUG?.includes(flag) ?? false;
+    return isActivated;
 }
 function formatMsg(info, options, padding, position) {
     if (info === undefined) {
@@ -119,3 +133,20 @@ function replaceFunctionSerializer(_key, value) {
     }
     return value;
 }
+function assertDEBUG() {
+    const DEBUG = getDEBUG() ?? '';
+    const flagsActivated = DEBUG.match(flagRegex) ?? [];
+    flagsActivated.forEach((flag) => {
+        assertUsage(flags.includes(flag), `Unknown DEBUG flag ${pc.cyan(flag)}. Valid flags:\n${flags.map((f) => `  ${pc.cyan(f)}`).join('\n')}`);
+    });
+}
+function getDEBUG() {
+    let DEBUG;
+    // - `process` can be undefined in edge workers
+    // - We want bundlers to be able to statically replace `process.env.*`
+    try {
+        DEBUG = process.env.DEBUG;
+    }
+    catch { }
+    return DEBUG;
+}

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

@@ -4,5 +4,5 @@ export declare const debugGlob: ((...msgs: unknown[]) => void) & {
             emptyArray?: string | undefined;
         } | undefined;
     }) => (...msgs: unknown[]) => void;
-    isEnabled: boolean;
+    isActivated: boolean;
 };

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.166-commit-a5e2596";
+declare const PROJECT_VERSION: "0.4.167";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.166-commit-a5e2596";
+    projectVersion: "0.4.167";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.166-commit-a5e2596';
+const PROJECT_VERSION = '0.4.167';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/dist/esm/utils/trackLogs.js

@@ -1,8 +1,8 @@
-import { isDebugEnabled } from './debug.js';
+import { isDebugActivated } from './debug.js';
 import pc from '@brillout/picocolors';
 import { assertIsNotBrowser } from './assertIsNotBrowser.js';
 assertIsNotBrowser();
-if (isDebugEnabled('vike:log')) {
+if (isDebugActivated('vike:log')) {
     trackLogs();
 }
 // https://stackoverflow.com/questions/45395369/how-to-get-console-log-line-numbers-shown-in-nodejs/75109905#75109905

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.166-commit-a5e2596",
+  "version": "0.4.167",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",