vike 0.4.228-commit-1bb55f1 → 0.4.229-commit-2a06dcc

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

@@ -28,6 +28,7 @@ const getPageAssets_js_1 = require("../runtime/renderPage/getPageAssets.js");
 const resolveClientEntriesDev_js_1 = require("./shared/resolveClientEntriesDev.js");
 const workaroundCssModuleHmr_js_1 = require("./plugins/workaroundCssModuleHmr.js");
 const workaroundVite6HmrRegression_js_1 = require("./plugins/workaroundVite6HmrRegression.js");
+const replaceConstants_js_1 = require("./plugins/replaceConstants.js");
 // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
 (0, getPageAssets_js_1.setResolveClientEntriesDev)(resolveClientEntriesDev_js_1.resolveClientEntriesDev);
 // Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
@@ -45,7 +46,8 @@ function plugin(vikeVitePluginOptions = {}) {
         (0, envVars_js_1.envVarsPlugin)(),
         (0, fileEnv_js_1.fileEnv)(),
         (0, workaroundCssModuleHmr_js_1.workaroundCssModuleHmr)(),
-        (0, workaroundVite6HmrRegression_js_1.workaroundVite6HmrRegression)()
+        (0, workaroundVite6HmrRegression_js_1.workaroundVite6HmrRegression)(),
+        (0, replaceConstants_js_1.replaceConstants)()
     ];
     Object.assign(plugins, { __vikeVitePluginOptions: vikeVitePluginOptions });
     return plugins;

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

@@ -32,14 +32,14 @@ function pluginModuleBanner() {
                 if (id.startsWith(config.root))
                     id = id.slice(config.root.length + 1);
                 id = id.replaceAll('*/', '*\\/'); // https://github.com/vikejs/vike/issues/2377
-                const s = new magic_string_1.default(code);
+                const magicString = new magic_string_1.default(code);
                 // Use legal comment so that esbuild doesn't remove it.
                 // - Terser still removes the comment, but I guess users use terser to minify JavaScript so I guess it's a good thing that comment is removed.
                 // - https://esbuild.github.io/api/#legal-comments
-                s.prepend(`/*! ${id} [vike:pluginModuleBanner] */\n`);
+                magicString.prepend(`/*! ${id} [vike:pluginModuleBanner] */\n`);
                 return {
-                    code: s.toString(),
-                    map: s.generateMap({ hires: true, source: id })
+                    code: magicString.toString(),
+                    map: magicString.generateMap({ hires: true, source: id })
                 };
             }
         }

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

@@ -57,6 +57,11 @@ async function getPageDeps(config, pageConfigs) {
                         return;
                     if (definedAt.definedBy)
                         return;
+                    if (definedAt.importPathAbsolute) {
+                        const npmPackageName = (0, utils_js_1.getNpmPackageName)(definedAt.importPathAbsolute);
+                        if (npmPackageName && config.optimizeDeps.exclude?.includes(npmPackageName))
+                            return;
+                    }
                     if (definedAt.filePathAbsoluteUserRootDir !== null) {
                         // Vite expects entries to be filesystem absolute paths (surprisingly so).
                         addEntry(definedAt.filePathAbsoluteFilesystem);

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

@@ -10,7 +10,8 @@ const utils_js_1 = require("../utils.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");
-// TODO/enventually: (after we implemented vike.config.js)
+const applyRegExWithMagicString_js_1 = require("../shared/applyRegExWithMagicString.js");
+// TODO/enventually:
 // - Make import.meta.env work inside +config.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`.)
@@ -27,7 +28,6 @@ function envVarsPlugin() {
         enforce: 'post',
         configResolved(config_) {
             config = config_;
-            config.command;
             envsAll = (0, vite_1.loadEnv)(config.mode, config.envDir || config.root, '');
             config.plugins.sort((0, utils_js_1.lowerFirst)((plugin) => (plugin.name === 'vite:define' ? 1 : 0)));
         },
@@ -43,21 +43,22 @@ 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)
+            const magicString = new magic_string_1.default(code);
+            // Find & check
+            const replacements = Object.entries(envsAll)
                 .filter(([key]) => {
                 // Already handled by Vite
                 const envPrefix = !config.envPrefix ? [] : (0, utils_js_1.isArray)(config.envPrefix) ? config.envPrefix : [config.envPrefix];
                 return !envPrefix.some((prefix) => key.startsWith(prefix));
             })
-                .forEach(([envName, envVal]) => {
+                .map(([envName, envVal]) => {
                 const envStatement = `import.meta.env.${envName}`;
-                const envStatementRegExStr = (0, utils_js_1.escapeRegex)(envStatement) + '\\b';
+                const envStatementRegExpStr = (0, utils_js_1.escapeRegex)(envStatement) + '\\b';
                 // Security check
                 {
                     const isPrivate = !envName.startsWith(PUBLIC_ENV_PREFIX) && !PUBLIC_ENV_ALLOWLIST.includes(envName);
                     if (isPrivate && isClientSide) {
-                        if (!new RegExp(envStatementRegExStr).test(code))
+                        if (!new RegExp(envStatementRegExpStr).test(code))
                             return;
                         const modulePath = (0, getFilePath_js_1.getModuleFilePathAbsolute)(id, config);
                         const errMsgAddendum = isBuild ? '' : ' (Vike will prevent your app from building for production)';
@@ -75,22 +76,19 @@ function envVarsPlugin() {
                     // Double check
                     (0, utils_js_1.assert)(!(isPrivate && isClientSide) || !isBuild);
                 }
-                // Apply
-                applyEnvVar(s, envStatementRegExStr, envVal);
+                return { regExpStr: envStatementRegExpStr, replacement: envVal };
+            })
+                .filter(utils_js_1.isNotNullish);
+            // Apply
+            replacements.forEach(({ regExpStr, replacement }) => {
+                (0, applyRegExWithMagicString_js_1.applyRegExpWithMagicString)(magicString, regExpStr, replacement);
             });
-            if (!s.hasChanged())
+            if (!magicString.hasChanged())
                 return null;
             return {
-                code: s.toString(),
-                map: s.generateMap({ hires: true, source: id })
+                code: magicString.toString(),
+                map: magicString.generateMap({ hires: true, source: id })
             };
         }
     };
 }
-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/importUserCode/getVirtualFileImportUserCode.js

@@ -179,7 +179,9 @@ function getGlobRoots(config) {
 }
 function getGlobPath(globRootDir, fileType) {
     (0, utils_js_1.assertPosixPath)(globRootDir);
-    let globPath = [...globRootDir.split('/'), '**', `*${fileType}.${utils_js_1.scriptFileExtensions}`].filter(Boolean).join('/');
+    let globPath = [...globRootDir.split('/'), '**', `*${fileType}.${utils_js_1.scriptFileExtensionPattern}`]
+        .filter(Boolean)
+        .join('/');
     if (!globPath.startsWith('/')) {
         globPath = '/' + globPath;
     }

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

@@ -21,6 +21,7 @@ const configDefinitionsBuiltIn = {
     },
     onCreatePageContext: {
         env: { server: true, client: true },
+        // Required because `onCreatePageContext()` is called before routing
         global: true,
         cumulative: true
     },

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

@@ -120,7 +120,7 @@ async function gitLsFiles(userRootDir, ignorePatterns, ignoreMatchers) {
 }
 // Same as gitLsFiles() but using tinyglobby
 async function tinyglobby(userRootDir, ignorePatterns) {
-    const pattern = `**/+*.${utils_js_1.scriptFileExtensions}`;
+    const pattern = `**/+*.${utils_js_1.scriptFileExtensionPattern}`;
     const options = {
         ignore: ignorePatterns,
         cwd: userRootDir,

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

@@ -31,7 +31,7 @@ async function transpileAndExecuteFile(filePath, userRootDir, isExtensionConfig,
     }
     const { promise, resolve } = (0, utils_js_1.genPromise)();
     esbuildCache.transpileCache[filePathAbsoluteFilesystem] = promise;
-    (0, utils_js_1.assertUsage)((0, utils_js_1.isPlainJavaScriptFile)(filePathAbsoluteFilesystem), `${filePathToShowToUserResolved} has file extension .${fileExtension} but a config file can only be a JavaScript/TypeScript file`);
+    (0, utils_js_1.assertUsage)((0, utils_js_1.isPlainScriptFile)(filePathAbsoluteFilesystem), `${filePathToShowToUserResolved} has file extension .${fileExtension} but a config file can only be a JavaScript/TypeScript file`);
     const isHeader = isHeaderFile(filePathAbsoluteFilesystem);
     if (isHeader) {
         (0, utils_js_1.assertWarning)(false, `${picocolors_1.default.cyan('.h.js')} files are deprecated: simply renaming ${filePathToShowToUserResolved} to ${removeHeaderFileExtension(filePathToShowToUserResolved)} is usually enough, although you may occasionally need to use ${picocolors_1.default.cyan("with { type: 'pointer' }")} as explained at https://vike.dev/config#pointer-imports`, { onlyOnce: true });
@@ -157,7 +157,7 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                     const isVikeExtensionImport = (path.startsWith('vike-') && path.endsWith('/config')) || importPathResolved.endsWith('+config.js');
                     const isPointerImport = transformImports === 'all' ||
                         // .jsx, .vue, .svg, ... => obviously not config code => pointer import
-                        !(0, utils_js_1.isPlainJavaScriptFile)(importPathResolved) ||
+                        !(0, utils_js_1.isPlainScriptFile)(importPathResolved) ||
                         // Import of a Vike extension config => make it a pointer import because we want to show nice error messages (that can display whether a config has been set by the user or by a Vike extension).
                         //  - Should we stop doing this? (And instead let Node.js directly load Vike extensions.)
                         //    - In principle, we can use the setting 'name' value of Vike extensions.

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

@@ -0,0 +1,76 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.replaceConstants = replaceConstants;
+const magic_string_1 = __importDefault(require("magic-string"));
+const utils_js_1 = require("../utils.js");
+const normalizeId_js_1 = require("../shared/normalizeId.js");
+const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
+const applyRegExWithMagicString_js_1 = require("../shared/applyRegExWithMagicString.js");
+function replaceConstants() {
+    let config;
+    return {
+        name: 'vike:replaceConstants',
+        enforce: 'post',
+        apply: 'build',
+        configResolved(config_) {
+            config = config_;
+        },
+        transform(code, id, options) {
+            id = (0, normalizeId_js_1.normalizeId)(id);
+            (0, utils_js_1.assertPosixPath)(id);
+            if (id.includes('/node_modules/'))
+                return;
+            (0, utils_js_1.assertPosixPath)(config.root);
+            if (!id.startsWith(config.root))
+                return;
+            if (!code.includes('import.meta.env.'))
+                return;
+            const isBuild = config.command === 'build';
+            (0, utils_js_1.assert)(isBuild);
+            // Used by vike.dev
+            // https://github.com/vikejs/vike/blob/08a1ff55c80ddca64ca6d4417fefd45fefeb4ffb/docs/vite.config.ts#L12
+            // @ts-expect-error
+            if (config._skipVikeReplaceConstants?.(id))
+                return;
+            const magicString = new magic_string_1.default(code);
+            const constantsMap = [];
+            constantsMap.push({
+                constants: ['pageContext.isClientSide', 'globalContext.isClientSide', 'pageContext.globalContext.isClientSide'],
+                replacement: !(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options)
+            });
+            constantsMap.forEach(({ constants, replacement }) => {
+                if (!constants.some((c) => code.includes(c)))
+                    return;
+                const regExp = getConstantRegExp(constants);
+                (0, applyRegExWithMagicString_js_1.applyRegExpWithMagicString)(magicString, regExp, replacement);
+            });
+            if (!magicString.hasChanged())
+                return null;
+            return {
+                code: magicString.toString(),
+                map: magicString.generateMap({ hires: true, source: id })
+            };
+        }
+    };
+}
+// Copied & adapted from:
+// https://github.com/rollup/plugins/blob/e1a5ef99f1578eb38a8c87563cb9651db228f3bd/packages/replace/src/index.js#L57-L67
+function getConstantRegExp(constants) {
+    const keys = Object.values(constants).sort(longest).map(escape);
+    // const delimiters = ['\\b', '\\b(?!\\.)']
+    const delimiters = ['(?<!\\.)\\b', '\\b(?!\\.)']; // Improved version, to avoid replacing `globalContext.pageContext.isClientSide` with `globalContext.false`
+    const preventAssignment = false; // Let's try without it first, let's see if a user complains
+    const lookbehind = preventAssignment ? '(?<!\\b(?:const|let|var)\\s*)' : '';
+    const lookahead = preventAssignment ? '(?!\\s*=[^=])' : '';
+    const pattern = new RegExp(`${lookbehind}${delimiters[0]}(${keys.join('|')})${delimiters[1]}${lookahead}`, 'g');
+    return pattern;
+}
+function escape(str) {
+    return str.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&');
+}
+function longest(a, b) {
+    return b.length - a.length;
+}

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

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyRegExpWithMagicString = applyRegExpWithMagicString;
+function applyRegExpWithMagicString(magicString, regExp, replacement) {
+    const envStatementRegEx = typeof regExp === 'string' ? new RegExp(regExp, 'g') : regExp;
+    let match;
+    while ((match = envStatementRegEx.exec(magicString.original))) {
+        magicString.overwrite(match.index, match.index + match[0].length, JSON.stringify(replacement));
+    }
+}

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

@@ -12,7 +12,7 @@ async function findPageFiles(config, fileTypes, isDev) {
     const cwd = config.root;
     const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config);
     const timeBase = new Date().getTime();
-    let pageFiles = await (0, tinyglobby_1.glob)(fileTypes.map((fileType) => `**/*${fileType}.${utils_js_1.scriptFileExtensions}`), { ignore: ['**/node_modules/**', `${outDirRoot}/**`], cwd, dot: false, expandDirectories: false });
+    let pageFiles = await (0, tinyglobby_1.glob)(fileTypes.map((fileType) => `**/*${fileType}.${utils_js_1.scriptFileExtensionPattern}`), { ignore: ['**/node_modules/**', `${outDirRoot}/**`], cwd, dot: false, expandDirectories: false });
     pageFiles = pageFiles.map((p) => '/' + (0, utils_js_1.toPosixPath)(p));
     const time = new Date().getTime() - timeBase;
     if (isDev) {

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

@@ -76,7 +76,13 @@ async function renderHtmlStream(streamOriginal, injectString, pageContext, onErr
             return injectAtStreamAfterFirstChunk();
         };
     }
+    let makeClosableAgain = () => { };
+    if ((0, react_streaming_js_1.isStreamFromReactStreamingPackage)(streamOriginal)) {
+        // Make sure Vike injects its HTML fragments, such as `<script id="vike_pageContext" type="application/json">`, before the stream is closed
+        makeClosableAgain = streamOriginal.doNotClose();
+    }
     const streamWrapper = await (0, stream_js_1.processStream)(streamOriginal, processStreamOptions);
+    makeClosableAgain();
     return streamWrapper;
 }
 function isTemplateWrapped(something) {

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.228-commit-1bb55f1';
+exports.PROJECT_VERSION = '0.4.229-commit-2a06dcc';

package/dist/cjs/utils/isScriptFile.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scriptFileExtensionList = exports.scriptFileExtensions = void 0;
+exports.scriptFileExtensionList = exports.scriptFileExtensionPattern = void 0;
 exports.isScriptFile = isScriptFile;
-exports.isPlainJavaScriptFile = isPlainJavaScriptFile;
+exports.isPlainScriptFile = isPlainScriptFile;
 exports.isTemplateFile = isTemplateFile;
-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
@@ -16,26 +15,36 @@ const assert_js_1 = require("./assert.js");
 //     - 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 = [
+const extJs = [
     'js',
-    'ts',
     'cjs',
-    'cts',
     'mjs',
+];
+// prettier-ignore
+// biome-ignore format:
+const extTs = [
+    'ts',
+    'cts',
     'mts',
 ];
+const extJsOrTs = [...extJs, ...extTs];
 // prettier-ignore
 // biome-ignore format:
 const extJsx = [
     'jsx',
-    'tsx',
     'cjsx',
-    'ctsx',
     'mjsx',
-    'mtsx',
 ];
 // prettier-ignore
 // biome-ignore format:
+const extTsx = [
+    'tsx',
+    'ctsx',
+    'mtsx'
+];
+const extJsxOrTsx = [...extJsx, ...extTsx];
+// prettier-ignore
+// biome-ignore format:
 const extTemplates = [
     'vue',
     'svelte',
@@ -43,21 +52,15 @@ const extTemplates = [
     'md',
     'mdx'
 ];
-const scriptFileExtensionList = [...extJavaScript, ...extJsx, ...extTemplates];
+const scriptFileExtensionList = [...extJsOrTs, ...extJsxOrTsx, ...extTemplates];
 exports.scriptFileExtensionList = scriptFileExtensionList;
-const scriptFileExtensions = '(' + scriptFileExtensionList.join('|') + ')';
-exports.scriptFileExtensions = scriptFileExtensions;
+const scriptFileExtensionPattern = '(' + scriptFileExtensionList.join('|') + ')';
+exports.scriptFileExtensionPattern = scriptFileExtensionPattern;
 function isScriptFile(filePath) {
-    const yes = scriptFileExtensionList.some((ext) => filePath.endsWith('.' + ext));
-    if (isPlainJavaScriptFile(filePath))
-        (0, assert_js_1.assert)(yes);
-    return yes;
+    return scriptFileExtensionList.some((ext) => filePath.endsWith('.' + ext));
 }
-function isPlainJavaScriptFile(filePath) {
-    const yes1 = /\.(c|m)?(j|t)s$/.test(filePath);
-    const yes2 = extJavaScript.some((ext) => filePath.endsWith('.' + ext));
-    (0, assert_js_1.assert)(yes1 === yes2);
-    return yes1;
+function isPlainScriptFile(filePath) {
+    return extJsOrTs.some((ext) => filePath.endsWith('.' + ext));
 }
 function isTemplateFile(filePath) {
     return extTemplates.some((ext) => filePath.endsWith('.' + ext));

package/dist/cjs/utils/parseNpmPackage.js

@@ -4,6 +4,7 @@ exports.isImportPathNpmPackage = isImportPathNpmPackage;
 exports.isImportPathNpmPackageOrPathAlias = isImportPathNpmPackageOrPathAlias;
 exports.assertIsImportPathNpmPackage = assertIsImportPathNpmPackage;
 exports.isPathAliasRecommended = isPathAliasRecommended;
+exports.getNpmPackageName = getNpmPackageName;
 exports.parseNpmPackage = parseNpmPackage;
 exports.isDistinguishable = isDistinguishable;
 const assert_js_1 = require("./assert.js");

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

@@ -21,6 +21,7 @@ import { setResolveClientEntriesDev } from '../runtime/renderPage/getPageAssets.
 import { resolveClientEntriesDev } from './shared/resolveClientEntriesDev.js';
 import { workaroundCssModuleHmr } from './plugins/workaroundCssModuleHmr.js';
 import { workaroundVite6HmrRegression } from './plugins/workaroundVite6HmrRegression.js';
+import { replaceConstants } from './plugins/replaceConstants.js';
 // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
 setResolveClientEntriesDev(resolveClientEntriesDev);
 // Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
@@ -38,7 +39,8 @@ function plugin(vikeVitePluginOptions = {}) {
         envVarsPlugin(),
         fileEnv(),
         workaroundCssModuleHmr(),
-        workaroundVite6HmrRegression()
+        workaroundVite6HmrRegression(),
+        replaceConstants()
     ];
     Object.assign(plugins, { __vikeVitePluginOptions: vikeVitePluginOptions });
     return plugins;

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

@@ -27,14 +27,14 @@ function pluginModuleBanner() {
                 if (id.startsWith(config.root))
                     id = id.slice(config.root.length + 1);
                 id = id.replaceAll('*/', '*\\/'); // https://github.com/vikejs/vike/issues/2377
-                const s = new MagicString(code);
+                const magicString = new MagicString(code);
                 // Use legal comment so that esbuild doesn't remove it.
                 // - Terser still removes the comment, but I guess users use terser to minify JavaScript so I guess it's a good thing that comment is removed.
                 // - https://esbuild.github.io/api/#legal-comments
-                s.prepend(`/*! ${id} [vike:pluginModuleBanner] */\n`);
+                magicString.prepend(`/*! ${id} [vike:pluginModuleBanner] */\n`);
                 return {
-                    code: s.toString(),
-                    map: s.generateMap({ hires: true, source: id })
+                    code: magicString.toString(),
+                    map: magicString.generateMap({ hires: true, source: id })
                 };
             }
         }

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

@@ -1,6 +1,6 @@
 export { determineOptimizeDeps };
 import { findPageFiles } from '../../shared/findPageFiles.js';
-import { assert, assertIsImportPathNpmPackage, createDebugger, isArray, unique } from '../../utils.js';
+import { assert, assertIsImportPathNpmPackage, createDebugger, getNpmPackageName, isArray, unique } from '../../utils.js';
 import { getVikeConfig, isOverriden } from '../importUserCode/v1-design/getVikeConfig.js';
 import { analyzeClientEntries } from '../build/pluginBuildConfig.js';
 import { virtualFileIdImportUserCodeClientCR, virtualFileIdImportUserCodeClientSR } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
@@ -55,6 +55,11 @@ async function getPageDeps(config, pageConfigs) {
                         return;
                     if (definedAt.definedBy)
                         return;
+                    if (definedAt.importPathAbsolute) {
+                        const npmPackageName = getNpmPackageName(definedAt.importPathAbsolute);
+                        if (npmPackageName && config.optimizeDeps.exclude?.includes(npmPackageName))
+                            return;
+                    }
                     if (definedAt.filePathAbsoluteUserRootDir !== null) {
                         // Vite expects entries to be filesystem absolute paths (surprisingly so).
                         addEntry(definedAt.filePathAbsoluteFilesystem);

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

@@ -1,11 +1,12 @@
 export { envVarsPlugin };
 import MagicString from 'magic-string';
 import { loadEnv } from 'vite';
-import { assert, assertPosixPath, assertUsage, assertWarning, escapeRegex, isArray, lowerFirst } from '../utils.js';
+import { assert, assertPosixPath, assertUsage, assertWarning, escapeRegex, isArray, isNotNullish, lowerFirst } from '../utils.js';
 import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isViteServerBuild_safe } from '../shared/isViteServerBuild.js';
-// TODO/enventually: (after we implemented vike.config.js)
+import { applyRegExpWithMagicString } from '../shared/applyRegExWithMagicString.js';
+// TODO/enventually:
 // - Make import.meta.env work inside +config.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`.)
@@ -22,7 +23,6 @@ function envVarsPlugin() {
         enforce: 'post',
         configResolved(config_) {
             config = config_;
-            config.command;
             envsAll = loadEnv(config.mode, config.envDir || config.root, '');
             config.plugins.sort(lowerFirst((plugin) => (plugin.name === 'vite:define' ? 1 : 0)));
         },
@@ -38,21 +38,22 @@ function envVarsPlugin() {
                 return;
             const isBuild = config.command === 'build';
             const isClientSide = !isViteServerBuild_safe(config, options);
-            const s = new MagicString(code);
-            Object.entries(envsAll)
+            const magicString = new MagicString(code);
+            // Find & check
+            const replacements = Object.entries(envsAll)
                 .filter(([key]) => {
                 // Already handled by Vite
                 const envPrefix = !config.envPrefix ? [] : isArray(config.envPrefix) ? config.envPrefix : [config.envPrefix];
                 return !envPrefix.some((prefix) => key.startsWith(prefix));
             })
-                .forEach(([envName, envVal]) => {
+                .map(([envName, envVal]) => {
                 const envStatement = `import.meta.env.${envName}`;
-                const envStatementRegExStr = escapeRegex(envStatement) + '\\b';
+                const envStatementRegExpStr = escapeRegex(envStatement) + '\\b';
                 // Security check
                 {
                     const isPrivate = !envName.startsWith(PUBLIC_ENV_PREFIX) && !PUBLIC_ENV_ALLOWLIST.includes(envName);
                     if (isPrivate && isClientSide) {
-                        if (!new RegExp(envStatementRegExStr).test(code))
+                        if (!new RegExp(envStatementRegExpStr).test(code))
                             return;
                         const modulePath = getModuleFilePathAbsolute(id, config);
                         const errMsgAddendum = isBuild ? '' : ' (Vike will prevent your app from building for production)';
@@ -70,22 +71,19 @@ function envVarsPlugin() {
                     // Double check
                     assert(!(isPrivate && isClientSide) || !isBuild);
                 }
-                // Apply
-                applyEnvVar(s, envStatementRegExStr, envVal);
+                return { regExpStr: envStatementRegExpStr, replacement: envVal };
+            })
+                .filter(isNotNullish);
+            // Apply
+            replacements.forEach(({ regExpStr, replacement }) => {
+                applyRegExpWithMagicString(magicString, regExpStr, replacement);
             });
-            if (!s.hasChanged())
+            if (!magicString.hasChanged())
                 return null;
             return {
-                code: s.toString(),
-                map: s.generateMap({ hires: true, source: id })
+                code: magicString.toString(),
+                map: magicString.generateMap({ hires: true, source: id })
             };
         }
     };
 }
-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/importUserCode/getVirtualFileImportUserCode.js

@@ -1,5 +1,5 @@
 export { getVirtualFileImportUserCode };
-import { assert, assertPosixPath, scriptFileExtensions, debugGlob, isVersionOrAbove, assertWarning } from '../../utils.js';
+import { assert, assertPosixPath, scriptFileExtensionPattern, debugGlob, isVersionOrAbove, assertWarning } from '../../utils.js';
 import { isVirtualFileIdImportUserCode } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
 import { version as viteVersion } from 'vite';
 import { fileTypes } from '../../../../shared/getPageFiles/fileTypes.js';
@@ -174,7 +174,9 @@ function getGlobRoots(config) {
 }
 function getGlobPath(globRootDir, fileType) {
     assertPosixPath(globRootDir);
-    let globPath = [...globRootDir.split('/'), '**', `*${fileType}.${scriptFileExtensions}`].filter(Boolean).join('/');
+    let globPath = [...globRootDir.split('/'), '**', `*${fileType}.${scriptFileExtensionPattern}`]
+        .filter(Boolean)
+        .join('/');
     if (!globPath.startsWith('/')) {
         globPath = '/' + globPath;
     }

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

@@ -19,6 +19,7 @@ const configDefinitionsBuiltIn = {
     },
     onCreatePageContext: {
         env: { server: true, client: true },
+        // Required because `onCreatePageContext()` is called before routing
         global: true,
         cumulative: true
     },

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

@@ -1,7 +1,7 @@
 export { crawlPlusFiles };
 export { isPlusFile };
 export { getPlusFileValueConfigName };
-import { assertPosixPath, assert, scriptFileExtensions, assertIsSingleModuleInstance, assertIsNotProductionRuntime, isVersionOrAbove, isScriptFile, scriptFileExtensionList, createDebugger, deepEqual, assertUsage, assertFilePathAbsoluteFilesystem, assertWarning, hasProp, isNotNullish } from '../../../../utils.js';
+import { assertPosixPath, assert, scriptFileExtensionPattern, assertIsSingleModuleInstance, assertIsNotProductionRuntime, isVersionOrAbove, isScriptFile, scriptFileExtensionList, createDebugger, deepEqual, assertUsage, assertFilePathAbsoluteFilesystem, assertWarning, hasProp, isNotNullish } from '../../../../utils.js';
 import path from 'path';
 import { glob } from 'tinyglobby';
 import { exec } from 'child_process';
@@ -115,7 +115,7 @@ async function gitLsFiles(userRootDir, ignorePatterns, ignoreMatchers) {
 }
 // Same as gitLsFiles() but using tinyglobby
 async function tinyglobby(userRootDir, ignorePatterns) {
-    const pattern = `**/+*.${scriptFileExtensions}`;
+    const pattern = `**/+*.${scriptFileExtensionPattern}`;
     const options = {
         ignore: ignorePatterns,
         cwd: userRootDir,

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

@@ -7,7 +7,7 @@ import fs from 'fs';
 import path from 'path';
 import pc from '@brillout/picocolors';
 import { import_ } from '@brillout/import';
-import { assertPosixPath, getRandomId, assertIsNotProductionRuntime, assert, assertWarning, isObject, toPosixPath, assertUsage, isPlainJavaScriptFile, createDebugger, assertFilePathAbsoluteFilesystem, assertIsImportPathNpmPackage, genPromise, isVitest, isImportPathNpmPackageOrPathAlias, isImportPathRelative, requireResolveOptionalDir } from '../../../../utils.js';
+import { assertPosixPath, getRandomId, assertIsNotProductionRuntime, assert, assertWarning, isObject, toPosixPath, assertUsage, isPlainScriptFile, createDebugger, assertFilePathAbsoluteFilesystem, assertIsImportPathNpmPackage, genPromise, isVitest, isImportPathNpmPackageOrPathAlias, isImportPathRelative, requireResolveOptionalDir } from '../../../../utils.js';
 import { transformPointerImports } from './pointerImports.js';
 import sourceMapSupport from 'source-map-support';
 import { getFilePathAbsoluteUserRootDir } from '../../../../shared/getFilePath.js';
@@ -26,7 +26,7 @@ async function transpileAndExecuteFile(filePath, userRootDir, isExtensionConfig,
     }
     const { promise, resolve } = genPromise();
     esbuildCache.transpileCache[filePathAbsoluteFilesystem] = promise;
-    assertUsage(isPlainJavaScriptFile(filePathAbsoluteFilesystem), `${filePathToShowToUserResolved} has file extension .${fileExtension} but a config file can only be a JavaScript/TypeScript file`);
+    assertUsage(isPlainScriptFile(filePathAbsoluteFilesystem), `${filePathToShowToUserResolved} has file extension .${fileExtension} but a config file can only be a JavaScript/TypeScript file`);
     const isHeader = isHeaderFile(filePathAbsoluteFilesystem);
     if (isHeader) {
         assertWarning(false, `${pc.cyan('.h.js')} files are deprecated: simply renaming ${filePathToShowToUserResolved} to ${removeHeaderFileExtension(filePathToShowToUserResolved)} is usually enough, although you may occasionally need to use ${pc.cyan("with { type: 'pointer' }")} as explained at https://vike.dev/config#pointer-imports`, { onlyOnce: true });
@@ -152,7 +152,7 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                     const isVikeExtensionImport = (path.startsWith('vike-') && path.endsWith('/config')) || importPathResolved.endsWith('+config.js');
                     const isPointerImport = transformImports === 'all' ||
                         // .jsx, .vue, .svg, ... => obviously not config code => pointer import
-                        !isPlainJavaScriptFile(importPathResolved) ||
+                        !isPlainScriptFile(importPathResolved) ||
                         // Import of a Vike extension config => make it a pointer import because we want to show nice error messages (that can display whether a config has been set by the user or by a Vike extension).
                         //  - Should we stop doing this? (And instead let Node.js directly load Vike extensions.)
                         //    - In principle, we can use the setting 'name' value of Vike extensions.

package/dist/esm/node/plugin/plugins/replaceConstants.d.ts

@@ -0,0 +1,3 @@
+export { replaceConstants };
+import type { Plugin } from 'vite';
+declare function replaceConstants(): Plugin;

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

@@ -0,0 +1,71 @@
+export { replaceConstants };
+import MagicString from 'magic-string';
+import { assert, assertPosixPath } from '../utils.js';
+import { normalizeId } from '../shared/normalizeId.js';
+import { isViteServerBuild_safe } from '../shared/isViteServerBuild.js';
+import { applyRegExpWithMagicString } from '../shared/applyRegExWithMagicString.js';
+function replaceConstants() {
+    let config;
+    return {
+        name: 'vike:replaceConstants',
+        enforce: 'post',
+        apply: 'build',
+        configResolved(config_) {
+            config = config_;
+        },
+        transform(code, id, options) {
+            id = normalizeId(id);
+            assertPosixPath(id);
+            if (id.includes('/node_modules/'))
+                return;
+            assertPosixPath(config.root);
+            if (!id.startsWith(config.root))
+                return;
+            if (!code.includes('import.meta.env.'))
+                return;
+            const isBuild = config.command === 'build';
+            assert(isBuild);
+            // Used by vike.dev
+            // https://github.com/vikejs/vike/blob/08a1ff55c80ddca64ca6d4417fefd45fefeb4ffb/docs/vite.config.ts#L12
+            // @ts-expect-error
+            if (config._skipVikeReplaceConstants?.(id))
+                return;
+            const magicString = new MagicString(code);
+            const constantsMap = [];
+            constantsMap.push({
+                constants: ['pageContext.isClientSide', 'globalContext.isClientSide', 'pageContext.globalContext.isClientSide'],
+                replacement: !isViteServerBuild_safe(config, options)
+            });
+            constantsMap.forEach(({ constants, replacement }) => {
+                if (!constants.some((c) => code.includes(c)))
+                    return;
+                const regExp = getConstantRegExp(constants);
+                applyRegExpWithMagicString(magicString, regExp, replacement);
+            });
+            if (!magicString.hasChanged())
+                return null;
+            return {
+                code: magicString.toString(),
+                map: magicString.generateMap({ hires: true, source: id })
+            };
+        }
+    };
+}
+// Copied & adapted from:
+// https://github.com/rollup/plugins/blob/e1a5ef99f1578eb38a8c87563cb9651db228f3bd/packages/replace/src/index.js#L57-L67
+function getConstantRegExp(constants) {
+    const keys = Object.values(constants).sort(longest).map(escape);
+    // const delimiters = ['\\b', '\\b(?!\\.)']
+    const delimiters = ['(?<!\\.)\\b', '\\b(?!\\.)']; // Improved version, to avoid replacing `globalContext.pageContext.isClientSide` with `globalContext.false`
+    const preventAssignment = false; // Let's try without it first, let's see if a user complains
+    const lookbehind = preventAssignment ? '(?<!\\b(?:const|let|var)\\s*)' : '';
+    const lookahead = preventAssignment ? '(?!\\s*=[^=])' : '';
+    const pattern = new RegExp(`${lookbehind}${delimiters[0]}(${keys.join('|')})${delimiters[1]}${lookahead}`, 'g');
+    return pattern;
+}
+function escape(str) {
+    return str.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&');
+}
+function longest(a, b) {
+    return b.length - a.length;
+}

package/dist/esm/node/plugin/shared/applyRegExWithMagicString.d.ts

@@ -0,0 +1,3 @@
+export { applyRegExpWithMagicString };
+import type MagicString from 'magic-string';
+declare function applyRegExpWithMagicString(magicString: MagicString, regExp: string | RegExp, replacement: unknown): void;

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

@@ -0,0 +1,8 @@
+export { applyRegExpWithMagicString };
+function applyRegExpWithMagicString(magicString, regExp, replacement) {
+    const envStatementRegEx = typeof regExp === 'string' ? new RegExp(regExp, 'g') : regExp;
+    let match;
+    while ((match = envStatementRegEx.exec(magicString.original))) {
+        magicString.overwrite(match.index, match.index + match[0].length, JSON.stringify(replacement));
+    }
+}

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

@@ -1,13 +1,13 @@
 export { findPageFiles };
 import { glob } from 'tinyglobby';
-import { assertWarning, toPosixPath, scriptFileExtensions } from '../utils.js';
+import { assertWarning, toPosixPath, scriptFileExtensionPattern } from '../utils.js';
 import pc from '@brillout/picocolors';
 import { getOutDirs } from './getOutDirs.js';
 async function findPageFiles(config, fileTypes, isDev) {
     const cwd = config.root;
     const { outDirRoot } = getOutDirs(config);
     const timeBase = new Date().getTime();
-    let pageFiles = await glob(fileTypes.map((fileType) => `**/*${fileType}.${scriptFileExtensions}`), { ignore: ['**/node_modules/**', `${outDirRoot}/**`], cwd, dot: false, expandDirectories: false });
+    let pageFiles = await glob(fileTypes.map((fileType) => `**/*${fileType}.${scriptFileExtensionPattern}`), { ignore: ['**/node_modules/**', `${outDirRoot}/**`], cwd, dot: false, expandDirectories: false });
     pageFiles = pageFiles.map((p) => '/' + toPosixPath(p));
     const time = new Date().getTime() - timeBase;
     if (isDev) {

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

@@ -71,7 +71,13 @@ async function renderHtmlStream(streamOriginal, injectString, pageContext, onErr
             return injectAtStreamAfterFirstChunk();
         };
     }
+    let makeClosableAgain = () => { };
+    if (isStreamFromReactStreamingPackage(streamOriginal)) {
+        // Make sure Vike injects its HTML fragments, such as `<script id="vike_pageContext" type="application/json">`, before the stream is closed
+        makeClosableAgain = streamOriginal.doNotClose();
+    }
     const streamWrapper = await processStream(streamOriginal, processStreamOptions);
+    makeClosableAgain();
     return streamWrapper;
 }
 function isTemplateWrapped(something) {

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.228-commit-1bb55f1";
+export declare const PROJECT_VERSION: "0.4.229-commit-2a06dcc";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.228-commit-1bb55f1';
+export const PROJECT_VERSION = '0.4.229-commit-2a06dcc';

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

@@ -1,10 +1,10 @@
 export { isScriptFile };
-export { isPlainJavaScriptFile };
+export { isPlainScriptFile };
 export { isTemplateFile };
-export { scriptFileExtensions };
+export { scriptFileExtensionPattern };
 export { scriptFileExtensionList };
-declare const scriptFileExtensionList: readonly [...string[], "jsx", "tsx", "cjsx", "ctsx", "mjsx", "mtsx", "vue", "svelte", "marko", "md", "mdx"];
-declare const scriptFileExtensions: string;
+declare const scriptFileExtensionList: readonly ["js", "cjs", "mjs", "ts", "cts", "mts", "jsx", "cjsx", "mjsx", "tsx", "ctsx", "mtsx", "vue", "svelte", "marko", "md", "mdx"];
+declare const scriptFileExtensionPattern: string;
 declare function isScriptFile(filePath: string): boolean;
-declare function isPlainJavaScriptFile(filePath: string): boolean;
+declare function isPlainScriptFile(filePath: string): boolean;
 declare function isTemplateFile(filePath: string): boolean;

package/dist/esm/utils/isScriptFile.js

@@ -1,9 +1,8 @@
 export { isScriptFile };
-export { isPlainJavaScriptFile };
+export { isPlainScriptFile };
 export { isTemplateFile };
-export { scriptFileExtensions };
+export { scriptFileExtensionPattern };
 export { scriptFileExtensionList };
-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
@@ -15,26 +14,36 @@ import { assert } from './assert.js';
 //     - 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 = [
+const extJs = [
     'js',
-    'ts',
     'cjs',
-    'cts',
     'mjs',
+];
+// prettier-ignore
+// biome-ignore format:
+const extTs = [
+    'ts',
+    'cts',
     'mts',
 ];
+const extJsOrTs = [...extJs, ...extTs];
 // prettier-ignore
 // biome-ignore format:
 const extJsx = [
     'jsx',
-    'tsx',
     'cjsx',
-    'ctsx',
     'mjsx',
-    'mtsx',
 ];
 // prettier-ignore
 // biome-ignore format:
+const extTsx = [
+    'tsx',
+    'ctsx',
+    'mtsx'
+];
+const extJsxOrTsx = [...extJsx, ...extTsx];
+// prettier-ignore
+// biome-ignore format:
 const extTemplates = [
     'vue',
     'svelte',
@@ -42,19 +51,13 @@ const extTemplates = [
     'md',
     'mdx'
 ];
-const scriptFileExtensionList = [...extJavaScript, ...extJsx, ...extTemplates];
-const scriptFileExtensions = '(' + scriptFileExtensionList.join('|') + ')';
+const scriptFileExtensionList = [...extJsOrTs, ...extJsxOrTsx, ...extTemplates];
+const scriptFileExtensionPattern = '(' + scriptFileExtensionList.join('|') + ')';
 function isScriptFile(filePath) {
-    const yes = scriptFileExtensionList.some((ext) => filePath.endsWith('.' + ext));
-    if (isPlainJavaScriptFile(filePath))
-        assert(yes);
-    return yes;
+    return scriptFileExtensionList.some((ext) => filePath.endsWith('.' + ext));
 }
-function isPlainJavaScriptFile(filePath) {
-    const yes1 = /\.(c|m)?(j|t)s$/.test(filePath);
-    const yes2 = extJavaScript.some((ext) => filePath.endsWith('.' + ext));
-    assert(yes1 === yes2);
-    return yes1;
+function isPlainScriptFile(filePath) {
+    return extJsOrTs.some((ext) => filePath.endsWith('.' + ext));
 }
 function isTemplateFile(filePath) {
     return extTemplates.some((ext) => filePath.endsWith('.' + ext));

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

@@ -2,6 +2,7 @@ export { isImportPathNpmPackage };
 export { isImportPathNpmPackageOrPathAlias };
 export { assertIsImportPathNpmPackage };
 export { isPathAliasRecommended };
+export { getNpmPackageName };
 export { parseNpmPackage };
 export { isDistinguishable };
 declare function isImportPathNpmPackage(str: string, { cannotBePathAlias }: {
@@ -9,6 +10,7 @@ declare function isImportPathNpmPackage(str: string, { cannotBePathAlias }: {
 }): boolean;
 declare function isImportPathNpmPackageOrPathAlias(str: string): boolean;
 declare function assertIsImportPathNpmPackage(str: string): void;
+declare function getNpmPackageName(str: string): null | string;
 declare function isPathAliasRecommended(alias: string): boolean;
 declare function isDistinguishable(alias: string): boolean;
 declare function parseNpmPackage(str: string | undefined): null | {

package/dist/esm/utils/parseNpmPackage.js

@@ -2,9 +2,9 @@ export { isImportPathNpmPackage };
 export { isImportPathNpmPackageOrPathAlias };
 export { assertIsImportPathNpmPackage };
 export { isPathAliasRecommended };
+export { getNpmPackageName };
 /* Currently not used
 export { isNpmPackageName }
-export { getNpmPackageName }
 export { getNpmPackageImportPath }
 */
 // For ./isNpmPackage.spec.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.228-commit-1bb55f1",
+  "version": "0.4.229-commit-2a06dcc",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {