vike 0.4.253 → 0.4.254

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

@@ -1,22 +1,18 @@
-import '../assertEnvVite.js';
 export { pluginCommon };
 import { isDevCheck } from '../../../utils/isDev.js';
 import { isDocker } from '../../../utils/isDocker.js';
 import { isExactlyOneTruthy } from '../../../utils/isExactlyOneTruthy.js';
-import { isVitest } from '../../../utils/isVitest.js';
-import { assert, assertUsage, assertWarning } from '../../../utils/assert.js';
+import { assert, assertUsage } from '../../../utils/assert.js';
 import { hasProp } from '../../../utils/hasProp.js';
 import { isObject } from '../../../utils/isObject.js';
 import { assertRollupInput } from './build/pluginBuildConfig.js';
-import { installRequireShim_setUserRootDir } from '@brillout/require-shim';
 import pc from '@brillout/picocolors';
 import { assertResolveAlias } from './pluginCommon/assertResolveAlias.js';
-import { isViteCli } from '../shared/isViteCli.js';
-import { isVikeCliOrApi } from '../../../shared-server-node/api-context.js';
 import { getVikeConfigInternal, setVikeConfigContext } from '../shared/resolveVikeConfigInternal.js';
 import { assertViteRoot, getViteRoot, normalizeViteRoot } from '../../api/resolveViteConfigFromUser.js';
 import { temp_disablePrerenderAutoRun } from '../../prerender/context.js';
 import { version as viteVersionVike } from 'vite';
+import '../assertEnvVite.js';
 const pluginName = 'vike:pluginCommon';
 globalThis.__VIKE__IS_PROCESS_SHARED_WITH_VITE = true;
 function pluginCommon(vikeVitePluginOptions) {
@@ -57,7 +53,6 @@ function pluginCommon(vikeVitePluginOptions) {
                 handler(config) {
                     assertViteRoot(config._rootResolvedEarly, config);
                     assertSingleInstance(config);
-                    installRequireShim_setUserRootDir(config.root);
                 },
             },
         },
@@ -77,7 +72,6 @@ function pluginCommon(vikeVitePluginOptions) {
                     workaroundCI(config);
                     assertRollupInput(config);
                     assertResolveAlias(config);
-                    assertVikeCliOrApi(config);
                     temp_supportOldInterface(config);
                     await emitServerEntryOnlyIfNeeded(config);
                 },
@@ -85,7 +79,6 @@ function pluginCommon(vikeVitePluginOptions) {
             config: {
                 order: 'post',
                 async handler(configFromUser) {
-                    assertViteBuildSsr(configFromUser);
                     let configFromVike = { server: {}, preview: {} };
                     const vikeConfig = await getVikeConfigInternal();
                     if (vikeConfig.config.port !== undefined) {
@@ -142,30 +135,6 @@ 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.`);
 }
-function assertVikeCliOrApi(config) {
-    if (isVikeCliOrApi())
-        return;
-    if (isViteCli()) {
-        assert(!isVitest());
-        return;
-    }
-    /* This warning is always shown: Vitest loads Vite *before* any Vike JavaScript API can be invoked.
-    if (isVitest()) {
-      assertWarning(
-        false,
-        `Unexpected Vitest setup: you seem to be using Vitest together with Vike's Vite plugin but without using Vike's JavaScript API which is unexpected, see ${pc.underline('https://vike.dev/vitest')}`,
-        { onlyOnce: true },
-      )
-      return
-    }
-    */
-    if (config.server.middlewareMode) {
-        assertWarning(false, `${pc.cyan('vite.createServer()')} is deprecated ${pc.underline('https://vike.dev/migration/cli#api')}`, {
-            onlyOnce: true,
-        });
-        return;
-    }
-}
 // TO-DO/next-major-release: remove https://github.com/vikejs/vike/issues/2122
 function temp_supportOldInterface(config) {
     if (!('vitePluginSsr' in config))
@@ -194,7 +163,3 @@ async function emitServerEntryOnlyIfNeeded(config) {
         config.vitePluginServerEntry.disableServerEntryEmit = true;
     }
 }
-function assertViteBuildSsr(configFromUser) {
-    // https://github.com/vikejs/vike/issues/3010
-    assertUsage(configFromUser.build?.ssr === undefined, "Don't set vite.build.ssr");
-}

package/dist/node/vite/plugins/pluginDev/determineFsAllowList.d.ts

@@ -1,4 +1,4 @@
-import '../../assertEnvVite.js';
 export { determineFsAllowList };
 import type { ResolvedConfig } from 'vite';
+import '../../assertEnvVite.js';
 declare function determineFsAllowList(config: ResolvedConfig): Promise<void>;

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

@@ -1,4 +1,3 @@
-import '../../assertEnvVite.js';
 export { determineFsAllowList };
 import { searchForWorkspaceRoot } from 'vite';
 import path from 'node:path';
@@ -6,6 +5,7 @@ import { assert } from '../../../../utils/assert.js';
 import { assertPosixPath } from '../../../../utils/path.js';
 import { getPackageNodeModulesDirectory } from '../../../../utils/requireResolve.js';
 import { fileURLToPath } from 'node:url';
+import '../../assertEnvVite.js';
 const importMetaUrl = import.meta.url;
 assertPosixPath(importMetaUrl);
 const __dirname_ = path.posix.dirname(fileURLToPath(importMetaUrl));

package/dist/node/vite/plugins/pluginDev/optimizeDeps.d.ts

@@ -1,7 +1,7 @@
-import '../../assertEnvVite.js';
 export { optimizeDeps };
 export { resolveOptimizeDeps };
 import type { ResolvedConfig } from 'vite';
+import '../../assertEnvVite.js';
 declare const optimizeDeps: {
     readonly optimizeDeps: {
         readonly exclude: ["vike/client", "vike/client/router"];

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

@@ -1,4 +1,3 @@
-import '../../assertEnvVite.js';
 export { optimizeDeps };
 export { resolveOptimizeDeps };
 import { findPageFiles } from '../../shared/findPageFiles.js';
@@ -14,6 +13,7 @@ import { analyzeClientEntries } from '../build/pluginBuildConfig.js';
 import { virtualFileIdGlobalEntryClientCR, virtualFileIdGlobalEntryClientSR, } from '../../../../shared-server-node/virtualFileId.js';
 import { getFilePathResolved } from '../../shared/getFilePath.js';
 import { getConfigValueSourcesRelevant } from '../pluginVirtualFiles/getConfigValueSourcesRelevant.js';
+import '../../assertEnvVite.js';
 const debug = createDebug('vike:optimizeDeps');
 // Add dependencies that cannot be discovered by Vite during the scanning phase
 const LATE_DISCOVERED = [
@@ -24,6 +24,14 @@ const LATE_DISCOVERED = [
     // Workaround for https://github.com/vikejs/vike/issues/2823#issuecomment-3514325487
     '@compiled/react/runtime',
 ];
+// TO-DO/eventually: remove this.
+// Avoid following warning for older vike-photon versions:
+// ```
+// [11:32:49.768][/test/photon-vercel/.test-dev.test.ts][pnpm run dev][stderr] Failed to resolve dependency: vike > @brillout/require-shim, present in ssr 'optimizeDeps.include'
+// ```
+// https://github.com/vikejs/vike-photon/issues/56
+// https://github.com/vikejs/vike/pull/3091
+const ALWAYS_REMOVE = ['@brillout/require-shim', 'vike > @brillout/require-shim'];
 const optimizeDeps = {
     optimizeDeps: {
         exclude: [
@@ -95,6 +103,14 @@ async function resolveOptimizeDeps(config) {
             env.optimizeDeps.entries = add(env.optimizeDeps.entries, entriesServer);
         }
     }
+    // Remove @brillout/require-shim
+    config.optimizeDeps.include = remove(config.optimizeDeps.include);
+    config.optimizeDeps.entries = remove(config.optimizeDeps.entries);
+    for (const envName in config.environments) {
+        const env = config.environments[envName];
+        env.optimizeDeps.include = remove(env.optimizeDeps.include ?? []);
+        env.optimizeDeps.entries = remove(env.optimizeDeps.entries ?? []);
+    }
     // Debug
     if (debug.isActivated)
         debug('optimizeDeps', {
@@ -165,7 +181,7 @@ async function getPageDeps(config, pageConfigs) {
                     };
                     const sourcesRelevant = getConfigValueSourcesRelevant(configName, runtimeEnv, pageConfig);
                     sourcesRelevant.forEach((configValueSource) => {
-                        if (!configValueSource.valueIsLoadedWithImport && !configValueSource.valueIsFilePath)
+                        if (!configValueSource.valueLoadedViaImport && !configValueSource.valueIsFilePath)
                             return;
                         const { definedAt } = configValueSource;
                         if (definedAt.definedBy)
@@ -220,14 +236,23 @@ async function getPageDeps(config, pageConfigs) {
     };
 }
 function add(input, listAddendum) {
-    const list = !input ? [] : isArray(input) ? unique(input) : [input];
+    const list = normalizeInput(input);
     listAddendum.forEach((e) => {
         if (!list.includes(e))
             list.push(e);
     });
     return list;
 }
+function normalizeInput(input) {
+    const list = !input ? [] : isArray(input) ? unique(input) : [input];
+    return list;
+}
 function unique(arr) {
     const arrUnique = Array.from(new Set(arr));
     return arr.length !== arrUnique.length ? arrUnique : arr;
 }
+function remove(input) {
+    let list = normalizeInput(input);
+    list = list.filter((e) => !ALWAYS_REMOVE.includes(e));
+    return list;
+}

package/dist/node/vite/plugins/pluginDev.d.ts

@@ -1,6 +1,6 @@
-import '../assertEnvVite.js';
 export { pluginDev };
 export { logDockerHint };
 import { type Plugin, type ResolvedConfig } from 'vite';
+import '../assertEnvVite.js';
 declare function pluginDev(): Plugin[];
 declare function logDockerHint(configHost: ResolvedConfig['server']['host']): void;

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

@@ -1,4 +1,3 @@
-import '../assertEnvVite.js';
 export { pluginDev };
 export { logDockerHint };
 import { optimizeDeps, resolveOptimizeDeps } from './pluginDev/optimizeDeps.js';
@@ -11,6 +10,7 @@ import { assertWarning } from '../../../utils/assert.js';
 import { interceptViteLogs } from '../shared/loggerVite.js';
 import pc from '@brillout/picocolors';
 import { swallowViteLogConnected, swallowViteLogConnected_clean } from '../shared/loggerVite.js';
+import '../assertEnvVite.js';
 function pluginDev() {
     let config;
     return [

package/dist/node/vite/plugins/pluginExtractAssets.d.ts

@@ -1,6 +1,6 @@
-import '../assertEnvVite.js';
 export { pluginExtractAssets };
 export { extractAssetsRE };
 import type { Plugin } from 'vite';
+import '../assertEnvVite.js';
 declare const extractAssetsRE: RegExp;
 declare function pluginExtractAssets(): Plugin[];

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

@@ -1,4 +1,3 @@
-import '../assertEnvVite.js';
 // 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
@@ -25,6 +24,7 @@ import { assertV1Design } from '../../../shared-server-node/assertV1Design.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
 import { resolveIncludeAssetsImportedByServer } from '../../../server/runtime/renderPageServer/getPageAssets/retrievePageAssetsProd.js';
+import '../assertEnvVite.js';
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 const rawRE = /(\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;

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

@@ -1,8 +1,8 @@
-import '../assertEnvVite.js';
 export { pluginExtractExportNames };
 export { isUsingClientRouter };
 export { extractExportNamesRE };
 import type { Plugin } from 'vite';
+import '../assertEnvVite.js';
 declare const extractExportNamesRE: RegExp;
 declare function pluginExtractExportNames(): Plugin[];
 declare function isUsingClientRouter(): boolean;

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

@@ -1,4 +1,3 @@
-import '../assertEnvVite.js';
 export { pluginExtractExportNames };
 export { isUsingClientRouter };
 export { extractExportNamesRE };
@@ -10,6 +9,7 @@ import { getGlobalObject } from '../../../utils/getGlobalObject.js';
 import { getExportNames } from '../shared/parseEsModule.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
+import '../assertEnvVite.js';
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 const debug = createDebug('vike:pluginExtractExportNames');
 const globalObject = getGlobalObject('plugins/pluginExtractExportNames.ts', {});

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

@@ -1,4 +1,4 @@
-import '../assertEnvVite.js';
 export { pluginPreview };
 import type { Plugin } from 'vite';
+import '../assertEnvVite.js';
 declare function pluginPreview(): Plugin[];

package/dist/node/vite/plugins/pluginPreview.js

@@ -1,4 +1,3 @@
-import '../assertEnvVite.js';
 export { pluginPreview };
 import { applyPreview } from '../../../utils/isDev.js';
 import { assertUsage } from '../../../utils/assert.js';
@@ -10,6 +9,7 @@ import { logDockerHint } from './pluginDev.js';
 import { getOutDirs } from '../shared/getOutDirs.js';
 import sirv from 'sirv';
 import { getVikeConfigInternal } from '../shared/resolveVikeConfigInternal.js';
+import '../assertEnvVite.js';
 function pluginPreview() {
     let config;
     let vikeConfig;

package/dist/node/vite/plugins/pluginReplaceConstantsEnvVars.d.ts

@@ -1,4 +1,4 @@
-import '../assertEnvVite.js';
 export { pluginReplaceConstantsEnvVars };
 import type { Plugin } from 'vite';
+import '../assertEnvVite.js';
 declare function pluginReplaceConstantsEnvVars(): Plugin[];

package/dist/node/vite/plugins/pluginReplaceConstantsEnvVars.js

@@ -1,16 +1,17 @@
-import '../assertEnvVite.js';
 export { pluginReplaceConstantsEnvVars };
 import { loadEnv } from 'vite';
 import { escapeRegex } from '../../../utils/escapeRegex.js';
 import { isNotNullish } from '../../../utils/isNullish.js';
 import { assert, assertUsage, assertWarning } from '../../../utils/assert.js';
 import { isArray } from '../../../utils/isArray.js';
-import { lowerFirst } from '../../../utils/sorter.js';
+import { makeLast } from '../../../utils/sorter.js';
 import { assertPosixPath } from '../../../utils/path.js';
 import { getFilePathToShowToUserModule } from '../shared/getFilePath.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
 import { getMagicString } from '../shared/getMagicString.js';
+import pc from '@brillout/picocolors';
+import '../assertEnvVite.js';
 const PUBLIC_ENV_PREFIX = 'PUBLIC_ENV__';
 const PUBLIC_ENV_ALLOWLIST = [
     // https://github.com/vikejs/vike/issues/1724
@@ -23,7 +24,7 @@ const PUBLIC_ENV_ALLOWLIST = [
 //   - 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
 //   - Or stop using Vite's `mode` implementation and have Vike implement its own `mode` feature? (So that the only dependencies are `$ vike build --mode staging` and `$ MODE=staging vike build`.)
 // === Rolldown filter
-const skipIrrelevant = 'import.meta.env.';
+const skipIrrelevant = 'import.meta.env';
 const filterRolldown = {
     /* We don't do that, because vike-react-sentry uses import.meta.env.PUBLIC_ENV__SENTRY_DSN
     id: {
@@ -47,6 +48,11 @@ function pluginReplaceConstantsEnvVars() {
     return [
         {
             name: 'vike:pluginReplaceConstantsEnvVars',
+            // Correct order:
+            // 1. @vitejs/plugin-vue
+            // 2. vike:pluginExtractAssets and vike:pluginExtractExportNames [needs to be applied after @vitejs/plugin-vue]
+            // 3. vike:pluginReplaceConstantsEnvVars [needs to be applied after vike:pluginExtractAssets and vike:pluginExtractExportNames]
+            // 4. vite:define (Vite built-in plugin) [needs to be applied after vike:pluginReplaceConstantsEnvVars]
             enforce: 'post',
             configResolved: {
                 handler(config_) {
@@ -55,7 +61,7 @@ function pluginReplaceConstantsEnvVars() {
                     // Add process.env values defined by .env files
                     Object.entries(envVarsAll).forEach(([key, val]) => { var _a; return ((_a = process.env)[key] ?? (_a[key] = val)); });
                     envPrefix = getEnvPrefix(config);
-                    config.plugins.sort(lowerFirst((plugin) => (plugin.name === 'vite:define' ? 1 : 0)));
+                    config.plugins.sort(makeLast((plugin) => plugin.name === 'vite:define'));
                 },
             },
             transform: {
@@ -97,6 +103,17 @@ function pluginReplaceConstantsEnvVars() {
                     replacements.forEach(({ regExpStr, replacement }) => {
                         magicString.replaceAll(new RegExp(regExpStr, 'g'), JSON.stringify(replacement));
                     });
+                    // Replace bare `import.meta.env` expression with `null` in the user-land.
+                    // - Otherwise Vite replaces it with an object missing PUBLIC_ENV__ variables which is confusing for users.
+                    // - We purposely don't support replacing `import.meta.env` with an object to incentivize users to write tree-shaking friendly code.
+                    // - `define: { 'import.meta.env': JSON.stringify(null) }` doesn't work because it also replaces `import.meta.env` inside `import.meta.env.SONE_ENV`
+                    const bareImportMetaEnvRegex = /\bimport\.meta\.env(?!\.)/g;
+                    const isUserLand = !id.includes('node_modules') && id.startsWith(config.root); // skip node_modules/ as well as linked dependencies
+                    if (isUserLand && bareImportMetaEnvRegex.test(code)) {
+                        assertWarning(false, `The bare ${pc.cyan('import.meta.env')} expression in ${getFilePathToShowToUserModule(id, config)} is replaced with ${pc.cyan('null')} — use ${pc.cyan('import.meta.env.SONE_ENV')} instead ${pc.underline('https://vike.dev/env')}`, { onlyOnce: true });
+                        bareImportMetaEnvRegex.lastIndex = 0; // Reset state after .test() since the /g flag makes the RegExp stateful
+                        magicString.replaceAll(bareImportMetaEnvRegex, JSON.stringify(null));
+                    }
                     return getMagicStringResult();
                 },
             },

package/dist/node/vite/plugins/pluginReplaceConstantsGlobalThis.d.ts

@@ -1,14 +1,16 @@
-import '../assertEnvVite.js';
 export { pluginReplaceConstantsGlobalThis };
 export { VIRTUAL_FILE_ID_constantsGlobalThis };
 export type _LoadDeclareGlobal__VIKE__IS = never;
 import type { Plugin } from 'vite';
+import '../assertEnvVite.js';
 declare global {
     /** Like `import.meta.env.DEV` but works for `node_modules/` packages with `ssr.external` */
     var __VIKE__IS_DEV: boolean;
     /** Like `import.meta.env.SSR` but works for `node_modules/` packages with `ssr.external` */
     var __VIKE__IS_CLIENT: boolean;
     var __VIKE__IS_DEBUG: boolean;
+    /** Whether the code is processed by Vite, e.g. `true` when server code is `ssr.noExternal` */
+    var __VIKE__NO_EXTERNAL: true | undefined;
 }
 declare const VIRTUAL_FILE_ID_constantsGlobalThis = "virtual:vike:server:constantsGlobalThis";
 declare function pluginReplaceConstantsGlobalThis(): Plugin[];

package/dist/node/vite/plugins/pluginReplaceConstantsGlobalThis.js

@@ -1,4 +1,3 @@
-import '../assertEnvVite.js';
 export { pluginReplaceConstantsGlobalThis };
 export { VIRTUAL_FILE_ID_constantsGlobalThis };
 import { isDebug } from '../../../utils/debug.js';
@@ -6,6 +5,7 @@ import { escapeRegex } from '../../../utils/escapeRegex.js';
 import { addVirtualFileIdPrefix } from '../../../utils/virtualFileId.js';
 import { assert } from '../../../utils/assert.js';
 import { isViteServerSide_applyToEnvironment, isViteServerSide_configEnvironment, isViteServerSide_extraSafe, } from '../shared/isViteServerSide.js';
+import '../assertEnvVite.js';
 const VIRTUAL_FILE_ID_constantsGlobalThis = 'virtual:vike:server:constantsGlobalThis';
 const isDebugVal = isDebug();
 globalThis.__VIKE__IS_CLIENT = false;
@@ -33,6 +33,7 @@ function pluginReplaceConstantsGlobalThis() {
                         define: {
                             'globalThis.__VIKE__IS_DEV': JSON.stringify(isDev),
                             'globalThis.__VIKE__IS_DEBUG': JSON.stringify(isDebugVal),
+                            'globalThis.__VIKE__NO_EXTERNAL': 'true',
                         },
                     };
                 },

package/dist/node/vite/plugins/pluginReplaceConstantsPageContext.d.ts

@@ -1,4 +1,4 @@
-import '../assertEnvVite.js';
 export { pluginReplaceConstantsPageContext };
 import type { Plugin } from 'vite';
+import '../assertEnvVite.js';
 declare function pluginReplaceConstantsPageContext(): Plugin[];

package/dist/node/vite/plugins/pluginReplaceConstantsPageContext.js

@@ -1,10 +1,10 @@
-import '../assertEnvVite.js';
 export { pluginReplaceConstantsPageContext };
 import { assert } from '../../../utils/assert.js';
 import { assertPosixPath } from '../../../utils/path.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
 import { getMagicString } from '../shared/getMagicString.js';
+import '../assertEnvVite.js';
 const constantsIsClientSide = [
     //
     'pageContext.isClientSide',

package/dist/node/vite/plugins/pluginSetGlobalContext.d.ts

@@ -1,4 +1,4 @@
-import '../assertEnvVite.js';
 export { pluginSetGlobalContext };
 import type { Plugin } from 'vite';
+import '../assertEnvVite.js';
 declare function pluginSetGlobalContext(): Plugin[];

package/dist/node/vite/plugins/pluginSetGlobalContext.js

@@ -1,10 +1,10 @@
-import '../assertEnvVite.js';
 export { pluginSetGlobalContext };
 import { setGlobalContext_viteDevServer, setGlobalContext_viteConfig, setGlobalContext_isProductionAccordingToVite, } from '../../../server/runtime/globalContext.js';
 import { markSetup_isViteDev, markSetup_viteDevServer, markSetup_vitePreviewServer, } from '../../../utils/assertSetup.js';
 import { isDevCheck } from '../../../utils/isDev.js';
 import { reloadVikeConfig } from '../shared/resolveVikeConfigInternal.js';
 import { getViteConfigRuntime } from '../shared/getViteConfigRuntime.js';
+import '../assertEnvVite.js';
 function pluginSetGlobalContext() {
     let isServerReload = false;
     return [

package/dist/node/vite/plugins/pluginStaticReplace/applyStaticReplace.d.ts

@@ -1,6 +1,6 @@
-import '../../assertEnvVite.js';
 export { applyStaticReplace };
 export type { StaticReplace };
+import '../../assertEnvVite.js';
 /**
  * Condition to match an argument value.
  * - string starting with 'import:' matches an imported identifier

package/dist/node/vite/plugins/pluginStaticReplace/applyStaticReplace.js

@@ -1,9 +1,9 @@
-import '../../assertEnvVite.js';
 export { applyStaticReplace };
 import { transformAsync } from '@babel/core';
 import * as t from '@babel/types';
 import { parseImportString } from '../../shared/importString.js';
 import { assert } from '../../../../utils/assert.js';
+import '../../assertEnvVite.js';
 // ============================================================================
 // Main transformer
 // ============================================================================

package/dist/node/vite/plugins/pluginStaticReplace.d.ts

@@ -1,5 +1,5 @@
-import '../assertEnvVite.js';
 export { pluginStaticReplace };
 import type { Plugin } from 'vite';
 import { VikeConfigInternal } from '../shared/resolveVikeConfigInternal.js';
+import '../assertEnvVite.js';
 declare function pluginStaticReplace(vikeConfig: VikeConfigInternal): Plugin[];

package/dist/node/vite/plugins/pluginStaticReplace.js

@@ -1,9 +1,9 @@
-import '../assertEnvVite.js';
 export { pluginStaticReplace };
 import { createDebug } from '../../../utils/debug.js';
 import { assert, assertUsage } from '../../../utils/assert.js';
 import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
 import { applyStaticReplace } from './pluginStaticReplace/applyStaticReplace.js';
+import '../assertEnvVite.js';
 const debug = createDebug('vike:staticReplace');
 function pluginStaticReplace(vikeConfig) {
     let config;

package/dist/node/vite/plugins/pluginStripPointerImportAttribute.d.ts

@@ -0,0 +1,4 @@
+export { pluginStripPointerImportAttribute };
+import type { Plugin } from 'vite';
+import '../assertEnvVite.js';
+declare function pluginStripPointerImportAttribute(): Plugin[];

package/dist/node/vite/plugins/pluginStripPointerImportAttribute.js

@@ -0,0 +1,31 @@
+export { pluginStripPointerImportAttribute };
+import { getMagicString } from '../shared/getMagicString.js';
+import '../assertEnvVite.js';
+// Match `with { type: 'vike-pointer' }` (with optional whitespace variations)
+const runtimeAttrRE = /\bwith\s*\{\s*type\s*:\s*['"]vike-pointer['"]\s*\}/g;
+function pluginStripPointerImportAttribute() {
+    return [
+        {
+            name: 'vike:pluginStripPointerImportAttribute',
+            transform: {
+                filter: {
+                    code: {
+                        include: 'vike-pointer',
+                    },
+                },
+                handler(code, id) {
+                    runtimeAttrRE.lastIndex = 0;
+                    if (!runtimeAttrRE.test(code))
+                        return;
+                    const { magicString, getMagicStringResult } = getMagicString(code, id);
+                    runtimeAttrRE.lastIndex = 0;
+                    let match;
+                    while ((match = runtimeAttrRE.exec(code)) !== null) {
+                        magicString.remove(match.index, match.index + match[0].length);
+                    }
+                    return getMagicStringResult();
+                },
+            },
+        },
+    ];
+}

package/dist/node/vite/plugins/pluginVirtualFiles/debug.js

@@ -1,3 +1,3 @@
-import '../../assertEnvVite.js';
 import { createDebug } from '../../../../utils/debug.js';
+import '../../assertEnvVite.js';
 export const debug = createDebug('vike:virtualFiles');

package/dist/node/vite/plugins/pluginVirtualFiles/generateVirtualFileGlobalEntry.d.ts

@@ -1,3 +1,3 @@
-import '../../assertEnvVite.js';
 export { generateVirtualFileGlobalEntry };
+import '../../assertEnvVite.js';
 declare function generateVirtualFileGlobalEntry(isForClientSide: boolean, isDev: boolean, id: string, isClientRouting: boolean): Promise<string>;

package/dist/node/vite/plugins/pluginVirtualFiles/generateVirtualFileGlobalEntry.js

@@ -1,10 +1,10 @@
-import '../../assertEnvVite.js';
 export { generateVirtualFileGlobalEntry };
 import { generateVirtualFileId } from '../../../../shared-server-node/virtualFileId.js';
 import { debug } from './debug.js';
 import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
 import { serializeConfigValues, } from '../../../../shared-server-client/page-configs/serialize/serializeConfigValues.js';
 import { VIRTUAL_FILE_ID_constantsGlobalThis } from '../pluginReplaceConstantsGlobalThis.js';
+import '../../assertEnvVite.js';
 async function generateVirtualFileGlobalEntry(isForClientSide, isDev, id, isClientRouting) {
     const vikeConfig = await getVikeConfigInternal(true);
     const { _pageConfigs: pageConfigs, _pageConfigGlobal: pageConfigGlobal } = vikeConfig;

package/dist/node/vite/plugins/pluginVirtualFiles/generateVirtualFileGlobalEntryWithOldDesign.d.ts

@@ -1,7 +1,7 @@
-import '../../assertEnvVite.js';
 export { generateVirtualFileGlobalEntryWithOldDesign };
 import type { ResolvedConfig } from 'vite';
 import type { Environment } from 'vite';
+import '../../assertEnvVite.js';
 declare function generateVirtualFileGlobalEntryWithOldDesign(id: string, options: {
     ssr?: boolean;
 } | undefined, config: ResolvedConfig, env: Environment, isDev: boolean): Promise<string>;

package/dist/node/vite/plugins/pluginVirtualFiles/generateVirtualFileGlobalEntryWithOldDesign.js

@@ -1,6 +1,5 @@
-import '../../assertEnvVite.js';
 export { generateVirtualFileGlobalEntryWithOldDesign };
-import { assert, assertWarning } from '../../../../utils/assert.js';
+import { assert } from '../../../../utils/assert.js';
 import { isVersionMatch } from '../../../../utils/assertVersion.js';
 import { debugGlob } from '../../../../utils/debugGlob.js';
 import { scriptFileExtensionPattern } from '../../../../utils/isScriptFile.js';
@@ -10,11 +9,12 @@ import { version as viteVersion } from 'vite';
 import { fileTypes } from '../../../../shared-server-client/getPageFiles/fileTypes.js';
 import path from 'node:path';
 import { generateVirtualFileGlobalEntry } from './generateVirtualFileGlobalEntry.js';
-import { getVikeConfigInternal, isV1Design as isV1Design_ } from '../../shared/resolveVikeConfigInternal.js';
+import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
 import { getOutDirs } from '../../shared/getOutDirs.js';
 import { isViteServerSide_extraSafe } from '../../shared/isViteServerSide.js';
 import { resolveIncludeAssetsImportedByServer } from '../../../../server/runtime/renderPageServer/getPageAssets/retrievePageAssetsProd.js';
 import { VIRTUAL_FILE_ID_constantsGlobalThis } from '../pluginReplaceConstantsGlobalThis.js';
+import '../../assertEnvVite.js';
 async function generateVirtualFileGlobalEntryWithOldDesign(id, options, config, env, isDev) {
     const idParsed = parseVirtualFileId(id);
     assert(idParsed && idParsed.type === 'global-entry');
@@ -78,8 +78,6 @@ export const neverLoaded = {};
 ${await generateVirtualFileGlobalEntry(isForClientSide, isDev, id, isClientRouting)}
 
 `;
-    // We still use import.meta.glob() when using th V1 design in order to not break the V1 design deprecation warning
-    const isV1Design = isV1Design_();
     const vikeConfig = await getVikeConfigInternal();
     // Old design => no + files => only to enable pre-rendering is setting `vike({prerender})` in vite.config.js
     const isPrerendering = !!vikeConfig.config.prerender;
@@ -94,19 +92,19 @@ ${await generateVirtualFileGlobalEntry(isForClientSide, isDev, id, isClientRouti
             isBuild,
         });
         if (includeImport) {
-            fileContent += getGlobs(globRoots, isBuild, fileType, null, isV1Design);
+            fileContent += getGlobs(globRoots, isBuild, fileType, null);
         }
         if (includeExportNames) {
-            fileContent += getGlobs(globRoots, isBuild, fileType, 'extractExportNames', isV1Design);
+            fileContent += getGlobs(globRoots, isBuild, fileType, 'extractExportNames');
         }
     });
     const includeAssetsImportedByServer = resolveIncludeAssetsImportedByServer(vikeConfig.config);
     if (includeAssetsImportedByServer && isForClientSide) {
-        fileContent += getGlobs(globRoots, isBuild, '.page.server', 'extractAssets', isV1Design);
+        fileContent += getGlobs(globRoots, isBuild, '.page.server', 'extractAssets');
     }
     return fileContent;
 }
-function getGlobs(globRoots, isBuild, fileType, query, isV1Design) {
+function getGlobs(globRoots, isBuild, fileType, query) {
     const isEager = isBuild && (query === 'extractExportNames' || fileType === '.page.route');
     let pageFilesVar;
     if (query === 'extractExportNames') {
@@ -149,19 +147,11 @@ function getGlobs(globRoots, isBuild, fileType, query, isV1Design) {
             const globOptions = { eager: isEager };
             if (query) {
                 const isNewViteInterface = isVersionMatch(viteVersion, ['5.1.0']);
-                if (isNewViteInterface &&
-                    // When used for the old design, the new syntax breaks Vike's CI (surprinsigly so). I couldn't reproduce locally (I didn't dig much).
-                    isV1Design) {
+                if (isNewViteInterface) {
                     globOptions.query = `?${query}`;
                 }
                 else {
                     globOptions.as = query;
-                    const msg = [
-                        "Update to the new V1 design to get rid of Vite's warning:",
-                        'The glob option "as" has been deprecated in favour of "query".',
-                        'See https://vike.dev/migration/v1-design for how to migrate.',
-                    ].join(' ');
-                    assertWarning(!isNewViteInterface, msg, { onlyOnce: true });
                 }
             }
             const globPaths = globExcludePath ? `[${globIncludePath}, ${globExcludePath}]` : `[${globIncludePath}]`;