vike 0.4.253-commit-3e3975d → 0.4.253-commit-332f31b

package/dist/node/vite/index.js

@@ -36,6 +36,7 @@ import { pluginModuleBanner } from './plugins/build/pluginModuleBanner.js';
 import { pluginReplaceConstantsNonRunnableDev } from './plugins/non-runnable-dev/pluginReplaceConstantsNonRunnableDev.js';
 import { isVikeCliOrApi } from '../../shared-server-node/api-context.js';
 import { pluginViteConfigVikeExtensions } from './plugins/pluginViteConfigVikeExtensions.js';
+import { pluginStripPointerImportAttribute } from './plugins/pluginStripPointerImportAttribute.js';
 import { getVikeConfigInternalEarly, isOnlyResolvingUserConfig } from '../api/resolveViteConfigFromUser.js';
 import './assertEnvVite.js';
 // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
@@ -67,6 +68,7 @@ function plugin(vikeVitePluginOptions = {}) {
             ...pluginReplaceConstantsGlobalThis(),
             ...pluginStaticReplace(vikeConfig),
             ...pluginNonRunnabeDev(),
+            ...pluginStripPointerImportAttribute(),
             ...(await pluginViteConfigVikeExtensions(vikeConfig)),
         ];
         Object.assign(plugin, pluginAddendum);

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

@@ -181,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)

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/shared/resolveVikeConfigInternal/crawlPlusFilePaths/ignorePatternsBuiltIn.d.ts

@@ -1,2 +1,2 @@
 import '../../../assertEnvVite.js';
-export declare const ignorePatternsBuiltIn: readonly ["**/node_modules/**", "**/ejected/**", "**/*.telefunc.*", "**/.history/**", "**/*.generated.*"];
+export declare const ignorePatternsBuiltIn: readonly ["**/node_modules/**", "**/ejected/**", "**/*.telefunc.*", "**/.history/**", "**/*.generated.*", "**/*.spec.*", "**/*.test.*"];

package/dist/node/vite/shared/resolveVikeConfigInternal/crawlPlusFilePaths/ignorePatternsBuiltIn.js

@@ -13,4 +13,7 @@ export const ignorePatternsBuiltIn = [
     '**/.history/**',
     // https://github.com/vikejs/vike/discussions/2222
     '**/*.generated.*',
+    // https://github.com/vikejs/vike/issues/2347
+    '**/*.spec.*',
+    '**/*.test.*',
 ];

package/dist/node/vite/shared/resolveVikeConfigInternal/getPlusFilesByLocationId.d.ts

@@ -14,6 +14,7 @@ type PlusFileCommon = {
 };
 /** +config.js */
 type PlusFileConfig = PlusFileCommon & {
+    /** Whether file is `+config.js` or `+{configName}.js` */
     isConfigFile: true;
     fileExportsByConfigName: Record<string, // configName
     unknown>;
@@ -25,6 +26,7 @@ type PlusFileConfig = PlusFileCommon & {
 };
 /** +{configName}.js */
 type PlusFileValue = PlusFileCommon & {
+    /** Whether file is `+config.js` or `+{configName}.js` */
     isConfigFile: false;
     configName: string;
 } & ({

package/dist/node/vite/shared/resolveVikeConfigInternal/transpileAndExecuteFile.js

@@ -15,7 +15,7 @@ import { genPromise } from '../../../../utils/genPromise.js';
 import { assertFilePathAbsoluteFilesystem } from '../../../../utils/isFilePathAbsoluteFilesystem.js';
 import { isImportPathRelative } from '../../../../utils/isImportPath.js';
 import { isObject } from '../../../../utils/isObject.js';
-import { isPlainScriptFile, isScriptFile } from '../../../../utils/isScriptFile.js';
+import { isPlainScriptFile } from '../../../../utils/isScriptFile.js';
 import { isVitest } from '../../../../utils/isVitest.js';
 import { assertIsImportPathNpmPackage, isImportPathNpmPackageOrPathAlias } from '../../../../utils/parseNpmPackage.js';
 import { assertPosixPath, toPosixPath } from '../../../../utils/path.js';
@@ -182,19 +182,10 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                     //   - assertIsImportPathNpmPackage()
                     //   - isImportPathNpmPackage(str, { cannotBePathAlias: true })
                     assertFilePathAbsoluteFilesystem(importPathResolved);
-                    // Non-script file (e.g. .svg, .css) => resolve to constant string so that files with
-                    // `env: { config: true, client: true }` can also be loaded in Node.js
-                    if (!isScriptFile(importPathResolved)) {
-                        esbuildCache.vikeConfigDependencies.add(importPathResolved);
-                        return {
-                            path: importPathResolved,
-                            namespace: 'vike-static-file',
-                        };
-                    }
                     //  Should be remove this? See comment below.
                     const isVikeExtensionImport = (path.startsWith('vike-') && path.endsWith('/config')) || importPathResolved.endsWith('+config.js');
                     const isPointerImport = transformImports === 'all' ||
-                        // .jsx, .tsx, .vue, .svelte, ... => template/JSX files => pointer import
+                        // .jsx, .vue, .svg, ... => obviously not config code => pointer import
                         !isPlainScriptFile(importPathResolved) ||
                         // Import of a Vike extension config => make it a pointer import because we want to show nice error messages (that can display whether a config has been set by the user or by a Vike extension).
                         //  - Should we stop doing this? (And instead let Node.js directly load Vike extensions.)
@@ -202,9 +193,7 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                         //      - vike@0.4.162 started soft-requiring Vike extensions to set the name config.
                         //    - In practice, it seems like it requires some (non-trivial?) refactoring.
                         isVikeExtensionImport ||
-                        // `with { type: 'runtime' }` => regular pointer import so that the pointer import
-                        // mechanism correctly encodes path + export name (import:path:exportName).
-                        args.with?.['type'] === 'runtime';
+                        args.with?.['type'] === 'vike-pointer';
                     assertPosixPath(importPathResolved);
                     // `isNpmPkgImport` => `importPathOriginal` is most likely an npm package import, but it can also be a path alias that a) looks like an npm package import and b) resolves outside of `userRootDir`.
                     const isNpmPkgImport = (() => {
@@ -273,14 +262,6 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                     pointerImports[importPathTranspiled] = isPointerImport;
                     return { external: true, path: importPathTranspiled };
                 });
-                build.onLoad({ filter: /.*/, namespace: 'vike-static-file' }, (args) => {
-                    // args.path is an absolute filesystem path; convert to a Vite-compatible path.
-                    const vitePath = getFilePathAbsoluteUserRootDir({ filePathAbsoluteFilesystem: args.path, userRootDir }) ?? `/@fs${args.path}`;
-                    return {
-                        contents: `export default 'STATIC_FILE_NOT_AVAILABLE:${vitePath}'`,
-                        loader: 'js',
-                    };
-                });
             },
         },
         // Track dependencies

package/dist/node/vite/shared/resolveVikeConfigInternal.js

@@ -513,7 +513,7 @@ function getSourceNonConfigFile(configName, value, definedAt) {
         definedAt,
         locationId: '/',
         plusFile: null,
-        valueIsLoadedWithImport: false,
+        valueLoadedViaImport: false,
         valueIsDefinedByPlusValueFile: false,
     };
     return source;
@@ -667,7 +667,7 @@ function getConfigValueSources(configName, plusFile, configDef, userRootDir) {
             value: valueFilePath,
             valueIsFilePath: true,
             configEnv: configDef.env,
-            valueIsLoadedWithImport: false,
+            valueLoadedViaImport: false,
             valueIsDefinedByPlusValueFile: false,
             definedAt: definedAtFilePath,
         };
@@ -692,7 +692,7 @@ function getConfigValueSources(configName, plusFile, configDef, userRootDir) {
                     ...configValueSourceCommon,
                     ...value,
                     configEnv: resolveConfigEnv(configDef.env, pointerImport.fileExportPath),
-                    valueIsLoadedWithImport: true,
+                    valueLoadedViaImport: true,
                     valueIsDefinedByPlusValueFile: false,
                     definedAt: pointerImport.fileExportPath,
                 };
@@ -705,7 +705,7 @@ function getConfigValueSources(configName, plusFile, configDef, userRootDir) {
             valueIsLoaded: true,
             value: confVal.value,
             configEnv: configDef.env,
-            valueIsLoadedWithImport: false,
+            valueLoadedViaImport: false,
             valueIsDefinedByPlusValueFile: false,
             definedAt: definedAtFilePath_,
         };
@@ -719,7 +719,14 @@ function getConfigValueSources(configName, plusFile, configDef, userRootDir) {
             ...configValueSourceCommon,
             ...confVal,
             configEnv: configEnvResolved,
-            valueIsLoadedWithImport: !confVal.valueIsLoaded || !isJsonValue(confVal.value),
+            valueLoadedViaImport: 
+            // If +{configName}.js is (also) runtime code => always load it via import (not strictly required, but seems to be a good default)
+            !!configEnvResolved.client ||
+                !!configEnvResolved.server ||
+                // No choice: value isn't loaded at config-time
+                !confVal.valueIsLoaded ||
+                // No choice: value isn't serializable
+                !isJsonValue(confVal.value),
             valueIsDefinedByPlusValueFile: true,
             definedAt: {
                 ...plusFile.filePath,
@@ -903,7 +910,7 @@ function applyEffectConfVal(configModFromEffect, sourceEffect, configValueSource
             plusFile: sourceEffect.plusFile,
             locationId: sourceEffect.locationId,
             configEnv: configDef.env,
-            valueIsLoadedWithImport: false,
+            valueLoadedViaImport: false,
             valueIsDefinedByPlusValueFile: false,
             valueIsLoaded: true,
             value: configValue,

package/dist/shared-server-client/page-configs/loadAndParseVirtualFilePageEntry.js

@@ -16,7 +16,18 @@ async function loadAndParseVirtualFilePageEntry(pageConfig, isDev) {
     // Catch @cloudflare/vite-plugin bug
     assertVirtualFileExports(moduleExports, () => 'configValuesSerialized' in moduleExports, moduleId);
     const virtualFileExportsPageEntry = moduleExports;
-    const configValues = parseVirtualFileExportsPageEntry(virtualFileExportsPageEntry);
+    let configValues;
+    try {
+        configValues = parseVirtualFileExportsPageEntry(virtualFileExportsPageEntry);
+    }
+    catch (e) {
+        if (!(e instanceof ReferenceError))
+            throw e;
+        // Safari WebKit bug: dynamic import() may resolve before the module body executes,
+        // https://github.com/vikejs/vike/issues/3121
+        await new Promise((resolve) => setTimeout(resolve));
+        configValues = parseVirtualFileExportsPageEntry(virtualFileExportsPageEntry);
+    }
     Object.assign(pageConfig.configValues, configValues);
     objectAssign(pageConfig, { isPageEntryLoaded: true });
     return pageConfig;

package/dist/shared-server-client/page-configs/serialize/serializeConfigValues.js

@@ -16,7 +16,6 @@ import { getConfigValueSourcesRelevant, isRuntimeEnvMatch, } from '../../../node
 const stringifyOptions = { forbidReactElements: true };
 const REPLACE_ME_BEFORE = '__VIKE__REPLACE_ME_BEFORE__';
 const REPLACE_ME_AFTER = '__VIKE__REPLACE_ME_AFTER__';
-const STATIC_FILE_NOT_AVAILABLE_PREFIX = 'STATIC_FILE_NOT_AVAILABLE:';
 // This file is never loaded on the client-side but we save it under the vike/shared/ directory in order to collocate it with parsePageConfigsSerialized()
 // - vike/shared/page-configs/serialize/parsePageConfigsSerialized.ts
 // - parsePageConfigsSerialized() is loaded on both the client- and server-side.
@@ -53,7 +52,7 @@ function serializeConfigValues(pageConfig, importStatements, filesEnv, runtimeEn
 }
 function getValueSerializedFromSource(configValueSource, configName, importStatements, filesEnv) {
     let valueData;
-    if (configValueSource.valueIsLoaded && !configValueSource.valueIsLoadedWithImport) {
+    if (configValueSource.valueIsLoaded && !configValueSource.valueLoadedViaImport) {
         valueData = getValueSerializedWithJson(configValueSource.value, configName, configValueSource.definedAt, importStatements, filesEnv, configValueSource.configEnv);
     }
     else {
@@ -142,15 +141,6 @@ function valueToJson(value, configName, definedAtData, importStatements, filesEn
                         const replacement = [REPLACE_ME_BEFORE, importName, REPLACE_ME_AFTER].join('');
                         return { replacement };
                     }
-                    // Handle STATIC_FILE_NOT_AVAILABLE strings: these are generated during config
-                    // execution when a non-script file (e.g. .svg) or a `with { type: 'runtime' }`
-                    // import is encountered. They must become runtime imports, not raw strings.
-                    if (value.startsWith(STATIC_FILE_NOT_AVAILABLE_PREFIX)) {
-                        const importPath = value.slice(STATIC_FILE_NOT_AVAILABLE_PREFIX.length);
-                        const { importName } = addImportStatement(importStatements, importPath, 'default', filesEnv, configEnv, configName);
-                        const replacement = [REPLACE_ME_BEFORE, importName, REPLACE_ME_AFTER].join('');
-                        return { replacement };
-                    }
                 }
             },
         });

package/dist/types/PageConfig.d.ts

@@ -98,7 +98,7 @@ type ConfigValueSource = {
     plusFile: PlusFile | null;
     locationId: LocationId;
     /** Whether the config value is loaded at runtime, for example config.Page or config.onBeforeRender */
-    valueIsLoadedWithImport: boolean;
+    valueLoadedViaImport: boolean;
     /** Whether the config value is a file path, this is currently only true for +client */
     valueIsFilePath?: true;
     /** Whether the config value is defined by a +{configName}.js file */

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.253-commit-3e3975d";
+export declare const PROJECT_VERSION: "0.4.253-commit-332f31b";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.253-commit-3e3975d';
+export const PROJECT_VERSION = '0.4.253-commit-332f31b';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.253-commit-3e3975d",
+  "version": "0.4.253-commit-332f31b",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {