vike 0.4.227-commit-68a216b → 0.4.227-commit-e36b916

package/dist/cjs/node/plugin/plugins/build/pluginModuleBanner.js

@@ -1,31 +1,45 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginModuleBanner = pluginModuleBanner;
+const magic_string_1 = __importDefault(require("magic-string"));
 const utils_js_1 = require("../../utils.js");
 const virtual_files_js_1 = require("../../../shared/virtual-files.js");
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
-const rollupSourceMap_js_1 = require("../../shared/rollupSourceMap.js");
 // Rollup's banner feature doesn't work with Vite: https://github.com/vitejs/vite/issues/8412
 // But, anyways, we want to prepend the banner at the beginning of each module, not at the beginning of each file (I believe that's what Rollup's banner feature does).
 const vikeModuleBannerPlaceholder = 'vikeModuleBannerPlaceholder';
 function pluginModuleBanner() {
     let config;
+    let disabled = false;
     return {
         name: 'vike:pluginModuleBanner',
         enforce: 'post',
         apply: 'build',
         configResolved(config_) {
             config = config_;
+            if (config.build.minify && config.build.minify !== 'esbuild') {
+                // Doesn't work upon `config.build.minify === 'terser'`
+                // https://github.com/vikejs/vike/issues/2315
+                disabled = true;
+            }
         },
         generateBundle: {
             order: 'post',
             handler(_options, bundle) {
+                if (disabled)
+                    return;
                 for (const module of Object.values(bundle)) {
                     if (module.type === 'chunk') {
                         if ((0, isViteServerBuild_js_1.isViteServerBuild)(config)) {
                             const codeOld = module.code;
                             const codeNew = codeOld.replace(/vikeModuleBannerPlaceholder\("([^"]*)"\);/g, '/* $1 [vike:pluginModuleBanner] */');
-                            (0, utils_js_1.assert)(!codeNew.includes(vikeModuleBannerPlaceholder));
+                            if (codeNew.includes(vikeModuleBannerPlaceholder)) {
+                                console.log('codeNew', codeNew);
+                                (0, utils_js_1.assert)(false);
+                            }
                             module.code = codeNew;
                         }
                         else {
@@ -38,6 +52,8 @@ function pluginModuleBanner() {
         transform: {
             order: 'post',
             handler(code, id, options) {
+                if (disabled)
+                    return;
                 if (!(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options))
                     return;
                 if (id.startsWith('\0'))
@@ -45,9 +61,13 @@ function pluginModuleBanner() {
                 id = (0, virtual_files_js_1.removeVirtualIdTag)(id);
                 if (id.startsWith(config.root))
                     id = id.slice(config.root.length + 1);
+                const s = new magic_string_1.default(code);
                 // No need to insert a new line; Rollup formats the code and will insert a new line.
-                const codeNew = `${vikeModuleBannerPlaceholder}(${JSON.stringify(id)}); ${code}`;
-                return (0, rollupSourceMap_js_1.sourceMapPassthrough)(codeNew);
+                s.prepend(`${vikeModuleBannerPlaceholder}(${JSON.stringify(id)}); `);
+                return {
+                    code: s.toString(),
+                    map: s.generateMap({ hires: true, source: id })
+                };
             }
         }
     };

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

@@ -1,9 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.envVarsPlugin = envVarsPlugin;
+const magic_string_1 = __importDefault(require("magic-string"));
 const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
-const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const getFilePath_js_1 = require("../shared/getFilePath.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
 const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
@@ -12,7 +15,7 @@ const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
 //   - Or stop using Vite's `mode` implemention and have Vike implement its own `mode` feature? (So that the only dependencies are `$ vike build --mode staging` and `$ MODE=staging vike build`.)
 const PUBLIC_ENV_PREFIX = 'PUBLIC_ENV__';
-const PUBLIC_ENV_WHITELIST = [
+const PUBLIC_ENV_ALLOWLIST = [
     // https://github.com/vikejs/vike/issues/1724
     'STORYBOOK'
 ];
@@ -40,6 +43,7 @@ function envVarsPlugin() {
                 return;
             const isBuild = config.command === 'build';
             const isClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options);
+            const s = new magic_string_1.default(code);
             Object.entries(envsAll)
                 .filter(([key]) => {
                 // Already handled by Vite
@@ -48,12 +52,12 @@ function envVarsPlugin() {
             })
                 .forEach(([envName, envVal]) => {
                 const envStatement = `import.meta.env.${envName}`;
-                const envStatementRegEx = new RegExp((0, utils_js_1.escapeRegex)(envStatement) + '\\b', 'g');
+                const envStatementRegExStr = (0, utils_js_1.escapeRegex)(envStatement) + '\\b';
                 // Security check
                 {
-                    const isPrivate = !envName.startsWith(PUBLIC_ENV_PREFIX) && !PUBLIC_ENV_WHITELIST.includes(envName);
+                    const isPrivate = !envName.startsWith(PUBLIC_ENV_PREFIX) && !PUBLIC_ENV_ALLOWLIST.includes(envName);
                     if (isPrivate && isClientSide) {
-                        if (!envStatementRegEx.test(code))
+                        if (!new RegExp(envStatementRegExStr).test(code))
                             return;
                         const modulePath = (0, getFilePath_js_1.getModuleFilePathAbsolute)(id, config);
                         const errMsgAddendum = isBuild ? '' : ' (Vike will prevent your app from building for production)';
@@ -72,16 +76,21 @@ function envVarsPlugin() {
                     (0, utils_js_1.assert)(!(isPrivate && isClientSide) || !isBuild);
                 }
                 // Apply
-                code = applyEnvVar(envStatementRegEx, envVal, code);
+                applyEnvVar(s, envStatementRegExStr, envVal);
             });
-            // Line numbers didn't change.
-            //  - We only break the column number of a couple of lines, wich is acceptable.
-            //  - Anyways, I'm not even sure Vite supports high-resolution column number source mapping.
-            const ret = (0, rollupSourceMap_js_1.sourceMapPassthrough)(code);
-            return ret;
+            if (!s.hasChanged())
+                return null;
+            return {
+                code: s.toString(),
+                map: s.generateMap({ hires: true, source: id })
+            };
         }
     };
 }
-function applyEnvVar(envStatementRegEx, envVal, code) {
-    return code.replace(envStatementRegEx, JSON.stringify(envVal));
+function applyEnvVar(s, envStatementRegExStr, envVal) {
+    const envStatementRegEx = new RegExp(envStatementRegExStr, 'g');
+    let match;
+    while ((match = envStatementRegEx.exec(s.original))) {
+        s.overwrite(match.index, match.index + match[0].length, JSON.stringify(envVal));
+    }
 }

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

@@ -12,7 +12,6 @@ const virtual_files_js_1 = require("../../shared/virtual-files.js");
 const extractAssetsQuery_js_1 = require("../../shared/extractAssetsQuery.js");
 const isAsset_js_1 = require("../shared/isAsset.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
-const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const handleAssetsManifest_js_1 = require("./build/handleAssetsManifest.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
@@ -53,7 +52,7 @@ function extractAssetsPlugin() {
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
                 debugTransformResult(id, code, importStatements);
-                return (0, rollupSourceMap_js_1.sourceMapRemove)(code);
+                return (0, utils_js_1.rollupSourceMapRemove)(code);
             }
         },
         // This plugin appends `?extractAssets` to module IDs

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

@@ -5,7 +5,6 @@ exports.extractExportNamesPlugin = extractExportNamesPlugin;
 exports.isUsingClientRouter = isUsingClientRouter;
 const utils_js_1 = require("../utils.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
-const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
 const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
@@ -42,7 +41,7 @@ async function getExtractExportNamesCode(src, isClientSide, isProduction, id) {
         globalObject.usesClientRouter = true;
     }
     const code = getCode(exportNames, wildcardReExports, isClientSide, isProduction, id);
-    return (0, rollupSourceMap_js_1.sourceMapRemove)(code);
+    return (0, utils_js_1.rollupSourceMapRemove)(code);
 }
 function getCode(exportNames, wildcardReExports, isClientSide, isProduction, id) {
     let code = '';

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

@@ -9,7 +9,6 @@ const extractAssetsPlugin_js_1 = require("./extractAssetsPlugin.js");
 const extractExportNamesPlugin_js_1 = require("./extractExportNamesPlugin.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const getFilePath_js_1 = require("../shared/getFilePath.js");
-const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
@@ -54,7 +53,7 @@ function fileEnv() {
             const errMsg = getErrorMessage(id, isServerSide, importers, false, true);
             // We have to inject empty exports to avoid Rollup complaining about missing exports, see https://gist.github.com/brillout/5ea45776e65bd65100a52ecd7bfda3ff
             const { exportNames } = await (0, parseEsModule_js_1.getExportNames)(code);
-            return (0, rollupSourceMap_js_1.sourceMapRemove)([
+            return (0, utils_js_1.rollupSourceMapRemove)([
                 `throw new Error(${JSON.stringify(errMsg)});`,
                 ...exportNames.map((name) => name === 'default' ? 'export default undefined;' : `export const ${name} = undefined;`)
             ].join('\n'));

package/dist/cjs/node/plugin/utils.js

@@ -45,3 +45,4 @@ __exportStar(require("../../utils/PROJECT_VERSION.js"), exports);
 __exportStar(require("../../utils/isEqualStringList.js"), exports);
 __exportStar(require("../../utils/isDocker.js"), exports);
 __exportStar(require("../../utils/isVitest.js"), exports);
+__exportStar(require("../../utils/rollupSourceMap.js"), exports);

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

@@ -72,7 +72,7 @@ async function getPageContextFromHook(onBeforeRouteHook, pageContext) {
     if ((0, utils_js_1.hasProp)(hookReturn.pageContext, 'urlLogical')) {
         (0, utils_js_1.assertUsageUrlPathnameAbsolute)(
         // We skip validation and type-cast instead of assertUsage() in order to save client-side KBs
-        hookReturn.pageContext.urlLogical, `${errPrefix} returned ${picocolors_1.default.cyan('{ pageContext: { urlLogical } }')} but ${picocolors_1.default.cyan('urlLogical')}`);
+        hookReturn.pageContext.urlLogical, `${errPrefix} returned ${picocolors_1.default.cyan('{ pageContext: { urlLogical } }')} and ${picocolors_1.default.cyan('urlLogical')}`);
     }
     (0, assertPageContextProvidedByUser_js_1.assertPageContextProvidedByUser)(hookReturn.pageContext, {
         hookFilePath: onBeforeRouteHook.hookFilePath,

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.227-commit-68a216b';
+exports.PROJECT_VERSION = '0.4.227-commit-e36b916';

package/dist/cjs/utils/isScriptFile.js

@@ -8,12 +8,12 @@ const assert_js_1 = require("./assert.js");
 // We can't use a RegExp:
 //  - Needs to work with Micromatch: https://github.com/micromatch/micromatch because:
 //    - Vite's `import.meta.glob()` uses Micromatch
-//  - We need this to be a whitelist because:
+//  - We need this to be a allowlist because:
 //   - A pattern `*([a-zA-Z0-9]` doesn't work.
 //     - Because of ReScript: `.res` are ReScript source files which need to be ignored. (The ReScript compiler generates `.js` files alongside `.res` files.)
-//   - Black listing doesn't work.
-//     - We cannot implement a blacklist with a glob pattern.
-//     - A post `import.meta.glob()` blacklist filtering doesn't work because Vite would still process the files (e.g. including them in the bundle).
+//   - Block listing doesn't work.
+//     - We cannot implement a blocklist with a glob pattern.
+//     - A post `import.meta.glob()` blocklist filtering doesn't work because Vite would still process the files (e.g. including them in the bundle).
 // prettier-ignore
 // biome-ignore format:
 const extJavaScript = [

package/dist/cjs/utils/parseUrl.js

@@ -186,14 +186,14 @@ function parseProtocol(uri) {
     return { protocol, uriWithoutProtocol };
 }
 function isUrlProtocol(protocol) {
-    // Is there an altenrative to having a blacklist?
-    // - If the blacklist becomes too big, maybe use a whitelist instead ['tauri://', 'file://', 'capacitor://', 'http://', 'https://']
-    const blacklist = [
+    // Is there an alternative to having a blocklist?
+    // - If the blocklist becomes too big, maybe use a allowlist instead ['tauri://', 'file://', 'capacitor://', 'http://', 'https://']
+    const blocklist = [
         // https://docs.ipfs.tech/how-to/address-ipfs-on-web
         'ipfs://',
         'ipns://'
     ];
-    if (blacklist.includes(protocol))
+    if (blocklist.includes(protocol))
         return false;
     return protocol.endsWith('://');
 }

package/dist/cjs/{node/plugin/shared → utils}/rollupSourceMap.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sourceMapRemove = sourceMapRemove;
-exports.sourceMapPassthrough = sourceMapPassthrough;
+exports.rollupSourceMapRemove = rollupSourceMapRemove;
+exports.rollupSourceMapPassthrough = rollupSourceMapPassthrough;
 // https://rollupjs.org/guide/en/#source-code-transformations
 /** Remove entire source mapping, to save KBs. */
-function sourceMapRemove(code) {
+function rollupSourceMapRemove(code) {
     return {
         code,
         map: { mappings: '' }
     };
 }
 /** Don't provide any source map, pass through current source map instead. */
-function sourceMapPassthrough(code) {
+function rollupSourceMapPassthrough(code) {
     return {
         code,
         map: null

package/dist/esm/node/plugin/plugins/build/pluginModuleBanner.js

@@ -1,29 +1,40 @@
 export { pluginModuleBanner };
+import MagicString from 'magic-string';
 import { assert } from '../../utils.js';
 import { removeVirtualIdTag } from '../../../shared/virtual-files.js';
 import { isViteServerBuild, isViteServerBuild_safe } from '../../shared/isViteServerBuild.js';
-import { sourceMapPassthrough } from '../../shared/rollupSourceMap.js';
 // Rollup's banner feature doesn't work with Vite: https://github.com/vitejs/vite/issues/8412
 // But, anyways, we want to prepend the banner at the beginning of each module, not at the beginning of each file (I believe that's what Rollup's banner feature does).
 const vikeModuleBannerPlaceholder = 'vikeModuleBannerPlaceholder';
 function pluginModuleBanner() {
     let config;
+    let disabled = false;
     return {
         name: 'vike:pluginModuleBanner',
         enforce: 'post',
         apply: 'build',
         configResolved(config_) {
             config = config_;
+            if (config.build.minify && config.build.minify !== 'esbuild') {
+                // Doesn't work upon `config.build.minify === 'terser'`
+                // https://github.com/vikejs/vike/issues/2315
+                disabled = true;
+            }
         },
         generateBundle: {
             order: 'post',
             handler(_options, bundle) {
+                if (disabled)
+                    return;
                 for (const module of Object.values(bundle)) {
                     if (module.type === 'chunk') {
                         if (isViteServerBuild(config)) {
                             const codeOld = module.code;
                             const codeNew = codeOld.replace(/vikeModuleBannerPlaceholder\("([^"]*)"\);/g, '/* $1 [vike:pluginModuleBanner] */');
-                            assert(!codeNew.includes(vikeModuleBannerPlaceholder));
+                            if (codeNew.includes(vikeModuleBannerPlaceholder)) {
+                                console.log('codeNew', codeNew);
+                                assert(false);
+                            }
                             module.code = codeNew;
                         }
                         else {
@@ -36,6 +47,8 @@ function pluginModuleBanner() {
         transform: {
             order: 'post',
             handler(code, id, options) {
+                if (disabled)
+                    return;
                 if (!isViteServerBuild_safe(config, options))
                     return;
                 if (id.startsWith('\0'))
@@ -43,9 +56,13 @@ function pluginModuleBanner() {
                 id = removeVirtualIdTag(id);
                 if (id.startsWith(config.root))
                     id = id.slice(config.root.length + 1);
+                const s = new MagicString(code);
                 // No need to insert a new line; Rollup formats the code and will insert a new line.
-                const codeNew = `${vikeModuleBannerPlaceholder}(${JSON.stringify(id)}); ${code}`;
-                return sourceMapPassthrough(codeNew);
+                s.prepend(`${vikeModuleBannerPlaceholder}(${JSON.stringify(id)}); `);
+                return {
+                    code: s.toString(),
+                    map: s.generateMap({ hires: true, source: id })
+                };
             }
         }
     };

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

@@ -1,7 +1,7 @@
 export { envVarsPlugin };
+import MagicString from 'magic-string';
 import { loadEnv } from 'vite';
 import { assert, assertPosixPath, assertUsage, assertWarning, escapeRegex, isArray, lowerFirst } from '../utils.js';
-import { sourceMapPassthrough } from '../shared/rollupSourceMap.js';
 import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isViteServerBuild_safe } from '../shared/isViteServerBuild.js';
@@ -10,7 +10,7 @@ import { isViteServerBuild_safe } from '../shared/isViteServerBuild.js';
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
 //   - Or stop using Vite's `mode` implemention and have Vike implement its own `mode` feature? (So that the only dependencies are `$ vike build --mode staging` and `$ MODE=staging vike build`.)
 const PUBLIC_ENV_PREFIX = 'PUBLIC_ENV__';
-const PUBLIC_ENV_WHITELIST = [
+const PUBLIC_ENV_ALLOWLIST = [
     // https://github.com/vikejs/vike/issues/1724
     'STORYBOOK'
 ];
@@ -38,6 +38,7 @@ function envVarsPlugin() {
                 return;
             const isBuild = config.command === 'build';
             const isClientSide = !isViteServerBuild_safe(config, options);
+            const s = new MagicString(code);
             Object.entries(envsAll)
                 .filter(([key]) => {
                 // Already handled by Vite
@@ -46,12 +47,12 @@ function envVarsPlugin() {
             })
                 .forEach(([envName, envVal]) => {
                 const envStatement = `import.meta.env.${envName}`;
-                const envStatementRegEx = new RegExp(escapeRegex(envStatement) + '\\b', 'g');
+                const envStatementRegExStr = escapeRegex(envStatement) + '\\b';
                 // Security check
                 {
-                    const isPrivate = !envName.startsWith(PUBLIC_ENV_PREFIX) && !PUBLIC_ENV_WHITELIST.includes(envName);
+                    const isPrivate = !envName.startsWith(PUBLIC_ENV_PREFIX) && !PUBLIC_ENV_ALLOWLIST.includes(envName);
                     if (isPrivate && isClientSide) {
-                        if (!envStatementRegEx.test(code))
+                        if (!new RegExp(envStatementRegExStr).test(code))
                             return;
                         const modulePath = getModuleFilePathAbsolute(id, config);
                         const errMsgAddendum = isBuild ? '' : ' (Vike will prevent your app from building for production)';
@@ -70,16 +71,21 @@ function envVarsPlugin() {
                     assert(!(isPrivate && isClientSide) || !isBuild);
                 }
                 // Apply
-                code = applyEnvVar(envStatementRegEx, envVal, code);
+                applyEnvVar(s, envStatementRegExStr, envVal);
             });
-            // Line numbers didn't change.
-            //  - We only break the column number of a couple of lines, wich is acceptable.
-            //  - Anyways, I'm not even sure Vite supports high-resolution column number source mapping.
-            const ret = sourceMapPassthrough(code);
-            return ret;
+            if (!s.hasChanged())
+                return null;
+            return {
+                code: s.toString(),
+                map: s.generateMap({ hires: true, source: id })
+            };
         }
     };
 }
-function applyEnvVar(envStatementRegEx, envVal, code) {
-    return code.replace(envStatementRegEx, JSON.stringify(envVal));
+function applyEnvVar(s, envStatementRegExStr, envVal) {
+    const envStatementRegEx = new RegExp(envStatementRegExStr, 'g');
+    let match;
+    while ((match = envStatementRegEx.exec(s.original))) {
+        s.overwrite(match.index, match.index + match[0].length, JSON.stringify(envVal));
+    }
 }

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

@@ -6,12 +6,11 @@
 //  - This appraoch supports import path aliases `vite.config.js#resolve.alias` https://vitejs.dev/config/#resolve-alias
 export { extractAssetsPlugin };
 export { extractAssetsRE };
-import { assert, assertPosixPath, styleFileRE, createDebugger, isScriptFile, assertUsage } from '../utils.js';
+import { assert, assertPosixPath, styleFileRE, createDebugger, isScriptFile, assertUsage, rollupSourceMapRemove } from '../utils.js';
 import { resolveVirtualFileId, isVirtualFileId, getVirtualFileId } from '../../shared/virtual-files.js';
 import { extractAssetsAddQuery } from '../../shared/extractAssetsQuery.js';
 import { isAsset } from '../shared/isAsset.js';
 import { getImportStatements } from '../shared/parseEsModule.js';
-import { sourceMapRemove } from '../shared/rollupSourceMap.js';
 import pc from '@brillout/picocolors';
 import { handleAssetsManifest_isFixEnabled } from './build/handleAssetsManifest.js';
 import { getVikeConfig } from './importUserCode/v1-design/getVikeConfig.js';
@@ -51,7 +50,7 @@ function extractAssetsPlugin() {
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
                 debugTransformResult(id, code, importStatements);
-                return sourceMapRemove(code);
+                return rollupSourceMapRemove(code);
             }
         },
         // This plugin appends `?extractAssets` to module IDs

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

@@ -1,9 +1,8 @@
 export { extractExportNamesPlugin };
 export { isUsingClientRouter };
 export { extractExportNamesRE };
-import { assert, getFileExtension, createDebugger, getGlobalObject, assertUsage } from '../utils.js';
+import { assert, getFileExtension, createDebugger, getGlobalObject, assertUsage, rollupSourceMapRemove } from '../utils.js';
 import { getExportNames } from '../shared/parseEsModule.js';
-import { sourceMapRemove } from '../shared/rollupSourceMap.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isViteServerBuild_options } from '../shared/isViteServerBuild.js';
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
@@ -39,7 +38,7 @@ async function getExtractExportNamesCode(src, isClientSide, isProduction, id) {
         globalObject.usesClientRouter = true;
     }
     const code = getCode(exportNames, wildcardReExports, isClientSide, isProduction, id);
-    return sourceMapRemove(code);
+    return rollupSourceMapRemove(code);
 }
 function getCode(exportNames, wildcardReExports, isClientSide, isProduction, id) {
     let code = '';

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

@@ -1,10 +1,9 @@
 export { fileEnv };
-import { assert, assertUsage, assertWarning, capitalizeFirstLetter, joinEnglish } from '../utils.js';
+import { assert, assertUsage, assertWarning, capitalizeFirstLetter, joinEnglish, rollupSourceMapRemove } from '../utils.js';
 import { extractAssetsRE } from './extractAssetsPlugin.js';
 import { extractExportNamesRE } from './extractExportNamesPlugin.js';
 import pc from '@brillout/picocolors';
 import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
-import { sourceMapRemove } from '../shared/rollupSourceMap.js';
 import { getExportNames } from '../shared/parseEsModule.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
@@ -49,7 +48,7 @@ function fileEnv() {
             const errMsg = getErrorMessage(id, isServerSide, importers, false, true);
             // We have to inject empty exports to avoid Rollup complaining about missing exports, see https://gist.github.com/brillout/5ea45776e65bd65100a52ecd7bfda3ff
             const { exportNames } = await getExportNames(code);
-            return sourceMapRemove([
+            return rollupSourceMapRemove([
                 `throw new Error(${JSON.stringify(errMsg)});`,
                 ...exportNames.map((name) => name === 'default' ? 'export default undefined;' : `export const ${name} = undefined;`)
             ].join('\n'));

package/dist/esm/node/plugin/utils.d.ts

@@ -23,3 +23,4 @@ export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/isEqualStringList.js';
 export * from '../../utils/isDocker.js';
 export * from '../../utils/isVitest.js';
+export * from '../../utils/rollupSourceMap.js';

package/dist/esm/node/plugin/utils.js

@@ -29,3 +29,4 @@ export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/isEqualStringList.js';
 export * from '../../utils/isDocker.js';
 export * from '../../utils/isVitest.js';
+export * from '../../utils/rollupSourceMap.js';

package/dist/esm/shared/route/executeOnBeforeRouteHook.js

@@ -67,7 +67,7 @@ async function getPageContextFromHook(onBeforeRouteHook, pageContext) {
     if (hasProp(hookReturn.pageContext, 'urlLogical')) {
         assertUsageUrlPathnameAbsolute(
         // We skip validation and type-cast instead of assertUsage() in order to save client-side KBs
-        hookReturn.pageContext.urlLogical, `${errPrefix} returned ${pc.cyan('{ pageContext: { urlLogical } }')} but ${pc.cyan('urlLogical')}`);
+        hookReturn.pageContext.urlLogical, `${errPrefix} returned ${pc.cyan('{ pageContext: { urlLogical } }')} and ${pc.cyan('urlLogical')}`);
     }
     assertPageContextProvidedByUser(hookReturn.pageContext, {
         hookFilePath: onBeforeRouteHook.hookFilePath,

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.227-commit-68a216b";
+export declare const PROJECT_VERSION: "0.4.227-commit-e36b916";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.227-commit-68a216b';
+export const PROJECT_VERSION = '0.4.227-commit-e36b916';

package/dist/esm/utils/isScriptFile.js

@@ -7,12 +7,12 @@ import { assert } from './assert.js';
 // We can't use a RegExp:
 //  - Needs to work with Micromatch: https://github.com/micromatch/micromatch because:
 //    - Vite's `import.meta.glob()` uses Micromatch
-//  - We need this to be a whitelist because:
+//  - We need this to be a allowlist because:
 //   - A pattern `*([a-zA-Z0-9]` doesn't work.
 //     - Because of ReScript: `.res` are ReScript source files which need to be ignored. (The ReScript compiler generates `.js` files alongside `.res` files.)
-//   - Black listing doesn't work.
-//     - We cannot implement a blacklist with a glob pattern.
-//     - A post `import.meta.glob()` blacklist filtering doesn't work because Vite would still process the files (e.g. including them in the bundle).
+//   - Block listing doesn't work.
+//     - We cannot implement a blocklist with a glob pattern.
+//     - A post `import.meta.glob()` blocklist filtering doesn't work because Vite would still process the files (e.g. including them in the bundle).
 // prettier-ignore
 // biome-ignore format:
 const extJavaScript = [

package/dist/esm/utils/parseUrl.js

@@ -182,14 +182,14 @@ function parseProtocol(uri) {
     return { protocol, uriWithoutProtocol };
 }
 function isUrlProtocol(protocol) {
-    // Is there an altenrative to having a blacklist?
-    // - If the blacklist becomes too big, maybe use a whitelist instead ['tauri://', 'file://', 'capacitor://', 'http://', 'https://']
-    const blacklist = [
+    // Is there an alternative to having a blocklist?
+    // - If the blocklist becomes too big, maybe use a allowlist instead ['tauri://', 'file://', 'capacitor://', 'http://', 'https://']
+    const blocklist = [
         // https://docs.ipfs.tech/how-to/address-ipfs-on-web
         'ipfs://',
         'ipns://'
     ];
-    if (blacklist.includes(protocol))
+    if (blocklist.includes(protocol))
         return false;
     return protocol.endsWith('://');
 }

package/dist/esm/{node/plugin/shared → utils}/rollupSourceMap.d.ts

@@ -1,14 +1,14 @@
-export { sourceMapRemove };
-export { sourceMapPassthrough };
+export { rollupSourceMapRemove };
+export { rollupSourceMapPassthrough };
 /** Remove entire source mapping, to save KBs. */
-declare function sourceMapRemove(code: string): {
+declare function rollupSourceMapRemove(code: string): {
     code: string;
     map: {
         mappings: '';
     };
 };
 /** Don't provide any source map, pass through current source map instead. */
-declare function sourceMapPassthrough(code: string): {
+declare function rollupSourceMapPassthrough(code: string): {
     code: string;
     map: null;
 };

package/dist/esm/{node/plugin/shared → utils}/rollupSourceMap.js

@@ -1,15 +1,15 @@
-export { sourceMapRemove };
-export { sourceMapPassthrough };
+export { rollupSourceMapRemove };
+export { rollupSourceMapPassthrough };
 // https://rollupjs.org/guide/en/#source-code-transformations
 /** Remove entire source mapping, to save KBs. */
-function sourceMapRemove(code) {
+function rollupSourceMapRemove(code) {
     return {
         code,
         map: { mappings: '' }
     };
 }
 /** Don't provide any source map, pass through current source map instead. */
-function sourceMapPassthrough(code) {
+function rollupSourceMapPassthrough(code) {
     return {
         code,
         map: null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.227-commit-68a216b",
+  "version": "0.4.227-commit-e36b916",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -129,6 +129,7 @@
     "es-module-lexer": "^1.0.0",
     "esbuild": "^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0",
     "json5": "^2.0.0",
+    "magic-string": "^0.30.17",
     "picomatch": "^4.0.2",
     "semver": "^7.0.0",
     "sirv": "^3.0.1",