vike 0.4.166 → 0.4.167-commit-c08a6bb

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/isNpmPackage.d.ts

@@ -1,8 +1,12 @@
 export { isNpmPackageImport };
+export { assertIsNpmPackageImport };
 export { isValidPathAlias };
 export { parse };
 export { isDistinguishable };
-declare function isNpmPackageImport(str: string): boolean;
+declare function isNpmPackageImport(str: string, { cannotBePathAlias }: {
+    cannotBePathAlias: true;
+}): boolean;
+declare function assertIsNpmPackageImport(str: string): void;
 declare function isValidPathAlias(alias: string): boolean;
 declare function isDistinguishable(alias: string): boolean;
 declare function parse(str: string | undefined): null | {

package/dist/esm/utils/isNpmPackage.js

@@ -1,4 +1,5 @@
 export { isNpmPackageImport };
+export { assertIsNpmPackageImport };
 export { isValidPathAlias };
 /* Currently not used
 export { isNpmPackageName }
@@ -11,10 +12,18 @@ export { isDistinguishable };
 import { assert } from './assert.js';
 import { assertIsNotBrowser } from './assertIsNotBrowser.js';
 assertIsNotBrowser();
-function isNpmPackageImport(str) {
+function isNpmPackageImport(str, { cannotBePathAlias }) {
+    // We cannot distinguish path alises that look like npm package imports
+    assert(cannotBePathAlias);
     const res = parse(str);
     return res !== null;
 }
+function assertIsNpmPackageImport(str) {
+    assert(isNpmPackageImport(str, {
+        // If `str` is a path alias that looks like an npm package => assertIsNpmPackageImport() is erroneous but that's okay because the assertion will eventually fail for some other user using a disambiguated path alias.
+        cannotBePathAlias: true
+    }));
+}
 function isNpmPackageName(str) {
     const res = parse(str);
     return res !== null && res.importPath === null;

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

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

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.166';
+const PROJECT_VERSION = '0.4.167-commit-c08a6bb';
 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",
+  "version": "0.4.167-commit-c08a6bb",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",

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

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertClientEntryId = void 0;
-const utils_js_1 = require("../../utils.js");
-const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
-function assertClientEntryId(id) {
-    (0, utils_js_1.assertPosixPath)(id);
-    (0, utils_js_1.assert)(!id.startsWith('/@fs'), id);
-    (0, utils_js_1.assert)(
-    // Client entry
-    id.startsWith('@@vike/') ||
-        // User files
-        id.startsWith('/') ||
-        // Page code importer
-        (0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(id) ||
-        // Import
-        (0, utils_js_1.isNpmPackageImport)(id), id);
-}
-exports.assertClientEntryId = assertClientEntryId;

package/dist/cjs/utils/getFilePathAbsolute.js

@@ -1,70 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFilePathAbsoluteUserRootDir = exports.getFilePathAbsoluteFilesystem = void 0;
-const filesystemPathHandling_js_1 = require("./filesystemPathHandling.js");
-const assert_js_1 = require("./assert.js");
-const path_1 = __importDefault(require("path"));
-const assertIsNotProductionRuntime_js_1 = require("./assertIsNotProductionRuntime.js");
-const isNpmPackage_js_1 = require("./isNpmPackage.js");
-const assertPathIsFilesystemAbsolute_js_1 = require("./assertPathIsFilesystemAbsolute.js");
-const module_1 = require("module");
-// @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)();
-// Vite handles paths such as /pages/index.page.js which are relative to `config.root`.
-// Make them absolute starting from the filesystem root.
-// Also resolve plus files living in npm packages such as restack/renderer/+onRenderHtml.js
-function getFilePathAbsoluteFilesystem(filePath, config) {
-    (0, filesystemPathHandling_js_1.assertPosixPath)(filePath);
-    if (filePath.startsWith('/@fs/')) {
-        return filePath;
-    }
-    let filePathUnresolved;
-    if ((0, isNpmPackage_js_1.isNpmPackageImport)(filePath)) {
-        filePathUnresolved = filePath;
-    }
-    else {
-        (0, assert_js_1.assert)(filePath.startsWith('/'));
-        const { root } = config;
-        (0, assertPathIsFilesystemAbsolute_js_1.assertPathIsFilesystemAbsolute)(root);
-        filePathUnresolved = path_1.default.posix.join(root, filePath);
-        (0, assertPathIsFilesystemAbsolute_js_1.assertPathIsFilesystemAbsolute)(filePathUnresolved);
-    }
-    let filePathAbsoluteFilesystem;
-    try {
-        filePathAbsoluteFilesystem = require_.resolve(filePathUnresolved, { paths: [config.root] });
-    }
-    catch (err) {
-        console.error(err);
-        (0, assert_js_1.assert)(false);
-    }
-    filePathAbsoluteFilesystem = (0, filesystemPathHandling_js_1.toPosixPath)(filePathAbsoluteFilesystem);
-    (0, assertPathIsFilesystemAbsolute_js_1.assertPathIsFilesystemAbsolute)(filePathAbsoluteFilesystem);
-    return filePathAbsoluteFilesystem;
-}
-exports.getFilePathAbsoluteFilesystem = getFilePathAbsoluteFilesystem;
-function getFilePathAbsoluteUserRootDir(filePathAbsoluteFilesystem, userRootDir, alwaysRelative = false) {
-    (0, filesystemPathHandling_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
-    (0, filesystemPathHandling_js_1.assertPosixPath)(userRootDir);
-    let filePathAbsoluteUserRootDir = path_1.default.posix.relative(userRootDir, filePathAbsoluteFilesystem);
-    if (filePathAbsoluteFilesystem.startsWith(userRootDir)) {
-        (0, assert_js_1.assert)(!filePathAbsoluteUserRootDir.startsWith('.') && !filePathAbsoluteUserRootDir.startsWith('/'), 
-        // Surprinsingly, this assertion seem to fail sometimes: https://github.com/vikejs/vike/issues/1139
-        { filePathAbsoluteUserRootDir, filePathAbsoluteFilesystem, userRootDir });
-        filePathAbsoluteUserRootDir = `/${filePathAbsoluteUserRootDir}`;
-        return filePathAbsoluteUserRootDir;
-    }
-    else {
-        if (alwaysRelative) {
-            return filePathAbsoluteUserRootDir;
-        }
-        else {
-            return filePathAbsoluteFilesystem;
-        }
-    }
-}
-exports.getFilePathAbsoluteUserRootDir = getFilePathAbsoluteUserRootDir;

package/dist/esm/node/runtime/renderPage/getPageAssets/assertClientEntryId.d.ts

@@ -1,2 +0,0 @@
-export { assertClientEntryId };
-declare function assertClientEntryId(id: string): void;

package/dist/esm/node/runtime/renderPage/getPageAssets/assertClientEntryId.js

@@ -1,16 +0,0 @@
-export { assertClientEntryId };
-import { assert, assertPosixPath, isNpmPackageImport } from '../../utils.js';
-import { isVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
-function assertClientEntryId(id) {
-    assertPosixPath(id);
-    assert(!id.startsWith('/@fs'), id);
-    assert(
-    // Client entry
-    id.startsWith('@@vike/') ||
-        // User files
-        id.startsWith('/') ||
-        // Page code importer
-        isVirtualFileIdPageConfigValuesAll(id) ||
-        // Import
-        isNpmPackageImport(id), id);
-}

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

@@ -1,5 +0,0 @@
-export { getFilePathAbsoluteFilesystem };
-export { getFilePathAbsoluteUserRootDir };
-import type { ResolvedConfig } from 'vite';
-declare function getFilePathAbsoluteFilesystem(filePath: string, config: ResolvedConfig): string;
-declare function getFilePathAbsoluteUserRootDir(filePathAbsoluteFilesystem: string, userRootDir: string, alwaysRelative?: boolean): string;

package/dist/esm/utils/getFilePathAbsolute.js

@@ -1,64 +0,0 @@
-export { getFilePathAbsoluteFilesystem };
-export { getFilePathAbsoluteUserRootDir };
-import { assertPosixPath, toPosixPath } from './filesystemPathHandling.js';
-import { assert } from './assert.js';
-import path from 'path';
-import { assertIsNotProductionRuntime } from './assertIsNotProductionRuntime.js';
-import { isNpmPackageImport } from './isNpmPackage.js';
-import { assertPathIsFilesystemAbsolute } from './assertPathIsFilesystemAbsolute.js';
-import { createRequire } from 'module';
-// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
-const importMetaUrl = import.meta.url;
-const require_ = createRequire(importMetaUrl);
-assertIsNotProductionRuntime();
-// Vite handles paths such as /pages/index.page.js which are relative to `config.root`.
-// Make them absolute starting from the filesystem root.
-// Also resolve plus files living in npm packages such as restack/renderer/+onRenderHtml.js
-function getFilePathAbsoluteFilesystem(filePath, config) {
-    assertPosixPath(filePath);
-    if (filePath.startsWith('/@fs/')) {
-        return filePath;
-    }
-    let filePathUnresolved;
-    if (isNpmPackageImport(filePath)) {
-        filePathUnresolved = filePath;
-    }
-    else {
-        assert(filePath.startsWith('/'));
-        const { root } = config;
-        assertPathIsFilesystemAbsolute(root);
-        filePathUnresolved = path.posix.join(root, filePath);
-        assertPathIsFilesystemAbsolute(filePathUnresolved);
-    }
-    let filePathAbsoluteFilesystem;
-    try {
-        filePathAbsoluteFilesystem = require_.resolve(filePathUnresolved, { paths: [config.root] });
-    }
-    catch (err) {
-        console.error(err);
-        assert(false);
-    }
-    filePathAbsoluteFilesystem = toPosixPath(filePathAbsoluteFilesystem);
-    assertPathIsFilesystemAbsolute(filePathAbsoluteFilesystem);
-    return filePathAbsoluteFilesystem;
-}
-function getFilePathAbsoluteUserRootDir(filePathAbsoluteFilesystem, userRootDir, alwaysRelative = false) {
-    assertPosixPath(filePathAbsoluteFilesystem);
-    assertPosixPath(userRootDir);
-    let filePathAbsoluteUserRootDir = path.posix.relative(userRootDir, filePathAbsoluteFilesystem);
-    if (filePathAbsoluteFilesystem.startsWith(userRootDir)) {
-        assert(!filePathAbsoluteUserRootDir.startsWith('.') && !filePathAbsoluteUserRootDir.startsWith('/'), 
-        // Surprinsingly, this assertion seem to fail sometimes: https://github.com/vikejs/vike/issues/1139
-        { filePathAbsoluteUserRootDir, filePathAbsoluteFilesystem, userRootDir });
-        filePathAbsoluteUserRootDir = `/${filePathAbsoluteUserRootDir}`;
-        return filePathAbsoluteUserRootDir;
-    }
-    else {
-        if (alwaysRelative) {
-            return filePathAbsoluteUserRootDir;
-        }
-        else {
-            return filePathAbsoluteFilesystem;
-        }
-    }
-}