vike 0.4.211 → 0.4.212

package/dist/cjs/node/plugin/plugins/buildConfig/fixServerAssets.js

@@ -34,9 +34,9 @@ async function fixServerAssets(config) {
     const outDirs = (0, utils_js_1.getOutDirs)(config);
     const clientManifest = await loadManifest(outDirs.outDirClient);
     const serverManifest = await loadManifest(outDirs.outDirServer);
-    const { clientManifestMod, filesToCopy } = addServerAssets(clientManifest, serverManifest);
-    await copyAssets(filesToCopy, config);
-    return clientManifestMod;
+    const { clientManifestMod, serverManifestMod, filesToCopy, filesToRemove } = addServerAssets(clientManifest, serverManifest);
+    await copyAssets(filesToCopy, filesToRemove, config);
+    return { clientManifestMod, serverManifestMod };
 }
 async function loadManifest(outDir) {
     const manifestFilePath = path_1.default.posix.join(outDir, buildConfig_js_1.manifestTempFile);
@@ -46,11 +46,11 @@ async function loadManifest(outDir) {
     (0, utils_js_1.assert)(manifest);
     return manifest;
 }
-async function copyAssets(filesToCopy, config) {
+async function copyAssets(filesToCopy, filesToRemove, config) {
     const { outDirClient, outDirServer } = (0, utils_js_1.getOutDirs)(config);
     const assetsDir = (0, getAssetsDir_js_1.getAssetsDir)(config);
     const assetsDirServer = path_1.default.posix.join(outDirServer, assetsDir);
-    if (!filesToCopy.length)
+    if (!filesToCopy.length && !filesToRemove.length && !(0, fs_2.existsSync)(assetsDirServer))
         return;
     (0, utils_js_1.assert)((0, fs_2.existsSync)(assetsDirServer));
     const concurrencyLimit = (0, utils_js_1.pLimit)(10);
@@ -60,6 +60,10 @@ async function copyAssets(filesToCopy, config) {
         await promises_1.default.mkdir(path_1.default.posix.dirname(target), { recursive: true });
         await promises_1.default.rename(source, target);
     })));
+    filesToRemove.forEach((file) => {
+        const filePath = path_1.default.posix.join(outDirServer, file);
+        fs_1.default.unlinkSync(filePath);
+    });
     /* We cannot do that because, with some edge case Rollup settings (outputing JavaScript chunks and static assets to the same directoy), this removes JavaScript chunks, see https://github.com/vikejs/vike/issues/1154#issuecomment-1975762404
     await fs.rm(assetsDirServer, { recursive: true })
     */
@@ -67,7 +71,7 @@ async function copyAssets(filesToCopy, config) {
 }
 // Add serverManifest resources to clientManifest
 function addServerAssets(clientManifest, serverManifest) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const entriesClient = new Map();
     const entriesServer = new Map();
     for (const [key, entry] of Object.entries(clientManifest)) {
@@ -84,36 +88,64 @@ function addServerAssets(clientManifest, serverManifest) {
             continue;
         const resources = collectResources(entry, serverManifest);
         (0, utils_js_1.assert)(!entriesServer.has(pageId));
-        entriesServer.set(pageId, resources);
+        entriesServer.set(pageId, { key, ...resources });
     }
     let filesToCopy = [];
+    let filesToRemove = [];
     for (const [pageId, entryClient] of entriesClient.entries()) {
+        const entryServer = entriesServer.get(pageId);
+        if (!entryServer)
+            continue;
         const cssToAdd = [];
+        const cssToRemove = [];
         const assetsToAdd = [];
-        const entryServer = entriesServer.get(pageId);
-        if (entryServer) {
-            cssToAdd.push(...entryServer.css
-                .filter((cssServer) => !entryClient.css.some((cssClient) => cssServer.hash === cssClient.hash))
-                .map((css) => css.src));
-            assetsToAdd.push(...entryServer.assets
-                .filter((assertServer) => !entryClient.assets.some((assetClient) => assertServer.hash === assetClient.hash))
-                .map((asset) => asset.src));
-        }
-        const { key } = entryClient;
+        const assetsToRemove = [];
+        entryServer.css.forEach((cssServer) => {
+            if (!entryClient.css.some((cssClient) => cssServer.hash === cssClient.hash)) {
+                cssToAdd.push(cssServer.src);
+            }
+            else {
+                cssToRemove.push(cssServer.src);
+            }
+        });
+        entryServer.assets.forEach((assetServer) => {
+            if (!entryClient.assets.some((assetClient) => assetServer.hash === assetClient.hash)) {
+                assetsToAdd.push(assetServer.src);
+            }
+            else {
+                assetsToRemove.push(assetServer.src);
+            }
+        });
         if (cssToAdd.length) {
+            const { key } = entryClient;
             filesToCopy.push(...cssToAdd);
             (_a = clientManifest[key]).css ?? (_a.css = []);
             clientManifest[key].css?.push(...cssToAdd);
         }
+        if (cssToRemove.length) {
+            const { key } = entryServer;
+            filesToRemove.push(...cssToRemove);
+            (_b = serverManifest[key]).css ?? (_b.css = []);
+            serverManifest[key].css = serverManifest[key].css.filter((entry) => !cssToRemove.includes(entry));
+        }
         if (assetsToAdd.length) {
+            const { key } = entryClient;
             filesToCopy.push(...assetsToAdd);
-            (_b = clientManifest[key]).assets ?? (_b.assets = []);
+            (_c = clientManifest[key]).assets ?? (_c.assets = []);
             clientManifest[key].assets?.push(...assetsToAdd);
         }
+        if (assetsToRemove.length) {
+            const { key } = entryServer;
+            filesToRemove.push(...assetsToRemove);
+            (_d = serverManifest[key]).assets ?? (_d.assets = []);
+            serverManifest[key].assets = serverManifest[key].assets.filter((entry) => !assetsToRemove.includes(entry));
+        }
     }
     const clientManifestMod = clientManifest;
+    const serverManifestMod = serverManifest;
     filesToCopy = (0, utils_js_1.unique)(filesToCopy);
-    return { clientManifestMod, filesToCopy };
+    filesToRemove = (0, utils_js_1.unique)(filesToRemove).filter((file) => !filesToCopy.includes(file));
+    return { clientManifestMod, serverManifestMod, filesToCopy, filesToRemove };
 }
 function getPageId(key) {
     // Normalize from:

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

@@ -100,7 +100,7 @@ function buildConfig() {
                             await promises_1.default.copyFile(clientManifestFilePath, assetsJsonFilePath);
                         }
                         else {
-                            const clientManifestMod = await (0, fixServerAssets_js_1.fixServerAssets)(config);
+                            const { clientManifestMod } = await (0, fixServerAssets_js_1.fixServerAssets)(config);
                             await promises_1.default.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
                         }
                         await promises_1.default.rm(clientManifestFilePath);

package/dist/cjs/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.js

@@ -60,7 +60,7 @@ function determineInjection({ fileType, isForClientSide, isClientRouting, isPrer
     }
 }
 async function generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, configVike, isPrerendering, config, isDev, id) {
-    let fileContent = `// Generatead by node/plugin/plugins/virtualFiles/index.ts
+    let fileContent = `// Generated by https://github.com/vikejs/vike/blob/main/vike/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.ts
 
 export const pageFilesLazy = {};
 export const pageFilesEager = {};

package/dist/cjs/node/runtime/renderPage/getPageAssets/retrieveAssetsDev.js

@@ -61,13 +61,13 @@ function collectCss(mod, styleUrls, visitedModules, importer) {
     });
 }
 function isStyle(mod) {
-    if (utils_js_1.styleFileRE.test(mod.url) || (mod.id && /\?vue&type=style/.test(mod.id))) {
-        // `mod.type` seems broken
-        (0, utils_js_1.assert)(mod.type === 'js');
-        // logModule(mod)
-        return true;
-    }
-    return false;
+    return (
+    // CSS-in-JS libraries such as [wyw-in-js](https://github.com/vikejs/vike/issues/2039)
+    mod.type === 'css' ||
+        // .css, .less, ...
+        utils_js_1.styleFileRE.test(mod.url) ||
+        // CSS of .vue files
+        (mod.id && /\?vue&type=style/.test(mod.id)));
 }
 /*
 function logModule(mod: ModuleNode) {

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.211';
+exports.PROJECT_VERSION = '0.4.212';

package/dist/esm/node/plugin/plugins/buildConfig/fixServerAssets.d.ts

@@ -13,7 +13,10 @@ import { ResolvedConfig } from 'vite';
  */
 declare function fixServerAssets_isEnabled(): boolean;
 /** https://github.com/vikejs/vike/issues/1339 */
-declare function fixServerAssets(config: ResolvedConfig): Promise<ViteManifest>;
+declare function fixServerAssets(config: ResolvedConfig): Promise<{
+    clientManifestMod: ViteManifest;
+    serverManifestMod: ViteManifest;
+}>;
 declare function fixServerAssets_assertCssCodeSplit(config: ResolvedConfig): void;
 declare function fixServerAssets_assertCssTarget_populate(config: ResolvedConfig): void;
 declare function fixServerAssets_assertCssTarget(config: ResolvedConfig): Promise<void>;

package/dist/esm/node/plugin/plugins/buildConfig/fixServerAssets.js

@@ -29,9 +29,9 @@ async function fixServerAssets(config) {
     const outDirs = getOutDirs(config);
     const clientManifest = await loadManifest(outDirs.outDirClient);
     const serverManifest = await loadManifest(outDirs.outDirServer);
-    const { clientManifestMod, filesToCopy } = addServerAssets(clientManifest, serverManifest);
-    await copyAssets(filesToCopy, config);
-    return clientManifestMod;
+    const { clientManifestMod, serverManifestMod, filesToCopy, filesToRemove } = addServerAssets(clientManifest, serverManifest);
+    await copyAssets(filesToCopy, filesToRemove, config);
+    return { clientManifestMod, serverManifestMod };
 }
 async function loadManifest(outDir) {
     const manifestFilePath = path.posix.join(outDir, manifestTempFile);
@@ -41,11 +41,11 @@ async function loadManifest(outDir) {
     assert(manifest);
     return manifest;
 }
-async function copyAssets(filesToCopy, config) {
+async function copyAssets(filesToCopy, filesToRemove, config) {
     const { outDirClient, outDirServer } = getOutDirs(config);
     const assetsDir = getAssetsDir(config);
     const assetsDirServer = path.posix.join(outDirServer, assetsDir);
-    if (!filesToCopy.length)
+    if (!filesToCopy.length && !filesToRemove.length && !existsSync(assetsDirServer))
         return;
     assert(existsSync(assetsDirServer));
     const concurrencyLimit = pLimit(10);
@@ -55,6 +55,10 @@ async function copyAssets(filesToCopy, config) {
         await fs.mkdir(path.posix.dirname(target), { recursive: true });
         await fs.rename(source, target);
     })));
+    filesToRemove.forEach((file) => {
+        const filePath = path.posix.join(outDirServer, file);
+        fs_sync.unlinkSync(filePath);
+    });
     /* We cannot do that because, with some edge case Rollup settings (outputing JavaScript chunks and static assets to the same directoy), this removes JavaScript chunks, see https://github.com/vikejs/vike/issues/1154#issuecomment-1975762404
     await fs.rm(assetsDirServer, { recursive: true })
     */
@@ -62,7 +66,7 @@ async function copyAssets(filesToCopy, config) {
 }
 // Add serverManifest resources to clientManifest
 function addServerAssets(clientManifest, serverManifest) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const entriesClient = new Map();
     const entriesServer = new Map();
     for (const [key, entry] of Object.entries(clientManifest)) {
@@ -79,36 +83,64 @@ function addServerAssets(clientManifest, serverManifest) {
             continue;
         const resources = collectResources(entry, serverManifest);
         assert(!entriesServer.has(pageId));
-        entriesServer.set(pageId, resources);
+        entriesServer.set(pageId, { key, ...resources });
     }
     let filesToCopy = [];
+    let filesToRemove = [];
     for (const [pageId, entryClient] of entriesClient.entries()) {
+        const entryServer = entriesServer.get(pageId);
+        if (!entryServer)
+            continue;
         const cssToAdd = [];
+        const cssToRemove = [];
         const assetsToAdd = [];
-        const entryServer = entriesServer.get(pageId);
-        if (entryServer) {
-            cssToAdd.push(...entryServer.css
-                .filter((cssServer) => !entryClient.css.some((cssClient) => cssServer.hash === cssClient.hash))
-                .map((css) => css.src));
-            assetsToAdd.push(...entryServer.assets
-                .filter((assertServer) => !entryClient.assets.some((assetClient) => assertServer.hash === assetClient.hash))
-                .map((asset) => asset.src));
-        }
-        const { key } = entryClient;
+        const assetsToRemove = [];
+        entryServer.css.forEach((cssServer) => {
+            if (!entryClient.css.some((cssClient) => cssServer.hash === cssClient.hash)) {
+                cssToAdd.push(cssServer.src);
+            }
+            else {
+                cssToRemove.push(cssServer.src);
+            }
+        });
+        entryServer.assets.forEach((assetServer) => {
+            if (!entryClient.assets.some((assetClient) => assetServer.hash === assetClient.hash)) {
+                assetsToAdd.push(assetServer.src);
+            }
+            else {
+                assetsToRemove.push(assetServer.src);
+            }
+        });
         if (cssToAdd.length) {
+            const { key } = entryClient;
             filesToCopy.push(...cssToAdd);
             (_a = clientManifest[key]).css ?? (_a.css = []);
             clientManifest[key].css?.push(...cssToAdd);
         }
+        if (cssToRemove.length) {
+            const { key } = entryServer;
+            filesToRemove.push(...cssToRemove);
+            (_b = serverManifest[key]).css ?? (_b.css = []);
+            serverManifest[key].css = serverManifest[key].css.filter((entry) => !cssToRemove.includes(entry));
+        }
         if (assetsToAdd.length) {
+            const { key } = entryClient;
             filesToCopy.push(...assetsToAdd);
-            (_b = clientManifest[key]).assets ?? (_b.assets = []);
+            (_c = clientManifest[key]).assets ?? (_c.assets = []);
             clientManifest[key].assets?.push(...assetsToAdd);
         }
+        if (assetsToRemove.length) {
+            const { key } = entryServer;
+            filesToRemove.push(...assetsToRemove);
+            (_d = serverManifest[key]).assets ?? (_d.assets = []);
+            serverManifest[key].assets = serverManifest[key].assets.filter((entry) => !assetsToRemove.includes(entry));
+        }
     }
     const clientManifestMod = clientManifest;
+    const serverManifestMod = serverManifest;
     filesToCopy = unique(filesToCopy);
-    return { clientManifestMod, filesToCopy };
+    filesToRemove = unique(filesToRemove).filter((file) => !filesToCopy.includes(file));
+    return { clientManifestMod, serverManifestMod, filesToCopy, filesToRemove };
 }
 function getPageId(key) {
     // Normalize from:

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

@@ -94,7 +94,7 @@ function buildConfig() {
                             await fs.copyFile(clientManifestFilePath, assetsJsonFilePath);
                         }
                         else {
-                            const clientManifestMod = await fixServerAssets(config);
+                            const { clientManifestMod } = await fixServerAssets(config);
                             await fs.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
                         }
                         await fs.rm(clientManifestFilePath);

package/dist/esm/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.js

@@ -55,7 +55,7 @@ function determineInjection({ fileType, isForClientSide, isClientRouting, isPrer
     }
 }
 async function generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, configVike, isPrerendering, config, isDev, id) {
-    let fileContent = `// Generatead by node/plugin/plugins/virtualFiles/index.ts
+    let fileContent = `// Generated by https://github.com/vikejs/vike/blob/main/vike/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.ts
 
 export const pageFilesLazy = {};
 export const pageFilesEager = {};

package/dist/esm/node/runtime/renderPage/getPageAssets/retrieveAssetsDev.js

@@ -59,13 +59,13 @@ function collectCss(mod, styleUrls, visitedModules, importer) {
     });
 }
 function isStyle(mod) {
-    if (styleFileRE.test(mod.url) || (mod.id && /\?vue&type=style/.test(mod.id))) {
-        // `mod.type` seems broken
-        assert(mod.type === 'js');
-        // logModule(mod)
-        return true;
-    }
-    return false;
+    return (
+    // CSS-in-JS libraries such as [wyw-in-js](https://github.com/vikejs/vike/issues/2039)
+    mod.type === 'css' ||
+        // .css, .less, ...
+        styleFileRE.test(mod.url) ||
+        // CSS of .vue files
+        (mod.id && /\?vue&type=style/.test(mod.id)));
 }
 /*
 function logModule(mod: ModuleNode) {

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.211";
+export declare const PROJECT_VERSION: "0.4.212";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.211';
+export const PROJECT_VERSION = '0.4.212';

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.211";
+    projectVersion: "0.4.212";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.211",
+  "version": "0.4.212",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {