vike 0.4.239 → 0.4.240

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

@@ -1,3 +1,4 @@
+// TO-DO/next-major-release: remove
 // Remove this workaround if the other workaround config.build.ssrEmitAssets turns out to be reliable.
 //  - Remove this file then revert this commit: https://github.com/vikejs/vike/commit/805a18974f13420a78fcc30fdd676696e405c3ca
 // Workaround to make client-side bundles include the CSS imports living in server-side-only code.
@@ -11,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';
@@ -22,6 +23,12 @@ const rawRE = /(\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;
 const EMPTY_MODULE_ID = 'virtual:vike:empty-module';
 const debug = createDebugger('vike:pluginExtractAssets');
+const filterRolldown = {
+    id: {
+        include: extractAssetsRE,
+    },
+};
+const filterFunction = (id) => extractAssetsRE.test(id);
 function pluginExtractAssets() {
     let config;
     let vikeConfig;
@@ -33,24 +40,25 @@ function pluginExtractAssets() {
             // In dev, things just work. (Because Vite's module graph erroneously conflates the Vite server-side importees with the client-side importees.)
             apply: 'build',
             enforce: 'post',
-            async transform(src, id, options) {
-                id = normalizeId(id);
-                if (!extractAssetsRE.test(id)) {
-                    return;
-                }
-                if (isFixEnabled) {
-                    // I'm guessing isFixEnabled can only be true when mixing both designs: https://github.com/vikejs/vike/issues/1480
-                    assertV1Design(vikeConfig._pageConfigs, true);
-                    assert(false);
-                }
-                const includeAssetsImportedByServer = resolveIncludeAssetsImportedByServer(vikeConfig.config);
-                assert(includeAssetsImportedByServer);
-                assert(!isViteServerSide_extraSafe(config, this.environment, options));
-                const importStatements = await getImportStatements(src);
-                const moduleNames = getImportedModules(importStatements);
-                const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
-                debugTransformResult(id, code, importStatements);
-                return rollupSourceMapRemove(code);
+            transform: {
+                filter: filterRolldown,
+                async handler(src, id, options) {
+                    id = normalizeId(id);
+                    assert(filterFunction(id));
+                    if (isFixEnabled) {
+                        // I'm guessing isFixEnabled can only be true when mixing both designs: https://github.com/vikejs/vike/issues/1480
+                        assertV1Design(vikeConfig._pageConfigs, true);
+                        assert(false);
+                    }
+                    const includeAssetsImportedByServer = resolveIncludeAssetsImportedByServer(vikeConfig.config);
+                    assert(includeAssetsImportedByServer);
+                    assert(!isViteServerSide_extraSafe(config, this.environment, options));
+                    const importStatements = await getImportStatements(src);
+                    const moduleNames = getImportedModules(importStatements);
+                    const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
+                    debugTransformResult(id, code, importStatements);
+                    return rollupSourceMapRemove(code);
+                },
             },
         },
         // This plugin appends `?extractAssets` to module IDs
@@ -61,89 +69,97 @@ function pluginExtractAssets() {
             //  - rollup's `alias` plugin; https://github.com/rollup/plugins/blob/5363f55aa1933b6c650832b08d6a54cb9ea64539/packages/alias/src/index.ts
             //  - Vite's `vite:resolve` plugin; https://github.com/vitejs/vite/blob/d649daba7682791178b711d9a3e44a6b5d00990c/packages/vite/src/node/plugins/resolve.ts#L105
             enforce: 'pre',
-            async resolveId(source, importer, options) {
-                if (isViteServerSide_extraSafe(config, this.environment, options)) {
-                    // When building for the server, there should never be a `?extractAssets` query
-                    assert(!extractAssetsRE.test(source));
-                    assert(importer === undefined || !extractAssetsRE.test(importer));
-                    return;
-                }
-                // If there is no `importer` then `module` is an entry.
-                // We don't need to append `?extractAssets` to entries because they already have `?extractAssets` as Vike appends `?extractAssets` to entries by using `import.meta.glob('/**/*.page.server.js', { as: "extractAssets" })` (see `generateImportGlobs.ts`).
-                if (!importer) {
-                    return;
-                }
-                // We only append `?extractAssets` if the parent module has `?extractAssets`
-                if (!extractAssetsRE.test(importer)) {
-                    return;
-                }
-                const includeAssetsImportedByServer = resolveIncludeAssetsImportedByServer(vikeConfig.config);
-                assert(includeAssetsImportedByServer);
-                let resolution = null;
-                try {
-                    resolution = await this.resolve(source, importer, { skipSelf: true, ...options });
-                }
-                catch { }
-                // Sometimes Rollup fails to resolve. If it fails to resolve, we assume the dependency to be an npm package and we skip it. (I guess Rollup should always be able to resolve local dependencies?)
-                if (!resolution)
-                    return emptyModule(source, importer);
-                const { id: file, external } = resolution;
-                // Nothing is externalized when building for the client-side
-                assert(external === false);
-                // We include:
-                //  - CSS(/LESS/SCSS/...) files
-                //  - Asset files (`.svg`, `.pdf`, ...)
-                //  - URL imports (e.g. `import scriptUrl from './script.js?url.js'`)
-                if (styleFileRE.test(file) || isAsset(file) || urlRE.test(file)) {
-                    debugOperation('INCLUDED', file, importer);
-                    return resolution;
-                }
-                // We erase `source` if its file doesn't contain JavaScript
-                if (!isScriptFile(file)) {
-                    return emptyModule(file, importer);
-                }
-                // If the import path resolves to a file in `node_modules/`, we ignore that file:
-                //  - Direct CSS dependencies are included though, such as `import 'bootstrap/theme/dark.css'`. (Because the above if-branch for CSS files will add the file.)
-                //  - Loading CSS from a library (living in `node_modules/`) in a non-direct way is unconventional; we can safely not support this case. (I'm not aware of any library that does this.)
-                assertPosixPath(file);
-                if (file.includes('/node_modules/')) {
-                    return emptyModule(file, importer);
-                }
-                // When a library is symlinked, it lives outside `root`.
-                assertPosixPath(config.root);
-                if (!file.startsWith(config.root)) {
-                    return emptyModule(file, importer);
-                }
-                return appendExtractAssetsQuery(file, importer);
+            resolveId: {
+                async handler(source, importer, options) {
+                    if (isViteServerSide_extraSafe(config, this.environment, options)) {
+                        // When building for the server, there should never be a `?extractAssets` query
+                        assert(!extractAssetsRE.test(source));
+                        assert(importer === undefined || !extractAssetsRE.test(importer));
+                        return;
+                    }
+                    // If there is no `importer` then `module` is an entry.
+                    // We don't need to append `?extractAssets` to entries because they already have `?extractAssets` as Vike appends `?extractAssets` to entries by using `import.meta.glob('/**/*.page.server.js', { as: "extractAssets" })` (see `generateImportGlobs.ts`).
+                    if (!importer) {
+                        return;
+                    }
+                    // We only append `?extractAssets` if the parent module has `?extractAssets`
+                    if (!extractAssetsRE.test(importer)) {
+                        return;
+                    }
+                    const includeAssetsImportedByServer = resolveIncludeAssetsImportedByServer(vikeConfig.config);
+                    assert(includeAssetsImportedByServer);
+                    let resolution = null;
+                    try {
+                        resolution = await this.resolve(source, importer, { skipSelf: true, ...options });
+                    }
+                    catch { }
+                    // Sometimes Rollup fails to resolve. If it fails to resolve, we assume the dependency to be an npm package and we skip it. (I guess Rollup should always be able to resolve local dependencies?)
+                    if (!resolution)
+                        return emptyModule(source, importer);
+                    const { id: file, external } = resolution;
+                    // Nothing is externalized when building for the client-side
+                    assert(external === false);
+                    // We include:
+                    //  - CSS(/LESS/SCSS/...) files
+                    //  - Asset files (`.svg`, `.pdf`, ...)
+                    //  - URL imports (e.g. `import scriptUrl from './script.js?url.js'`)
+                    if (styleFileRE.test(file) || isAsset(file) || urlRE.test(file)) {
+                        debugOperation('INCLUDED', file, importer);
+                        return resolution;
+                    }
+                    // We erase `source` if its file doesn't contain JavaScript
+                    if (!isScriptFile(file)) {
+                        return emptyModule(file, importer);
+                    }
+                    // If the import path resolves to a file in `node_modules/`, we ignore that file:
+                    //  - Direct CSS dependencies are included though, such as `import 'bootstrap/theme/dark.css'`. (Because the above if-branch for CSS files will add the file.)
+                    //  - Loading CSS from a library (living in `node_modules/`) in a non-direct way is unconventional; we can safely not support this case. (I'm not aware of any library that does this.)
+                    assertPosixPath(file);
+                    if (file.includes('/node_modules/')) {
+                        return emptyModule(file, importer);
+                    }
+                    // When a library is symlinked, it lives outside `root`.
+                    assertPosixPath(config.root);
+                    if (!file.startsWith(config.root)) {
+                        return emptyModule(file, importer);
+                    }
+                    return appendExtractAssetsQuery(file, importer);
+                },
             },
         },
         {
             name: 'vike:pluginExtractAssets-3',
             apply: 'build',
-            load(id) {
-                if (!isVirtualFileId(id))
-                    return undefined;
-                id = removeVirtualFileIdPrefix(id);
-                if (id === EMPTY_MODULE_ID) {
-                    return '// Erased by vike:pluginExtractAssets';
-                }
+            load: {
+                handler(id) {
+                    if (!isVirtualFileId(id))
+                        return undefined;
+                    id = removeVirtualFileIdPrefix(id);
+                    if (id === EMPTY_MODULE_ID) {
+                        return '// Erased by vike:pluginExtractAssets';
+                    }
+                },
             },
-            config() {
-                if (debug.isActivated) {
-                    return { logLevel: 'silent' };
-                }
+            config: {
+                handler() {
+                    if (debug.isActivated) {
+                        return { logLevel: 'silent' };
+                    }
+                },
             },
         },
         {
             name: 'vike:pluginExtractAssets-4',
-            async configResolved(config_) {
-                config = config_;
-                vikeConfig = await getVikeConfigInternal();
-                isFixEnabled = handleAssetsManifest_isFixEnabled();
-                if (!isFixEnabled) {
-                    // https://github.com/vikejs/vike/issues/1060
-                    assertUsage(!config.plugins.find((p) => p.name === 'vite-tsconfig-paths'), 'vite-tsconfig-paths not supported, remove it and use vite.config.js#resolve.alias instead');
-                }
+            configResolved: {
+                async handler(config_) {
+                    config = config_;
+                    vikeConfig = await getVikeConfigInternal();
+                    isFixEnabled = handleAssetsManifest_isFixEnabled();
+                    if (!isFixEnabled) {
+                        // https://github.com/vikejs/vike/issues/1060
+                        assertUsage(!config.plugins.find((p) => p.name === 'vite-tsconfig-paths'), 'vite-tsconfig-paths not supported, remove it and use vite.config.js#resolve.alias instead');
+                    }
+                },
             },
         },
     ];

package/dist/esm/node/vite/plugins/pluginExtractExportNames.d.ts

@@ -3,5 +3,5 @@ export { isUsingClientRouter };
 export { extractExportNamesRE };
 import type { Plugin } from 'vite';
 declare const extractExportNamesRE: RegExp;
-declare function pluginExtractExportNames(): Plugin;
+declare function pluginExtractExportNames(): Plugin[];
 declare function isUsingClientRouter(): boolean;

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

@@ -8,33 +8,49 @@ import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 const debug = createDebugger('vike:pluginExtractExportNames');
 const globalObject = getGlobalObject('plugins/pluginExtractExportNames.ts', {});
+const filterRolldown = {
+    id: {
+        include: extractExportNamesRE,
+    },
+};
+const filterFunction = (id) => extractExportNamesRE.test(id);
 function pluginExtractExportNames() {
     let isDev = false;
     let config;
-    return {
-        name: 'vike:pluginExtractExportNames',
-        enforce: 'post',
-        async transform(src, id, options) {
-            id = normalizeId(id);
-            const isClientSide = !isViteServerSide_extraSafe(config, this.environment, options);
-            if (extractExportNamesRE.test(id)) {
-                const code = await getExtractExportNamesCode(src, isClientSide, !isDev, id);
-                debug('id ' + id, ['result:\n' + code.code.trim(), 'src:\n' + src.trim()]);
-                return code;
-            }
+    return [
+        {
+            name: 'vike:pluginExtractExportNames',
+            enforce: 'post',
+            transform: {
+                filter: filterRolldown,
+                async handler(src, id, options) {
+                    id = normalizeId(id);
+                    const isClientSide = !isViteServerSide_extraSafe(config, this.environment, options);
+                    assert(filterFunction(id));
+                    const code = await getExtractExportNamesCode(src, isClientSide, !isDev, id);
+                    debug('id ' + id, ['result:\n' + code.code.trim(), 'src:\n' + src.trim()]);
+                    return code;
+                },
+            },
+            configureServer: {
+                handler() {
+                    isDev = true;
+                },
+            },
+            configResolved: {
+                handler(config_) {
+                    config = config_;
+                },
+            },
+            config: {
+                handler() {
+                    if (debug.isActivated) {
+                        return { logLevel: 'silent' };
+                    }
+                },
+            },
         },
-        configureServer() {
-            isDev = true;
-        },
-        configResolved(config_) {
-            config = config_;
-        },
-        config() {
-            if (debug.isActivated) {
-                return { logLevel: 'silent' };
-            }
-        },
-    };
+    ];
 }
 async function getExtractExportNamesCode(src, isClientSide, isProduction, id) {
     const { exportNames, wildcardReExports } = await getExportNames(src);

package/dist/esm/node/vite/plugins/pluginFileEnv.d.ts

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

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

@@ -8,75 +8,104 @@ import { getExportNames } from '../shared/parseEsModule.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isV1Design } from '../shared/resolveVikeConfigInternal.js';
 import { isViteServerSide, isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
+const skipNodeModules = '/node_modules/'; // Only apply `.server.js` and `.client.js` to user files
+const filterRolldown = {
+    id: {
+        include: ['client', 'server'].map((env) => `**/*${getSuffix(env)}*`),
+        exclude: [`**${skipNodeModules}**`],
+    },
+};
+const filterFunction = (id) => {
+    if (id.includes(skipNodeModules))
+        return false;
+    if (!id.includes(getSuffix('client')) && !id.includes(getSuffix('server')))
+        return false;
+    return true;
+};
 function pluginFileEnv() {
     let config;
     let viteDevServer;
-    return {
-        name: 'vike:pluginFileEnv',
-        load(id, options) {
-            // In build, we use generateBundle() instead of the load() hook. Using load() works for dynamic imports in dev thanks to Vite's lazy transpiling, but it doesn't work in build because Rollup transpiles any dynamically imported module even if it's never actually imported.
-            if (!viteDevServer)
-                return;
-            if (!isV1Design())
-                return;
-            if (skip(id))
-                return;
-            // For `.vue` files: https://github.com/vikejs/vike/issues/1912#issuecomment-2394981475
-            if (id.endsWith('?direct'))
-                id = id.slice(0, -1 * '?direct'.length);
-            const moduleInfo = viteDevServer.moduleGraph.getModuleById(id);
-            assert(moduleInfo);
-            const importers = Array.from(moduleInfo.importers)
-                .map((m) => m.id)
-                .filter((id) => id !== null);
-            assertFileEnv(id, isViteServerSide_extraSafe(config, this.environment, options), importers, 
-            // In dev, we only show a warning because we don't want to disrupt when the user plays with settings such as [ssr](https://vike.dev/ssr).
-            true);
-        },
-        // In production, we have to use transform() to replace modules with a runtime error because generateBundle() doesn't work for dynamic imports. In production, dynamic imports can only be verified at runtime.
-        async transform(code, id, options) {
-            id = normalizeId(id);
-            // In dev, only using load() is enough as it also works for dynamic imports (see sibling comment).
-            if (viteDevServer)
-                return;
-            if (skip(id))
-                return;
-            const isServerSide = isViteServerSide_extraSafe(config, this.environment, options);
-            if (!isWrongEnv(id, isServerSide))
-                return;
-            const { importers } = this.getModuleInfo(id);
-            // Throwing a verbose error doesn't waste client-side KBs as dynamic imports are code split.
-            const errMsg = getErrorMessage(id, isServerSide, importers, false, true);
-            // We have to inject empty exports to avoid Rollup complaining about missing exports, see https://gist.github.com/brillout/5ea45776e65bd65100a52ecd7bfda3ff
-            const { exportNames } = await getExportNames(code);
-            return rollupSourceMapRemove([
-                `throw new Error(${JSON.stringify(errMsg)});`,
-                ...exportNames.map((name) => name === 'default' ? 'export default undefined;' : `export const ${name} = undefined;`),
-            ].join('\n'));
-        },
-        generateBundle() {
-            Array.from(this.getModuleIds())
-                .filter((id) => !skip(id))
-                .forEach((moduleId) => {
-                const mod = this.getModuleInfo(moduleId);
-                const { importers } = mod;
-                if (importers.length === 0) {
-                    // Dynamic imports can only be verified at runtime
-                    /* This assertion can fail: https://github.com/vikejs/vike/issues/2227
-                    assert(dynamicImporters.length > 0)
-                    */
-                    return;
-                }
-                assertFileEnv(moduleId, isViteServerSide(config, this.environment), importers, false);
-            });
-        },
-        configResolved(config_) {
-            config = config_;
-        },
-        configureServer(viteDevServer_) {
-            viteDevServer = viteDevServer_;
+    return [
+        {
+            name: 'vike:pluginFileEnv',
+            load: {
+                filter: filterRolldown,
+                handler(id, options) {
+                    // In build, we use generateBundle() instead of the load() hook. Using load() works for dynamic imports in dev thanks to Vite's lazy transpiling, but it doesn't work in build because Rollup transpiles any dynamically imported module even if it's never actually imported.
+                    if (!viteDevServer)
+                        return;
+                    if (!isV1Design())
+                        return;
+                    if (skip(id, config.root))
+                        return;
+                    // For `.vue` files: https://github.com/vikejs/vike/issues/1912#issuecomment-2394981475
+                    if (id.endsWith('?direct'))
+                        id = id.slice(0, -1 * '?direct'.length);
+                    const moduleInfo = viteDevServer.moduleGraph.getModuleById(id);
+                    assert(moduleInfo);
+                    const importers = Array.from(moduleInfo.importers)
+                        .map((m) => m.id)
+                        .filter((id) => id !== null);
+                    assertFileEnv(id, isViteServerSide_extraSafe(config, this.environment, options), importers, 
+                    // In dev, we only show a warning because we don't want to disrupt when the user plays with settings such as [ssr](https://vike.dev/ssr).
+                    true);
+                },
+            },
+            // In production, we have to use transform() to replace modules with a runtime error because generateBundle() doesn't work for dynamic imports. In production, dynamic imports can only be verified at runtime.
+            transform: {
+                filter: filterRolldown,
+                async handler(code, id, options) {
+                    id = normalizeId(id);
+                    // In dev, only using load() is enough as it also works for dynamic imports (see sibling comment).
+                    if (viteDevServer)
+                        return;
+                    if (skip(id, config.root))
+                        return;
+                    const isServerSide = isViteServerSide_extraSafe(config, this.environment, options);
+                    if (!isWrongEnv(id, isServerSide))
+                        return;
+                    const { importers } = this.getModuleInfo(id);
+                    // Throwing a verbose error doesn't waste client-side KBs as dynamic imports are code split.
+                    const errMsg = getErrorMessage(id, isServerSide, importers, false, true);
+                    // We have to inject empty exports to avoid Rollup complaining about missing exports, see https://gist.github.com/brillout/5ea45776e65bd65100a52ecd7bfda3ff
+                    const { exportNames } = await getExportNames(code);
+                    return rollupSourceMapRemove([
+                        `throw new Error(${JSON.stringify(errMsg)});`,
+                        ...exportNames.map((name) => name === 'default' ? 'export default undefined;' : `export const ${name} = undefined;`),
+                    ].join('\n'));
+                },
+            },
+            generateBundle: {
+                handler() {
+                    Array.from(this.getModuleIds())
+                        .filter(filterFunction)
+                        .filter((id) => !skip(id, config.root))
+                        .forEach((moduleId) => {
+                        const mod = this.getModuleInfo(moduleId);
+                        const { importers } = mod;
+                        if (importers.length === 0) {
+                            // Dynamic imports can only be verified at runtime
+                            /* This assertion can fail: https://github.com/vikejs/vike/issues/2227
+                        assert(dynamicImporters.length > 0)
+                        */
+                            return;
+                        }
+                        assertFileEnv(moduleId, isViteServerSide(config, this.environment), importers, false);
+                    });
+                },
+            },
+            configResolved: {
+                handler(config_) {
+                    config = config_;
+                },
+            },
+            configureServer: {
+                handler(viteDevServer_) {
+                    viteDevServer = viteDevServer_;
+                },
+            },
         },
-    };
+    ];
     function assertFileEnv(moduleId, isServerSide, importers, onlyWarn) {
         if (!isWrongEnv(moduleId, isServerSide))
             return;
@@ -114,31 +143,27 @@ function pluginFileEnv() {
         }
         return errMsg;
     }
-    function isWrongEnv(moduleId, isServerSide) {
-        const modulePath = getModulePath(moduleId);
-        const suffixWrong = getSuffix(isServerSide ? 'client' : 'server');
-        return modulePath.includes(suffixWrong);
-    }
-    function skip(id) {
-        // TO-DO/next-major-release: remove
-        if (extractAssetsRE.test(id) || extractExportNamesRE.test(id))
-            return true;
-        if (!id.includes(getSuffix('client')) && !id.includes(getSuffix('server')))
-            return true;
-        if (getModulePath(id).endsWith('.css'))
-            return true;
-        // Apply `.server.js` and `.client.js` only to user files
-        if (id.includes('/node_modules/'))
-            return true;
-        // Only user files
-        if (!id.startsWith(config.root))
-            return true;
-        return false;
-    }
-    function getSuffix(env) {
-        return `.${env}.`;
-    }
-    function getModulePath(moduleId) {
-        return moduleId.split('?')[0];
-    }
+}
+function isWrongEnv(moduleId, isServerSide) {
+    const modulePath = getModulePath(moduleId);
+    const suffixWrong = getSuffix(isServerSide ? 'client' : 'server');
+    return modulePath.includes(suffixWrong);
+}
+function skip(id, userRootDir) {
+    assert(filterFunction(id));
+    // TO-DO/next-major-release: remove
+    if (extractAssetsRE.test(id) || extractExportNamesRE.test(id))
+        return true;
+    if (getModulePath(id).endsWith('.css'))
+        return true;
+    // Skip linked dependencies
+    if (!id.startsWith(userRootDir))
+        return true;
+    return false;
+}
+function getSuffix(env) {
+    return `.${env}.`;
+}
+function getModulePath(moduleId) {
+    return moduleId.split('?')[0];
 }

package/dist/esm/node/vite/plugins/pluginPreview.d.ts

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