vike 0.4.239-commit-95ab407 → 0.4.240

package/dist/esm/node/runtime/globalContext.js

@@ -261,6 +261,7 @@ async function loadProdBuildEntry(outDir) {
 // https://github.com/vikejs/vike/blob/8c350e8105a626469e87594d983090919e82099b/packages/vike/node/vite/plugins/pluginBuild/pluginProdBuildEntry.ts#L47
 async function setGlobalContext_prodBuildEntry(prodBuildEntry) {
     debug('setGlobalContext_prodBuildEntry()');
+    assert(!isNonRunnableDev());
     assertProdBuildEntry(prodBuildEntry);
     globalObject.prodBuildEntry = prodBuildEntry;
     globalObject.prodBuildEntryPrevious = prodBuildEntry;
@@ -359,13 +360,14 @@ async function updateUserFiles() {
     }
     else {
         try {
-            /* We use __VIKE__DYNAMIC_IMPORT instead of directly using import() to workaround what seems to be a Vite HMR bug:
-               ```js
-               assert(false)
-               // This line breaks the HMR of regular (runnable) apps, even though (as per the assert() above) it's never run. It seems to be a Vite bug: handleHotUpdate() receives an empty `modules` list.
-               import('virtual:vike:global-entry:server')
-               ```
-            */
+            // We don't directly use import() because:
+            // - Avoid Cloudflare Workers (without @cloudflare/vite-plugin) to try to bundle `import('virtual:id')`.
+            // - Using import() seems to lead to a Vite HMR bug:
+            //   ```js
+            //   assert(false)
+            //   // This line breaks the HMR of regular (runnable) apps, even though (as per the assert() above) it's never run. It seems to be a Vite bug: handleHotUpdate() receives an empty `modules` list.
+            //   import('virtual:vike:global-entry:server')
+            //   ```
             virtualFileExportsGlobalEntry = await __VIKE__DYNAMIC_IMPORT('virtual:vike:global-entry:server');
         }
         catch (err_) {
@@ -563,7 +565,7 @@ function isProdOptional() {
     // getGlobalContextAsync(isProduction)
     const no4 = globalObject.isProductionAccordingToUser === false;
     // @cloudflare/vite-plugin
-    const no5 = isNonRunnableDev() === true;
+    const no5 = isNonRunnableDev();
     const no = no1 || no2 || no3 || no4 || no5;
     const debug = { yes1, yes2, yes3, yes4, yes5, yes6, no1, no2, no3, no4, no5 };
     assert(typeof yes === 'boolean', debug);

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

@@ -6,7 +6,7 @@ export { getVikeConfig } from './shared/resolveVikeConfigInternal.js';
 export { PROJECT_VERSION as version } from './utils.js';
 import { getClientEntrySrcDev } from './shared/getClientEntrySrcDev.js';
 import { setGetClientEntrySrcDev } from '../runtime/renderPage/getPageAssets/retrievePageAssetsDev.js';
-import { assertUsage } from './utils.js';
+import { assertIsNotProductionRuntime, assertUsage } from './utils.js';
 import pc from '@brillout/picocolors';
 import { pluginPreview } from './plugins/pluginPreview.js';
 import { pluginDev } from './plugins/pluginDev.js';
@@ -22,16 +22,18 @@ import { pluginWorkaroundCssModuleHmr } from './plugins/pluginWorkaroundCssModul
 import { pluginWorkaroundVite6HmrRegression } from './plugins/pluginWorkaroundVite6HmrRegression.js';
 import { pluginReplaceIsClientSide } from './plugins/pluginReplaceIsClientSide.js';
 import { pluginReplaceGlobalThisConstants } from './plugins/pluginReplaceGlobalThisConstants.js';
-import { pluginNonRunnableDev } from './plugins/pluginNonRunnableDev.js';
-import { pluginBuildApp } from './plugins/pluginBuild/pluginBuildApp.js';
-import { pluginDistPackageJsonFile } from './plugins/pluginBuild/pluginDistPackageJsonFile.js';
-import { pluginSuppressRollupWarning } from './plugins/pluginBuild/pluginSuppressRollupWarning.js';
-import { pluginDistFileNames } from './plugins/pluginBuild/pluginDistFileNames.js';
-import { pluginProdBuildEntry } from './plugins/pluginBuild/pluginProdBuildEntry.js';
-import { pluginBuildConfig } from './plugins/pluginBuild/pluginBuildConfig.js';
-import { pluginModuleBanner } from './plugins/pluginBuild/pluginModuleBanner.js';
+import { pluginViteRPC } from './plugins/non-runnable-dev/pluginViteRPC.js';
+import { pluginBuildApp } from './plugins/build/pluginBuildApp.js';
+import { pluginDistPackageJsonFile } from './plugins/build/pluginDistPackageJsonFile.js';
+import { pluginSuppressRollupWarning } from './plugins/build/pluginSuppressRollupWarning.js';
+import { pluginDistFileNames } from './plugins/build/pluginDistFileNames.js';
+import { pluginProdBuildEntry } from './plugins/build/pluginProdBuildEntry.js';
+import { pluginBuildConfig } from './plugins/build/pluginBuildConfig.js';
+import { pluginModuleBanner } from './plugins/build/pluginModuleBanner.js';
+import { pluginReplaceConstantsNonRunnableDev } from './plugins/non-runnable-dev/pluginReplaceConstantsNonRunnableDev.js';
 // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
 setGetClientEntrySrcDev(getClientEntrySrcDev);
+assertIsNotProductionRuntime();
 // Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
 function plugin(vikeVitePluginOptions = {}) {
     const plugins = [
@@ -50,7 +52,7 @@ function plugin(vikeVitePluginOptions = {}) {
         ...pluginWorkaroundVite6HmrRegression(),
         ...pluginReplaceIsClientSide(),
         ...pluginReplaceGlobalThisConstants(),
-        ...pluginNonRunnableDev(),
+        ...pluginNonRunnabeDev(),
     ];
     Object.assign(plugins, { _vikeVitePluginOptions: vikeVitePluginOptions });
     return plugins;
@@ -66,6 +68,9 @@ function pluginBuild() {
         ...pluginModuleBanner(),
     ];
 }
+function pluginNonRunnabeDev() {
+    return [...pluginViteRPC(), ...pluginReplaceConstantsNonRunnableDev()];
+}
 // Error upon wrong usage
 Object.defineProperty(plugin, 'apply', {
     enumerable: true,

package/dist/esm/node/vite/plugins/non-runnable-dev/pluginReplaceConstantsNonRunnableDev.d.ts

@@ -0,0 +1,7 @@
+export { pluginReplaceConstantsNonRunnableDev };
+import type { Plugin } from 'vite';
+declare global {
+    var __VIKE__IS_NON_RUNNABLE_DEV: undefined | true;
+    var __VIKE__DYNAMIC_IMPORT: (module: `virtual:${string}`) => Promise<Record<string, unknown>>;
+}
+declare function pluginReplaceConstantsNonRunnableDev(): Plugin[];

package/dist/esm/node/vite/plugins/non-runnable-dev/pluginReplaceConstantsNonRunnableDev.js

@@ -0,0 +1,47 @@
+export { pluginReplaceConstantsNonRunnableDev };
+import { isRunnableDevEnvironment, isDevCheck } from '../../utils.js';
+import { getMagicString } from '../../shared/getMagicString.js';
+// - We cannot use [`define`](https://vite.dev/config/shared-options.html#define) because we don't have access to `this.environment` and therefore we cannot call `isRunnableDevEnvironment(this.environment)` inside a configEnvironment() hook.
+// - We cannot use [`filter.id`](https://rolldown.rs/plugins/hook-filters) because Vite's optimizeDeps bundles packages (e.g. `vike` or `telefunc`) into node_modules/.vite/deps_ssr/chunk-WBC5FHD7.js
+const IS_NON_RUNNABLE_DEV = 'globalThis.__VIKE__IS_NON_RUNNABLE_DEV';
+const DYNAMIC_IMPORT = '__VIKE__DYNAMIC_IMPORT';
+function pluginReplaceConstantsNonRunnableDev() {
+    return [
+        {
+            name: 'vike:pluginReplaceConstantsNonRunnableDev:IS_NON_RUNNABLE_DEV',
+            apply: (_, configEnv) => isDevCheck(configEnv),
+            transform: {
+                filter: {
+                    code: {
+                        include: IS_NON_RUNNABLE_DEV,
+                    },
+                },
+                handler(code, id) {
+                    if (isRunnableDevEnvironment(this.environment))
+                        return;
+                    const { magicString, getMagicStringResult } = getMagicString(code, id);
+                    magicString.replaceAll(IS_NON_RUNNABLE_DEV, JSON.stringify(true));
+                    return getMagicStringResult();
+                },
+            },
+        },
+        {
+            name: 'vike:pluginReplaceConstantsNonRunnableDev:DYNAMIC_IMPORT',
+            apply: (_, configEnv) => isDevCheck(configEnv),
+            transform: {
+                filter: {
+                    code: {
+                        include: DYNAMIC_IMPORT,
+                    },
+                },
+                handler(code, id) {
+                    if (isRunnableDevEnvironment(this.environment))
+                        return;
+                    const { magicString, getMagicStringResult } = getMagicString(code, id);
+                    magicString.replaceAll(DYNAMIC_IMPORT, 'import');
+                    return getMagicStringResult();
+                },
+            },
+        },
+    ];
+}

package/dist/esm/node/vite/plugins/{pluginNonRunnableDev.d.ts → non-runnable-dev/pluginViteRPC.d.ts}

@@ -1,6 +1,6 @@
-export { pluginNonRunnableDev };
+export { pluginViteRPC };
 import type { Plugin, ViteDevServer } from 'vite';
-import type { ClientDependency } from '../../../shared/getPageFiles/analyzePageClientSide/ClientDependency.js';
+import type { ClientDependency } from '../../../../shared/getPageFiles/analyzePageClientSide/ClientDependency.js';
 export type ViteRPC = ReturnType<typeof getViteRpcFunctions>;
 declare function getViteRpcFunctions(viteDevServer: ViteDevServer): {
     transformIndexHtmlRPC(html: string): Promise<string>;
@@ -19,8 +19,4 @@ declare function getViteRpcFunctions(viteDevServer: ViteDevServer): {
         };
     }>;
 };
-declare global {
-    var __VIKE__DYNAMIC_IMPORT: (module: string) => Promise<Record<string, unknown>>;
-    var __VIKE__IS_NON_RUNNABLE_DEV: undefined | boolean;
-}
-declare function pluginNonRunnableDev(): Plugin[];
+declare function pluginViteRPC(): Plugin[];

package/dist/esm/node/vite/plugins/non-runnable-dev/pluginViteRPC.js

@@ -0,0 +1,30 @@
+export { pluginViteRPC };
+import { createViteRPC, isDevCheck } from '../../utils.js';
+import { retrievePageAssetsDev } from '../../../runtime/renderPage/getPageAssets/retrievePageAssetsDev.js';
+import { getViteConfigRuntime } from '../../shared/getViteConfigRuntime.js';
+function getViteRpcFunctions(viteDevServer) {
+    return {
+        async transformIndexHtmlRPC(html) {
+            return await viteDevServer.transformIndexHtml('/', html);
+        },
+        async retrievePageAssetsDevRPC(clientDependencies, clientEntries) {
+            return await retrievePageAssetsDev(viteDevServer, clientDependencies, clientEntries);
+        },
+        async getViteConfigRuntimeRPC() {
+            return getViteConfigRuntime(viteDevServer.config);
+        },
+    };
+}
+function pluginViteRPC() {
+    return [
+        {
+            name: 'vike:pluginViteRPC:1',
+            apply: (_, configEnv) => isDevCheck(configEnv),
+            configureServer: {
+                handler(viteDevServer) {
+                    createViteRPC(viteDevServer, getViteRpcFunctions);
+                },
+            },
+        },
+    ];
+}

package/dist/esm/node/vite/plugins/pluginCommon.js

@@ -1,6 +1,6 @@
 export { pluginCommon };
 import { assert, assertUsage, assertWarning, hasProp, isDevCheck, isDocker, isObject, isVitest } from '../utils.js';
-import { assertRollupInput } from './pluginBuild/pluginBuildConfig.js';
+import { assertRollupInput } from './build/pluginBuildConfig.js';
 import { installRequireShim_setUserRootDir } from '@brillout/require-shim';
 import pc from '@brillout/picocolors';
 import { assertResolveAlias } from './pluginCommon/assertResolveAlias.js';
@@ -129,9 +129,6 @@ function assertVikeCliOrApi(config) {
         return;
     if (isViteCliCall()) {
         assert(!isVitest());
-        assertWarning(false, `Vite's CLI is deprecated ${pc.underline('https://vike.dev/migration/cli')}`, {
-            onlyOnce: true,
-        });
         return;
     }
     if (isVitest()) {
@@ -144,9 +141,6 @@ function assertVikeCliOrApi(config) {
         });
         return;
     }
-    assertWarning(false, `Vite's JavaScript API is deprecated ${pc.underline('https://vike.dev/migration/cli#api')}`, {
-        onlyOnce: true,
-    });
 }
 // TO-DO/next-major-release: remove https://github.com/vikejs/vike/issues/2122
 function temp_supportOldInterface(config) {

package/dist/esm/node/vite/plugins/pluginDev/determineOptimizeDeps.js

@@ -2,7 +2,7 @@ export { determineOptimizeDeps };
 import { findPageFiles } from '../../shared/findPageFiles.js';
 import { assert, assertIsImportPathNpmPackage, createDebugger, getNpmPackageName, isArray, isFilePathAbsoluteFilesystem, isVirtualFileId, } from '../../utils.js';
 import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
-import { analyzeClientEntries } from '../pluginBuild/pluginBuildConfig.js';
+import { analyzeClientEntries } from '../build/pluginBuildConfig.js';
 import { virtualFileIdGlobalEntryClientCR, virtualFileIdGlobalEntryClientSR } from '../../../shared/virtualFileId.js';
 import { getFilePathResolved } from '../../shared/getFilePath.js';
 import { getConfigValueSourcesRelevant } from '../pluginVirtualFiles/getConfigValueSourcesRelevant.js';

package/dist/esm/node/vite/plugins/pluginEnvVars.js

@@ -102,8 +102,6 @@ function pluginEnvVars() {
                     replacements.forEach(({ regExpStr, replacement }) => {
                         magicString.replaceAll(new RegExp(regExpStr, 'g'), JSON.stringify(replacement));
                     });
-                    if (!magicString.hasChanged())
-                        return null;
                     return getMagicStringResult();
                 },
             },

package/dist/esm/node/vite/plugins/pluginExtractAssets.js

@@ -12,7 +12,7 @@ import { extractAssetsAddQuery } from '../../shared/extractAssetsQuery.js';
 import { isAsset } from '../shared/isAsset.js';
 import { getImportStatements } from '../shared/parseEsModule.js';
 import pc from '@brillout/picocolors';
-import { handleAssetsManifest_isFixEnabled } from './pluginBuild/handleAssetsManifest.js';
+import { handleAssetsManifest_isFixEnabled } from './build/handleAssetsManifest.js';
 import { getVikeConfigInternal } from '../shared/resolveVikeConfigInternal.js';
 import { assertV1Design } from '../../shared/assertV1Design.js';
 import { normalizeId } from '../shared/normalizeId.js';

package/dist/esm/node/vite/plugins/pluginReplaceIsClientSide.js

@@ -61,8 +61,6 @@ function pluginReplaceIsClientSide() {
                         const regExp = getConstantRegExp(constantsIsClientSide);
                         magicString.replaceAll(regExp, JSON.stringify(replacement));
                     }
-                    if (!magicString.hasChanged())
-                        return null;
                     return getMagicStringResult();
                 },
             },

package/dist/esm/node/vite/plugins/pluginVirtualFiles/generateVirtualFilePageEntry.js

@@ -5,7 +5,7 @@ import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js
 import { extractAssetsAddQuery } from '../../../shared/extractAssetsQuery.js';
 import { debug } from './debug.js';
 import { serializeConfigValues } from '../../../../shared/page-configs/serialize/serializeConfigValues.js';
-import { handleAssetsManifest_isFixEnabled } from '../pluginBuild/handleAssetsManifest.js';
+import { handleAssetsManifest_isFixEnabled } from '../build/handleAssetsManifest.js';
 import { getConfigValueBuildTime } from '../../../../shared/page-configs/getConfigValueBuildTime.js';
 import { resolveIncludeAssetsImportedByServer } from '../../../runtime/renderPage/getPageAssets/retrievePageAssetsProd.js';
 async function generateVirtualFilePageEntry(id, isDev) {

package/dist/esm/node/vite/shared/getMagicString.d.ts

@@ -5,5 +5,5 @@ declare function getMagicString(code: string, id: string): {
     getMagicStringResult: () => {
         code: string;
         map: import("magic-string").SourceMap;
-    };
+    } | undefined;
 };

package/dist/esm/node/vite/shared/getMagicString.js

@@ -4,9 +4,8 @@ import MagicString from 'magic-string';
 function getMagicString(code, id) {
     const magicString = new MagicString(code);
     const getMagicStringResult = () => {
-        /* TODO/now uncomment + dedupe
-        if (!magicString.hasChanged()) return undefined
-        */
+        if (!magicString.hasChanged())
+            return undefined;
         return {
             code: magicString.toString(),
             map: magicString.generateMap({ hires: true, source: id }),

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.239-commit-95ab407";
+export declare const PROJECT_VERSION: "0.4.240";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.239-commit-95ab407';
+export const PROJECT_VERSION = '0.4.240';

package/dist/esm/utils/debug.js

@@ -163,6 +163,16 @@ function isDebug() {
 }
 function getDEBUG() {
     let DEBUG;
+    // ssr.noExternal
+    /* // Full implementation:
+       // - https://github.com/vikejs/vike/commit/7637564a98f43e23834bcae2f7ada8d941958a34
+       // - https://github.com/vikejs/vike/pull/2718
+       // - We don't implement this yet because it crashes @cloudflare/vite-plugin
+    if (import.meta.env) {
+      return import.meta.env.DEBUG
+    }
+    //*/
+    // ssr.external
     // - `process` can be undefined in edge workers
     // - We want bundlers to be able to statically replace `process.env.*`
     try {

package/dist/esm/utils/isDev.js

@@ -5,8 +5,10 @@ import { assertUsage } from './assert.js';
 function isDevCheck(configEnv) {
     const { isPreview, command } = configEnv;
     // Note that:
-    // - `assertVersion('Vite', version, '5.1.0')` at node/vite/onLoad.ts isn't enough: https://github.com/vitejs/vite/pull/19355
+    // - `assertVersion('Vite', version, '5.1.0')` isn't enough: https://github.com/vitejs/vite/pull/19355
     // - We'll eventually be able to make this an assert() instead of assertUsage() once Vike requires a Vite version that supports this.meta.viteVersion
+    //   - https://github.com/vitejs/vite/pull/20088
+    //   - Released at 7.0.0: https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md#700-2025-06-24
     assertUsage(typeof isPreview === 'boolean', 'You are using an old Vite version; make sure to use Vite 5.1.0 or above.');
     return command === 'serve' && !isPreview;
 }

package/dist/esm/utils/isNonRunnableDev.js

@@ -3,8 +3,8 @@ import { assert } from './assert.js';
 import { assertIsNotBrowser } from './assertIsNotBrowser.js';
 assertIsNotBrowser();
 function isNonRunnableDev() {
-    if (typeof __VIKE__IS_NON_RUNNABLE_DEV === 'undefined')
+    if (globalThis.__VIKE__IS_NON_RUNNABLE_DEV === undefined)
         return false;
-    assert(__VIKE__IS_NON_RUNNABLE_DEV === true);
+    assert(globalThis.__VIKE__IS_NON_RUNNABLE_DEV === true);
     return true;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.239-commit-95ab407",
+  "version": "0.4.240",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {

package/dist/esm/node/vite/plugins/pluginNonRunnableDev.js

@@ -1,86 +0,0 @@
-export { pluginNonRunnableDev };
-import { createViteRPC, assertIsNotProductionRuntime, isRunnableDevEnvironment, assert, isDevCheck } from '../utils.js';
-import { retrievePageAssetsDev } from '../../runtime/renderPage/getPageAssets/retrievePageAssetsDev.js';
-import { getViteConfigRuntime } from '../shared/getViteConfigRuntime.js';
-import { getMagicString } from '../shared/getMagicString.js';
-// TODO/now: move to vite/index.ts
-assertIsNotProductionRuntime();
-/* We cannot use [`filter.id`](https://rolldown.rs/plugins/hook-filters) because Vite's optimizeDeps bundles the package `vike` into node_modules/.vite/deps_ssr/chunk-WBC5FHD7.js
-const distFileIsNonRunnableDev = requireResolveDistFile('dist/esm/utils/isNonRunnableDev.js')
-const distFileGlobalContext = requireResolveDistFile('dist/esm/node/runtime/globalContext.js')
-const filterRolldown = {
-  id: {
-    include: [distFileIsNonRunnableDev, distFileGlobalContext].map(
-      (filePath) => new RegExp(`^${escapeRegex(filePath)}($|${escapeRegex('?')}.*)`),
-    ),
-  },
-}
-*/
-const __VIKE__DYNAMIC_IMPORT = '__VIKE__DYNAMIC_IMPORT';
-const __VIKE__IS_NON_RUNNABLE_DEV = '__VIKE__IS_NON_RUNNABLE_DEV';
-function getViteRpcFunctions(viteDevServer) {
-    return {
-        async transformIndexHtmlRPC(html) {
-            return await viteDevServer.transformIndexHtml('/', html);
-        },
-        async retrievePageAssetsDevRPC(clientDependencies, clientEntries) {
-            return await retrievePageAssetsDev(viteDevServer, clientDependencies, clientEntries);
-        },
-        async getViteConfigRuntimeRPC() {
-            return getViteConfigRuntime(viteDevServer.config);
-        },
-    };
-}
-function pluginNonRunnableDev() {
-    let config;
-    return [
-        {
-            name: 'vike:pluginNonRunnableDev:1',
-            apply: (_, configEnv) => isDevCheck(configEnv),
-            configureServer: {
-                handler(viteDevServer) {
-                    createViteRPC(viteDevServer, getViteRpcFunctions);
-                },
-            },
-            configResolved: {
-                handler(config_) {
-                    config = config_;
-                },
-            },
-            transform: {
-                filter: {
-                    code: {
-                        include: __VIKE__IS_NON_RUNNABLE_DEV,
-                    },
-                },
-                handler(code, id) {
-                    assert(config._isDev);
-                    if (isRunnableDevEnvironment(this.environment))
-                        return;
-                    const { magicString, getMagicStringResult } = getMagicString(code, id);
-                    magicString.replaceAll(__VIKE__IS_NON_RUNNABLE_DEV, JSON.stringify(true));
-                    return getMagicStringResult();
-                },
-            },
-        },
-        {
-            name: 'vike:pluginNonRunnableDev:2',
-            apply: (_, configEnv) => isDevCheck(configEnv),
-            transform: {
-                filter: {
-                    code: {
-                        include: __VIKE__DYNAMIC_IMPORT,
-                    },
-                },
-                handler(code, id) {
-                    assert(config._isDev);
-                    if (isRunnableDevEnvironment(this.environment))
-                        return;
-                    const { magicString, getMagicStringResult } = getMagicString(code, id);
-                    magicString.replaceAll(__VIKE__DYNAMIC_IMPORT, 'import');
-                    return getMagicStringResult();
-                },
-            },
-        },
-    ];
-}