vike 0.4.239 → 0.4.240

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

@@ -1,9 +1,8 @@
 export { pluginCommon };
-import { assert, assertUsage, assertWarning, findPackageJson, hasProp, isDevCheck, isDocker, isObject, isVitest, } from '../utils.js';
-import { assertRollupInput } from './pluginBuild/pluginBuildConfig.js';
+import { assert, assertUsage, assertWarning, hasProp, isDevCheck, isDocker, isObject, isVitest } from '../utils.js';
+import { assertRollupInput } from './build/pluginBuildConfig.js';
 import { installRequireShim_setUserRootDir } from '@brillout/require-shim';
 import pc from '@brillout/picocolors';
-import path from 'node:path';
 import { assertResolveAlias } from './pluginCommon/assertResolveAlias.js';
 import { isViteCliCall } from '../shared/isViteCliCall.js';
 import { isVikeCliOrApi } from '../../api/context.js';
@@ -42,10 +41,12 @@ function pluginCommon(vikeVitePluginOptions) {
         },
         {
             name: pluginName,
-            configResolved(config) {
-                assertViteRoot(config._rootResolvedEarly, config);
-                assertSingleInstance(config);
-                installRequireShim_setUserRootDir(config.root);
+            configResolved: {
+                handler(config) {
+                    assertViteRoot(config._rootResolvedEarly, config);
+                    assertSingleInstance(config);
+                    installRequireShim_setUserRootDir(config.root);
+                },
             },
         },
         {
@@ -64,7 +65,6 @@ function pluginCommon(vikeVitePluginOptions) {
                     workaroundCI(config);
                     assertRollupInput(config);
                     assertResolveAlias(config);
-                    assertEsm(config.root);
                     assertVikeCliOrApi(config);
                     temp_supportOldInterface(config);
                     await emitServerEntryOnlyIfNeeded(config);
@@ -120,20 +120,6 @@ function workaroundCI(config) {
         (_b = config.preview).host ?? (_b.host = true);
     }
 }
-function assertEsm(userViteRoot) {
-    const found = findPackageJson(userViteRoot);
-    if (!found)
-        return;
-    const { packageJson, packageJsonPath } = found;
-    let dir = path.posix.dirname(packageJsonPath);
-    if (dir !== '/') {
-        assert(!dir.endsWith('/'));
-        dir = dir + '/';
-    }
-    assert(dir.endsWith('/'));
-    dir = pc.dim(dir);
-    assertWarning(packageJson.type === 'module', `We recommend setting ${dir}package.json#type to "module", see https://vike.dev/CJS`, { onlyOnce: true });
-}
 function assertSingleInstance(config) {
     const numberOfInstances = config.plugins.filter((o) => o.name === pluginName).length;
     assertUsage(numberOfInstances === 1, `Vike's Vite plugin (${pc.cyan("import vike from 'vike/plugin'")}) is being added ${numberOfInstances} times to the list of Vite plugins. Make sure to add it only once instead.`);
@@ -143,9 +129,6 @@ function assertVikeCliOrApi(config) {
         return;
     if (isViteCliCall()) {
         assert(!isVitest());
-        assertWarning(false, `Vite's CLI is deprecated ${pc.underline('https://vike.dev/migration/cli')}`, {
-            onlyOnce: true,
-        });
         return;
     }
     if (isVitest()) {
@@ -158,9 +141,6 @@ function assertVikeCliOrApi(config) {
         });
         return;
     }
-    assertWarning(false, `Vite's JavaScript API is deprecated ${pc.underline('https://vike.dev/migration/cli#api')}`, {
-        onlyOnce: true,
-    });
 }
 // TO-DO/next-major-release: remove https://github.com/vikejs/vike/issues/2122
 function temp_supportOldInterface(config) {

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/pluginDev/determineOptimizeDeps.js

@@ -2,7 +2,7 @@ export { determineOptimizeDeps };
 import { findPageFiles } from '../../shared/findPageFiles.js';
 import { assert, assertIsImportPathNpmPackage, createDebugger, getNpmPackageName, isArray, isFilePathAbsoluteFilesystem, isVirtualFileId, } from '../../utils.js';
 import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
-import { analyzeClientEntries } from '../pluginBuild/pluginBuildConfig.js';
+import { analyzeClientEntries } from '../build/pluginBuildConfig.js';
 import { virtualFileIdGlobalEntryClientCR, virtualFileIdGlobalEntryClientSR } from '../../../shared/virtualFileId.js';
 import { getFilePathResolved } from '../../shared/getFilePath.js';
 import { getConfigValueSourcesRelevant } from '../pluginVirtualFiles/getConfigValueSourcesRelevant.js';

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

@@ -17,54 +17,58 @@ function pluginDev() {
         {
             name: 'vike:pluginDev',
             apply: applyDev,
-            config() {
-                return {
-                    appType: 'custom',
-                    // TO-DO/next-major-release: remove (AFAICT we only need to use config.optimizeDeps for the old design)
-                    optimizeDeps: {
-                        exclude: [
-                            // We exclude Vike's client runtime to be able to use Vite's import.meta.glob()
-                            'vike/client',
-                            'vike/client/router',
-                            // It seems like client-side/isomorphic imports also need to be excluded, in order to avoid the following:
-                            //   ```
-                            //   Client runtime loaded twice https://vike.dev/client-runtime-duplicated
-                            //   ```
-                            'vike/routing',
-                            'vike/getPageContext',
-                            // We exclude @brillout/json-serializer and @brillout/picocolors to avoid:
-                            // ```
-                            // 9:28:58 AM [vite] ✨ new dependencies optimized: @brillout/json-serializer/parse
-                            // 9:28:58 AM [vite] ✨ optimized dependencies changed. reloading
-                            // ```
-                            '@brillout/json-serializer/parse',
-                            '@brillout/json-serializer/stringify',
-                            '@brillout/picocolors',
-                            // We exclude all packages that depend on any optimizeDeps.exclude entry because, otherwise, the entry cannot be resolved when using pnpm. For example:
-                            // ```
-                            // Failed to resolve import "@brillout/json-serializer/parse" from "../../packages/vike-react-query/dist/renderer/VikeReactQueryWrapper.js". Does the file exist?
-                            // 343|  // ../../node_modules/.pnpm/react-streaming@0.3.16_react-dom@18.2.0_react@18.2.0/node_modules/react-streaming/dist/esm/client/useAsync.js
-                            // 344|  import { parse as parse2 } from "@brillout/json-serializer/parse";
-                            // ```
-                            // The source map is confusing, the import actually lives at node_modules/.vite/deps/vike-react-query_renderer_VikeReactQueryWrapper.js which contains:
-                            // ```js
-                            // // ../../node_modules/.pnpm/react-streaming@0.3.16_react-dom@18.2.0_react@18.2.0/node_modules/react-streaming/dist/esm/client/useAsync.js
-                            // import { parse as parse2 } from "@brillout/json-serializer/parse";
-                            // ```
-                            'react-streaming',
-                        ],
-                    },
-                };
+            config: {
+                handler() {
+                    return {
+                        appType: 'custom',
+                        // TO-DO/next-major-release: remove (AFAICT we only need to use config.optimizeDeps for the old design)
+                        optimizeDeps: {
+                            exclude: [
+                                // We exclude Vike's client runtime to be able to use Vite's import.meta.glob()
+                                'vike/client',
+                                'vike/client/router',
+                                // It seems like client-side/isomorphic imports also need to be excluded, in order to avoid the following:
+                                //   ```
+                                //   Client runtime loaded twice https://vike.dev/client-runtime-duplicated
+                                //   ```
+                                'vike/routing',
+                                'vike/getPageContext',
+                                // We exclude @brillout/json-serializer and @brillout/picocolors to avoid:
+                                // ```
+                                // 9:28:58 AM [vite] ✨ new dependencies optimized: @brillout/json-serializer/parse
+                                // 9:28:58 AM [vite] ✨ optimized dependencies changed. reloading
+                                // ```
+                                '@brillout/json-serializer/parse',
+                                '@brillout/json-serializer/stringify',
+                                '@brillout/picocolors',
+                                // We exclude all packages that depend on any optimizeDeps.exclude entry because, otherwise, the entry cannot be resolved when using pnpm. For example:
+                                // ```
+                                // Failed to resolve import "@brillout/json-serializer/parse" from "../../packages/vike-react-query/dist/renderer/VikeReactQueryWrapper.js". Does the file exist?
+                                // 343|  // ../../node_modules/.pnpm/react-streaming@0.3.16_react-dom@18.2.0_react@18.2.0/node_modules/react-streaming/dist/esm/client/useAsync.js
+                                // 344|  import { parse as parse2 } from "@brillout/json-serializer/parse";
+                                // ```
+                                // The source map is confusing, the import actually lives at node_modules/.vite/deps/vike-react-query_renderer_VikeReactQueryWrapper.js which contains:
+                                // ```js
+                                // // ../../node_modules/.pnpm/react-streaming@0.3.16_react-dom@18.2.0_react@18.2.0/node_modules/react-streaming/dist/esm/client/useAsync.js
+                                // import { parse as parse2 } from "@brillout/json-serializer/parse";
+                                // ```
+                                'react-streaming',
+                            ],
+                        },
+                    };
+                },
             },
-            async configResolved(config_) {
-                config = config_;
-                await determineOptimizeDeps(config);
-                await determineFsAllowList(config);
-                if (!isErrorDebug()) {
-                    await installHttpRequestAsyncStore();
-                    improveViteLogs(config);
-                }
-                logDockerHint(config.server.host);
+            configResolved: {
+                async handler(config_) {
+                    config = config_;
+                    await determineOptimizeDeps(config);
+                    await determineFsAllowList(config);
+                    if (!isErrorDebug()) {
+                        await installHttpRequestAsyncStore();
+                        improveViteLogs(config);
+                    }
+                    logDockerHint(config.server.host);
+                },
             },
         },
         {

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

@@ -14,72 +14,97 @@ 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(config_) {
-            config = config_;
-            envsAll = loadEnv(config.mode, config.envDir || config.root, '');
-            config.plugins.sort(lowerFirst((plugin) => (plugin.name === 'vite:define' ? 1 : 0)));
-        },
-        transform(code, id, options) {
-            id = normalizeId(id);
-            assertPosixPath(id);
-            if (id.includes('/node_modules/'))
-                return;
-            assertPosixPath(config.root);
-            if (!id.startsWith(config.root))
-                return;
-            if (!code.includes('import.meta.env.'))
-                return;
-            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 });
+    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 });
+                                }
+                            }
+                            // 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));
+                    });
+                    return getMagicStringResult();
+                },
+            },
         },
-    };
+    ];
 }