vike 0.4.238 → 0.4.239-commit-33e55d4

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

@@ -5,6 +5,7 @@ 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
@@ -20,66 +21,70 @@ function pluginEnvVars() {
     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)));
+        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(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 });
+        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/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.
@@ -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.js

@@ -8,31 +8,45 @@ 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)) {
+        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() {
-            isDev = true;
+        configureServer: {
+            handler() {
+                isDev = true;
+            },
         },
-        configResolved(config_) {
-            config = config_;
+        configResolved: {
+            handler(config_) {
+                config = config_;
+            },
         },
-        config() {
-            if (debug.isActivated) {
-                return { logLevel: 'silent' };
-            }
+        config: {
+            handler() {
+                if (debug.isActivated) {
+                    return { logLevel: 'silent' };
+                }
+            },
         },
     };
 }