vike 0.4.239-commit-59f1017 → 0.4.239-commit-4d0d950

package/dist/esm/node/vite/plugins/pluginBuild/pluginDistPackageJsonFile.js

@@ -3,30 +3,32 @@ import { rollupIsEsm } from '../../shared/rollupIsEsm.js';
 import { isViteServerSide } from '../../shared/isViteServerSide.js';
 function pluginDistPackageJsonFile() {
     let config;
-    return {
-        name: 'vike:build:pluginDistPackageJsonFile',
-        apply: 'build',
-        configResolved: {
-            handler(config_) {
-                config = config_;
+    return [
+        {
+            name: 'vike:build:pluginDistPackageJsonFile',
+            apply: 'build',
+            configResolved: {
+                handler(config_) {
+                    config = config_;
+                },
             },
-        },
-        generateBundle: {
-            handler(options, bundle) {
-                if (!isViteServerSide(config, this.environment))
-                    return;
-                const isEsm = rollupIsEsm(options);
-                const fileName = 'package.json';
-                if (bundle[fileName])
-                    return; // E.g. already generated by Telefunc / vike
-                this.emitFile({
-                    fileName,
-                    type: 'asset',
-                    source: getPackageJsonContent(isEsm),
-                });
+            generateBundle: {
+                handler(options, bundle) {
+                    if (!isViteServerSide(config, this.environment))
+                        return;
+                    const isEsm = rollupIsEsm(options);
+                    const fileName = 'package.json';
+                    if (bundle[fileName])
+                        return; // E.g. already generated by Telefunc / vike
+                    this.emitFile({
+                        fileName,
+                        type: 'asset',
+                        source: getPackageJsonContent(isEsm),
+                    });
+                },
             },
         },
-    };
+    ];
 }
 function getPackageJsonContent(isEsm) {
     if (isEsm) {

package/dist/esm/node/vite/plugins/pluginBuild/pluginModuleBanner.d.ts

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

package/dist/esm/node/vite/plugins/pluginBuild/pluginModuleBanner.js

@@ -5,43 +5,45 @@ import { getMagicString } from '../../shared/getMagicString.js';
 // But, anyways, we want to prepend the banner at the beginning of each module, not at the beginning of each file (I believe that's what Rollup's banner feature does).
 function pluginModuleBanner() {
     let config;
-    return {
-        name: 'vike:build:pluginModuleBanner',
-        enforce: 'post',
-        apply: 'build',
-        applyToEnvironment(environment) {
-            const { config } = environment;
-            const { consumer } = config;
-            const { minify } = config.build;
-            assert(minify === false || minify, { minify, consumer });
-            return !minify;
-        },
-        configResolved: {
-            handler(config_) {
-                config = config_;
+    return [
+        {
+            name: 'vike:build:pluginModuleBanner',
+            enforce: 'post',
+            apply: 'build',
+            applyToEnvironment(environment) {
+                const { config } = environment;
+                const { consumer } = config;
+                const { minify } = config.build;
+                assert(minify === false || minify, { minify, consumer });
+                return !minify;
             },
-        },
-        transform: {
-            order: 'post',
-            /* Using a Rolldown hook filter doesn't make sense here — we use applyToEnvironment() to conditionally apply this plugin.
-            filter: {},
-            */
-            handler(code, id) {
-                const { minify } = this.environment.config.build;
-                assert(minify === false, { minify });
-                if (id.startsWith('\0'))
-                    id = id;
-                id = removeVirtualFileIdPrefix(id);
-                if (id.startsWith(config.root))
-                    id = id.slice(config.root.length + 1);
-                id = id.replaceAll('*/', '*\\/'); // https://github.com/vikejs/vike/issues/2377
-                const { magicString, getMagicStringResult } = getMagicString(code, id);
-                // Use legal comment so that esbuild doesn't remove it.
-                // - Terser still removes the comment, but I guess users use terser to minify JavaScript so I guess it's a good thing that comment is removed.
-                // - https://esbuild.github.io/api/#legal-comments
-                magicString.prepend(`/*! ${id} [vike:pluginModuleBanner] */\n`);
-                return getMagicStringResult();
+            configResolved: {
+                handler(config_) {
+                    config = config_;
+                },
+            },
+            transform: {
+                order: 'post',
+                /* Using a Rolldown hook filter doesn't make sense here — we use applyToEnvironment() to conditionally apply this plugin.
+              filter: {},
+              */
+                handler(code, id) {
+                    const { minify } = this.environment.config.build;
+                    assert(minify === false, { minify });
+                    if (id.startsWith('\0'))
+                        id = id;
+                    id = removeVirtualFileIdPrefix(id);
+                    if (id.startsWith(config.root))
+                        id = id.slice(config.root.length + 1);
+                    id = id.replaceAll('*/', '*\\/'); // https://github.com/vikejs/vike/issues/2377
+                    const { magicString, getMagicStringResult } = getMagicString(code, id);
+                    // Use legal comment so that esbuild doesn't remove it.
+                    // - Terser still removes the comment, but I guess users use terser to minify JavaScript so I guess it's a good thing that comment is removed.
+                    // - https://esbuild.github.io/api/#legal-comments
+                    magicString.prepend(`/*! ${id} [vike:pluginModuleBanner] */\n`);
+                    return getMagicStringResult();
+                },
             },
         },
-    };
+    ];
 }

package/dist/esm/node/vite/plugins/pluginBuild/pluginSuppressRollupWarning.d.ts

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

package/dist/esm/node/vite/plugins/pluginBuild/pluginSuppressRollupWarning.js

@@ -1,32 +1,34 @@
 // Suppress Rollup warnings `Generated an empty chunk: "index.page.server"`
 export { pluginSuppressRollupWarning };
 function pluginSuppressRollupWarning() {
-    return {
-        name: 'vike:build:pluginSuppressRollupWarning',
-        apply: 'build',
-        enforce: 'post',
-        configResolved: {
-            async handler(config) {
-                const onWarnOriginal = config.build.rollupOptions.onwarn;
-                config.build.rollupOptions.onwarn = function (warning, warn) {
-                    // Suppress
-                    if (suppressUnusedImport(warning))
-                        return;
-                    if (suppressEmptyBundle(warning))
-                        return;
-                    if (suppressUseClientDirective(warning))
-                        return;
-                    // Pass through
-                    if (onWarnOriginal) {
-                        onWarnOriginal.apply(this, arguments);
-                    }
-                    else {
-                        warn(warning);
-                    }
-                };
+    return [
+        {
+            name: 'vike:build:pluginSuppressRollupWarning',
+            apply: 'build',
+            enforce: 'post',
+            configResolved: {
+                async handler(config) {
+                    const onWarnOriginal = config.build.rollupOptions.onwarn;
+                    config.build.rollupOptions.onwarn = function (warning, warn) {
+                        // Suppress
+                        if (suppressUnusedImport(warning))
+                            return;
+                        if (suppressEmptyBundle(warning))
+                            return;
+                        if (suppressUseClientDirective(warning))
+                            return;
+                        // Pass through
+                        if (onWarnOriginal) {
+                            onWarnOriginal.apply(this, arguments);
+                        }
+                        else {
+                            warn(warning);
+                        }
+                    };
+                },
             },
         },
-    };
+    ];
 }
 /** Suppress warning about Rollup removing the React Server Components `"use client";` directives */
 function suppressUseClientDirective(warning) {

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

@@ -3,7 +3,6 @@ import { searchForWorkspaceRoot } from 'vite';
 import path from 'node:path';
 import { assert, assertPosixPath, getPackageNodeModulesDirectory } from '../../utils.js';
 import { fileURLToPath } from 'node:url';
-// @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
 assertPosixPath(importMetaUrl);
 const __dirname_ = path.posix.dirname(fileURLToPath(importMetaUrl));

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

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

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

@@ -5,7 +5,6 @@ import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
 import { getMagicString } from '../shared/getMagicString.js';
-import { filterRolldown, filterFunction } from './pluginReplaceConstants.js';
 // TO-DO/eventually:
 // - Make import.meta.env work inside +config.js
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
@@ -15,76 +14,99 @@ const PUBLIC_ENV_ALLOWLIST = [
     // https://github.com/vikejs/vike/issues/1724
     'STORYBOOK',
 ];
+const skipNodeModules = '/node_modules/';
+const skipIrrelevant = 'import.meta.env.';
+const filterRolldown = {
+    id: {
+        exclude: `**${skipNodeModules}**`,
+    },
+    code: {
+        include: skipIrrelevant,
+    },
+};
+const filterFunction = (id, code) => {
+    if (id.includes(skipNodeModules))
+        return false;
+    if (!code.includes(skipIrrelevant))
+        return false;
+    return true;
+};
 function pluginEnvVars() {
     let envsAll;
     let config;
-    return {
-        name: 'vike:pluginEnvVars',
-        enforce: 'post',
-        configResolved: {
-            handler(config_) {
-                config = config_;
-                envsAll = loadEnv(config.mode, config.envDir || config.root, '');
-                config.plugins.sort(lowerFirst((plugin) => (plugin.name === 'vite:define' ? 1 : 0)));
+    return [
+        {
+            name: 'vike:pluginEnvVars',
+            enforce: 'post',
+            configResolved: {
+                handler(config_) {
+                    config = config_;
+                    envsAll = loadEnv(config.mode, config.envDir || config.root, '');
+                    config.plugins.sort(lowerFirst((plugin) => (plugin.name === 'vite:define' ? 1 : 0)));
+                },
             },
-        },
-        transform: {
-            filter: filterRolldown,
-            handler(code, id, options) {
-                id = normalizeId(id);
-                assertPosixPath(id);
-                assertPosixPath(config.root);
-                if (!id.startsWith(config.root))
-                    return; // skip linked dependencies
-                assert(filterFunction(id, code));
-                const isBuild = config.command === 'build';
-                const isClientSide = !isViteServerSide_extraSafe(config, this.environment, options);
-                const { magicString, getMagicStringResult } = getMagicString(code, id);
-                // Find & check
-                const replacements = Object.entries(envsAll)
-                    .filter(([key]) => {
-                    // Already handled by Vite
-                    const envPrefix = !config.envPrefix ? [] : isArray(config.envPrefix) ? config.envPrefix : [config.envPrefix];
-                    return !envPrefix.some((prefix) => key.startsWith(prefix));
-                })
-                    .map(([envName, envVal]) => {
-                    const envStatement = `import.meta.env.${envName}`;
-                    const envStatementRegExpStr = escapeRegex(envStatement) + '\\b';
-                    // Security check
-                    {
-                        const isPrivate = !envName.startsWith(PUBLIC_ENV_PREFIX) && !PUBLIC_ENV_ALLOWLIST.includes(envName);
-                        if (isPrivate && isClientSide) {
-                            if (!new RegExp(envStatementRegExpStr).test(code))
-                                return;
-                            const modulePath = getModuleFilePathAbsolute(id, config);
-                            const errMsgAddendum = isBuild
-                                ? ''
-                                : ' (Vike will prevent your app from building for production)';
-                            const keyPublic = `${PUBLIC_ENV_PREFIX}${envName}`;
-                            const errMsg = `${envStatement} is used in client-side file ${modulePath} which means that the environment variable ${envName} will be included in client-side bundles and, therefore, ${envName} will be publicly exposed which can be a security leak${errMsgAddendum}. Use ${envStatement} only in server-side files, or rename ${envName} to ${keyPublic}, see https://vike.dev/env`;
-                            if (isBuild) {
-                                assertUsage(false, errMsg);
-                            }
-                            else {
-                                // - Only a warning for faster development DX (e.g. when user toggles `ssr: boolean` or `onBeforeRenderIsomorph: boolean`).
-                                // - But only showing a warning can be confusing: https://github.com/vikejs/vike/issues/1641
-                                assertWarning(false, errMsg, { onlyOnce: true });
+            transform: {
+                filter: filterRolldown,
+                handler(code, id, options) {
+                    id = normalizeId(id);
+                    assertPosixPath(id);
+                    assertPosixPath(config.root);
+                    if (!id.startsWith(config.root))
+                        return; // skip linked dependencies
+                    assert(filterFunction(id, code));
+                    const isBuild = config.command === 'build';
+                    const isClientSide = !isViteServerSide_extraSafe(config, this.environment, options);
+                    const { magicString, getMagicStringResult } = getMagicString(code, id);
+                    // Find & check
+                    const replacements = Object.entries(envsAll)
+                        .filter(([key]) => {
+                        // Already handled by Vite
+                        const envPrefix = !config.envPrefix
+                            ? []
+                            : isArray(config.envPrefix)
+                                ? config.envPrefix
+                                : [config.envPrefix];
+                        return !envPrefix.some((prefix) => key.startsWith(prefix));
+                    })
+                        .map(([envName, envVal]) => {
+                        const envStatement = `import.meta.env.${envName}`;
+                        const envStatementRegExpStr = escapeRegex(envStatement) + '\\b';
+                        // Security check
+                        {
+                            const isPrivate = !envName.startsWith(PUBLIC_ENV_PREFIX) && !PUBLIC_ENV_ALLOWLIST.includes(envName);
+                            if (isPrivate && isClientSide) {
+                                if (!new RegExp(envStatementRegExpStr).test(code))
+                                    return;
+                                const modulePath = getModuleFilePathAbsolute(id, config);
+                                const errMsgAddendum = isBuild
+                                    ? ''
+                                    : ' (Vike will prevent your app from building for production)';
+                                const keyPublic = `${PUBLIC_ENV_PREFIX}${envName}`;
+                                const errMsg = `${envStatement} is used in client-side file ${modulePath} which means that the environment variable ${envName} will be included in client-side bundles and, therefore, ${envName} will be publicly exposed which can be a security leak${errMsgAddendum}. Use ${envStatement} only in server-side files, or rename ${envName} to ${keyPublic}, see https://vike.dev/env`;
+                                if (isBuild) {
+                                    assertUsage(false, errMsg);
+                                }
+                                else {
+                                    // - Only a warning for faster development DX (e.g. when user toggles `ssr: boolean` or `onBeforeRenderIsomorph: boolean`).
+                                    // - But only showing a warning can be confusing: https://github.com/vikejs/vike/issues/1641
+                                    assertWarning(false, errMsg, { onlyOnce: true });
+                                }
                             }
+                            // Double check
+                            assert(!(isPrivate && isClientSide) || !isBuild);
                         }
-                        // Double check
-                        assert(!(isPrivate && isClientSide) || !isBuild);
-                    }
-                    return { regExpStr: envStatementRegExpStr, replacement: envVal };
-                })
-                    .filter(isNotNullish);
-                // Apply
-                replacements.forEach(({ regExpStr, replacement }) => {
-                    magicString.replaceAll(new RegExp(regExpStr, 'g'), JSON.stringify(replacement));
-                });
-                if (!magicString.hasChanged())
-                    return null;
-                return getMagicStringResult();
+                        return { regExpStr: envStatementRegExpStr, replacement: envVal };
+                    })
+                        .filter(isNotNullish);
+                    // Apply
+                    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/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

@@ -17,38 +17,40 @@ const filterFunction = (id) => extractExportNamesRE.test(id);
 function pluginExtractExportNames() {
     let isDev = false;
     let config;
-    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;
+    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;
+            configureServer: {
+                handler() {
+                    isDev = true;
+                },
             },
-        },
-        configResolved: {
-            handler(config_) {
-                config = config_;
+            configResolved: {
+                handler(config_) {
+                    config = config_;
+                },
             },
-        },
-        config: {
-            handler() {
-                if (debug.isActivated) {
-                    return { logLevel: 'silent' };
-                }
+            config: {
+                handler() {
+                    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[];