vike 0.4.258-commit-e168602 → 0.4.258-commit-24a5c2b

package/dist/node/vite/plugins/build/pluginDistFileNames.js

@@ -42,63 +42,8 @@ function pluginDistFileNames() {
                             //    - If rollupOutput.assetFileNames is a function then use a wrapper function to apply the assertUsage()
                             assertUsage(rollupOutput.assetFileNames.isTheOneSetByVike, "Setting Vite's configuration build.rollupOptions.output.assetFileNames is currently forbidden. Reach out if you need to use it.");
                         }
-                        if (disableCSSBundling(config)) {
-                            const manualChunksOriginal = rollupOutput.manualChunks;
-                            rollupOutput.manualChunks = function (id, ...args) {
-                                if (manualChunksOriginal) {
-                                    if (isCallable(manualChunksOriginal)) {
-                                        const result = manualChunksOriginal.call(this, id, ...args);
-                                        if (result !== undefined)
-                                            return result;
-                                    }
-                                    else {
-                                        assertUsage(false, "The Vite's configuration build.rollupOptions.output.manualChunks must be a function. Reach out if you need to set it to another value.");
-                                    }
-                                }
-                                if (id.endsWith('.css')) {
-                                    const userRootDir = config.root;
-                                    if (id.startsWith(userRootDir)) {
-                                        assertPosixPath(id);
-                                        assertModuleId(id);
-                                        let name;
-                                        const isNodeModules = id.match(/node_modules\/([^\/]+)\/(?!.*node_modules)/);
-                                        if (isNodeModules) {
-                                            name = isNodeModules[1];
-                                        }
-                                        else {
-                                            const filePath = getFilePathToShowToUserModule(id, config);
-                                            name = filePath;
-                                            name = name.split('.').slice(0, -1).join('.'); // remove file extension
-                                            name = name.split('/').filter(Boolean).join('_');
-                                        }
-                                        // Make fileHash the same between local development and CI
-                                        const idStable = path.posix.relative(userRootDir, id);
-                                        // Don't remove `?` queries because each `id` should belong to a unique bundle.
-                                        const hash = getIdHash(idStable);
-                                        return `${name}-${hash}`;
-                                    }
-                                    else {
-                                        let name;
-                                        const isVirtualModule = id.match(/virtual:([^:]+):/);
-                                        if (isVirtualModule) {
-                                            name = isVirtualModule[1];
-                                            assert(name);
-                                        }
-                                        else if (
-                                        // https://github.com/vikejs/vike/issues/1818#issuecomment-2298478321
-                                        id.startsWith('/__uno')) {
-                                            name = 'uno';
-                                        }
-                                        else {
-                                            name = 'style';
-                                        }
-                                        const hash = getIdHash(id);
-                                        return `${name}-${hash}`;
-                                    }
-                                }
-                            };
-                        }
                     });
+                    disableCSSBundling(config);
                 },
             },
         },
@@ -242,6 +187,115 @@ function workaroundGlob(name) {
     name = name.replace(/\.page$/, '-page');
     return name;
 }
+// Workaround for Vite CSS duplication bug: https://github.com/vikejs/vike/issues/1815
+function disableCSSBundling(config) {
+    if (isVite8OrAbove(config)) {
+        for (const output of getRolldownOutputs(config)) {
+            assert(output);
+            const { codeSplitting } = output;
+            // `codeSplitting: false` => single-bundle mode; respect the user's choice.
+            if (codeSplitting === false)
+                continue;
+            // `codeSplitting` set as an object => Rolldown ignores `manualChunks`, so inject a group into `codeSplitting.groups` instead.
+            if (codeSplitting && typeof codeSplitting === 'object') {
+                if (codeSplittingHasWorkaround.has(codeSplitting))
+                    continue;
+                codeSplittingHasWorkaround.add(codeSplitting);
+                codeSplitting.groups ?? (codeSplitting.groups = []);
+                codeSplitting.groups.push({
+                    test: /\.css$/,
+                    name: (moduleId) => getCssChunkName(moduleId, config) ?? null,
+                    /*
+                    // Default priority — user-defined groups with the same priority appear earlier in the array and win the match.
+                    // https://rolldown.rs/options/output-advanced-chunks
+                    priority: 0
+                    */
+                });
+                continue;
+            }
+            // `codeSplitting` unset / `true` => wrap `manualChunks` (Rolldown auto-converts it to a group).
+            // - Rolldown supports `manualChunks` whenever `codeSplitting` isn't an object (despite what the migration guide implies).
+            wrapManualChunks(output, config, 'rolldownOptions');
+        }
+    }
+    else {
+        for (const output of getRollupOutputs(config)) {
+            assert(output);
+            wrapManualChunks(output, config, 'rollupOptions');
+        }
+    }
+}
+const codeSplittingHasWorkaround = new WeakSet();
+function wrapManualChunks(output, config, optsName) {
+    const manualChunksOriginal = output.manualChunks;
+    // Sometimes applied twice => skip if we already wrapped — same rationale as `isTheOneSetByVike` for assetFileNames above.
+    if (manualChunksOriginal?.isTheOneSetByVike)
+        return;
+    output.manualChunks = function (id, ...args) {
+        if (manualChunksOriginal) {
+            if (isCallable(manualChunksOriginal)) {
+                const result = manualChunksOriginal.call(this, id, 
+                // @ts-ignore
+                ...args);
+                if (result !== undefined)
+                    return result;
+            }
+            else {
+                assertUsage(false, `The Vite's configuration build.${optsName}.output.manualChunks must be a function. Reach out if you need to set it to another value.`);
+            }
+        }
+        return getCssChunkName(id, config);
+    };
+    output.manualChunks.isTheOneSetByVike = true;
+}
+function getCssChunkName(id, config) {
+    if (!id.endsWith('.css'))
+        return undefined;
+    const userRootDir = config.root;
+    if (id.startsWith(userRootDir)) {
+        assertPosixPath(id);
+        assertModuleId(id);
+        let name;
+        const isNodeModules = id.match(/node_modules\/([^\/]+)\/(?!.*node_modules)/);
+        if (isNodeModules) {
+            name = isNodeModules[1];
+        }
+        else {
+            const filePath = getFilePathToShowToUserModule(id, config);
+            name = filePath;
+            name = name.split('.').slice(0, -1).join('.'); // remove file extension
+            name = name.split('/').filter(Boolean).join('_');
+        }
+        // Make fileHash the same between local development and CI
+        const idStable = path.posix.relative(userRootDir, id);
+        // Don't remove `?` queries because each `id` should belong to a unique bundle.
+        const hash = getIdHash(idStable);
+        return `${name}-${hash}`;
+    }
+    else {
+        let name;
+        const isVirtualModule = id.match(/virtual:([^:]+):/);
+        if (isVirtualModule) {
+            name = isVirtualModule[1];
+            assert(name);
+        }
+        else if (
+        // https://github.com/vikejs/vike/issues/1818#issuecomment-2298478321
+        id.startsWith('/__uno')) {
+            name = 'uno';
+        }
+        else {
+            name = 'style';
+        }
+        const hash = getIdHash(id);
+        return `${name}-${hash}`;
+    }
+}
+function isVite8OrAbove(config) {
+    const viteVersion = config._viteVersionResolved;
+    assert(viteVersion);
+    return isVersionMatch(viteVersion, ['8.0.0']);
+}
 function getRollupOutputs(config) {
     var _a, _b;
     // @ts-expect-error is read-only
@@ -254,22 +308,18 @@ function getRollupOutputs(config) {
     }
     return output;
 }
-function disableCSSBundling(config) {
-    // Vite 7 => disable CSS bundling, see: https://github.com/vikejs/vike/issues/1815
-    if (!isVite8OrAbove(config))
-        return true;
-    // Vite 8 doesn't support `manualChunks` when `codeSplitting` is used.
-    // - It does, however, support `manualChunks` if `codeSplitting` isn't used (despite what the following migration guide says)
-    // - https://vite.dev/guide/migration#removed-object-form-build-rollupoptions-output-manualchunks-and-deprecate-function-form-one
+function getRolldownOutputs(config) {
+    var _a, _b;
+    // @ts-expect-error is read-only
+    config.build ?? (config.build = {});
     // @ts-ignore
-    if (!config.build?.rolldownOptions?.output?.codeSplitting)
-        return true;
-    // TO-DO/eventually: we should probably show a warning, because Vite 8 still builds the client and server separately (potentially leading to the CSS duplication bug):
-    // https://github.com/vitejs/ecosystem/issues/6
-    return false;
-}
-function isVite8OrAbove(config) {
-    const viteVersion = config._viteVersionResolved;
-    assert(viteVersion);
-    return isVersionMatch(viteVersion, ['8.0.0']);
+    (_a = config.build).rolldownOptions ?? (_a.rolldownOptions = {});
+    // @ts-ignore
+    (_b = config.build.rolldownOptions).output ?? (_b.output = {});
+    // @ts-ignore
+    const { output } = config.build.rolldownOptions;
+    if (!isArray(output)) {
+        return [output];
+    }
+    return output;
 }

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.258-commit-e168602";
+export declare const PROJECT_VERSION: "0.4.258-commit-24a5c2b";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.258-commit-e168602';
+export const PROJECT_VERSION = '0.4.258-commit-24a5c2b';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.258-commit-e168602",
+  "version": "0.4.258-commit-24a5c2b",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -129,7 +129,7 @@
     "@babel/core": "^7.28.5",
     "@babel/types": "^7.28.5",
     "@brillout/import": "^0.2.6",
-    "@brillout/json-serializer": "^0.5.22",
+    "@brillout/json-serializer": "^0.5.23",
     "@brillout/picocolors": "^1.0.30",
     "@brillout/vite-plugin-server-entry": "0.7.18",
     "@universal-deploy/store": "^0.2.1",
@@ -271,6 +271,7 @@
     "@types/source-map-support": "^0.5.10",
     "react-streaming": "^0.4.17",
     "rimraf": "^6.1.3",
+    "rolldown": "1.0.0-rc.17",
     "typescript": "^5.9.3",
     "vite": "^7.2.6"
   },