vike 0.4.239-commit-9dcde6d → 0.4.239-commit-95ab407

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

@@ -543,35 +543,37 @@ function isProd() {
 }
 function isProdOptional() {
     const vikeApiOperation = getVikeApiOperation()?.operation ?? null;
-    const yes = 
     // setGlobalContext_prodBuildEntry() was called
-    !!globalObject.prodBuildEntry ||
-        globalObject.isPrerendering === true ||
-        // Vike CLI & Vike API
-        (!!vikeApiOperation && vikeApiOperation !== 'dev') ||
-        // Vite command
-        globalObject.isProductionAccordingToVite === true ||
-        // getGlobalContextAsync(isProduction)
-        globalObject.isProductionAccordingToUser === true ||
-        // vite-plugin-vercel
-        globalObject.isProductionAccordingToPhotonVercel === true;
-    assert(typeof yes === 'boolean');
-    const no = !!globalObject.viteDevServer ||
-        // Vike CLI & Vike API
-        vikeApiOperation === 'dev' ||
-        // Vite command
-        globalObject.isProductionAccordingToVite === false ||
-        // getGlobalContextAsync(isProduction)
-        globalObject.isProductionAccordingToUser === false ||
-        // @cloudflare/vite-plugin
-        isNonRunnableDev() === true;
-    assert(typeof no === 'boolean');
+    const yes1 = !!globalObject.prodBuildEntry;
+    const yes2 = globalObject.isPrerendering === true;
+    // Vike CLI & Vike API
+    const yes3 = !!vikeApiOperation && vikeApiOperation !== 'dev';
+    // Vite command
+    const yes4 = globalObject.isProductionAccordingToVite === true;
+    // getGlobalContextAsync(isProduction)
+    const yes5 = globalObject.isProductionAccordingToUser === true;
+    // vite-plugin-vercel
+    const yes6 = globalObject.isProductionAccordingToPhotonVercel === true;
+    const yes = yes1 || yes2 || yes3 || yes4 || yes5 || yes6;
+    const no1 = !!globalObject.viteDevServer;
+    // Vike CLI & Vike API
+    const no2 = vikeApiOperation === 'dev';
+    // Vite command
+    const no3 = globalObject.isProductionAccordingToVite === false;
+    // getGlobalContextAsync(isProduction)
+    const no4 = globalObject.isProductionAccordingToUser === false;
+    // @cloudflare/vite-plugin
+    const no5 = isNonRunnableDev() === true;
+    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);
+    assert(typeof no === 'boolean', debug);
     if (yes) {
-        assert(no === false);
+        assert(no === false, debug);
         return true;
     }
     if (no) {
-        assert(yes === false);
+        assert(yes === false, debug);
         return false;
     }
     return null;

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

@@ -1,20 +1,23 @@
 export { pluginNonRunnableDev };
-import { createViteRPC, assertIsNotProductionRuntime, requireResolveDistFile, isRunnableDevEnvironment, assert, escapeRegex, isDevCheck, } from '../utils.js';
+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();
-const distFileIsNonRunnableDev = requireResolveDistFile('dist/esm/utils/isNonRunnableDev.js');
-const distFileGlobalContext = requireResolveDistFile('dist/esm/node/runtime/globalContext.js');
+/* 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 filterFunction = (id) => {
-    const idWithoutQuery = getIdWithoutQuery(id);
-    return idWithoutQuery === distFileIsNonRunnableDev || idWithoutQuery === distFileGlobalContext;
-};
+  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) {
@@ -32,7 +35,7 @@ function pluginNonRunnableDev() {
     let config;
     return [
         {
-            name: 'vike:pluginNonRunnableDev',
+            name: 'vike:pluginNonRunnableDev:1',
             apply: (_, configEnv) => isDevCheck(configEnv),
             configureServer: {
                 handler(viteDevServer) {
@@ -45,26 +48,39 @@ function pluginNonRunnableDev() {
                 },
             },
             transform: {
-                filter: filterRolldown,
+                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);
-                    assert(filterFunction(id));
-                    const idWithoutQuery = getIdWithoutQuery(id);
                     if (isRunnableDevEnvironment(this.environment))
                         return;
                     const { magicString, getMagicStringResult } = getMagicString(code, id);
-                    if (idWithoutQuery === distFileIsNonRunnableDev) {
-                        magicString.replaceAll('__VIKE__IS_NON_RUNNABLE_DEV', JSON.stringify(true));
-                    }
-                    if (idWithoutQuery === distFileGlobalContext) {
-                        magicString.replaceAll('__VIKE__DYNAMIC_IMPORT', 'import');
-                    }
+                    magicString.replaceAll(__VIKE__DYNAMIC_IMPORT, 'import');
                     return getMagicStringResult();
                 },
             },
         },
     ];
 }
-function getIdWithoutQuery(id) {
-    return id.split('?')[0];
-}

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

@@ -4,6 +4,9 @@ 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
+        */
         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-9dcde6d";
+export declare const PROJECT_VERSION: "0.4.239-commit-95ab407";

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-9dcde6d';
+export const PROJECT_VERSION = '0.4.239-commit-95ab407';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.239-commit-9dcde6d",
+  "version": "0.4.239-commit-95ab407",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -117,7 +117,7 @@
     "@brillout/json-serializer": "^0.5.20",
     "@brillout/picocolors": "^1.0.26",
     "@brillout/require-shim": "^0.1.2",
-    "@brillout/vite-plugin-server-entry": "^0.7.14",
+    "@brillout/vite-plugin-server-entry": "^0.7.15",
     "acorn": "^8.0.0",
     "cac": "^6.0.0",
     "es-module-lexer": "^1.0.0",