vike 0.4.220-commit-5c7810f → 0.4.220-commit-af5c91f

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVirtualFilePageConfigValuesAll.js

@@ -31,9 +31,10 @@ async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
 function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAssetsImportedByServer, isDev) {
     const lines = [];
     const importStatements = [];
+    const filesEnv = new Map();
     const isClientRouting = getConfigValueBuildTime(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
     lines.push('export const configValuesSerialized = {');
-    lines.push(...serializeConfigValues(pageConfig, importStatements, (configEnv) => isRuntimeEnvMatch(configEnv, { isForClientSide, isClientRouting, isDev }), '', false));
+    lines.push(...serializeConfigValues(pageConfig, importStatements, filesEnv, (configEnv) => isRuntimeEnvMatch(configEnv, { isForClientSide, isClientRouting, isDev }), '', false));
     lines.push('};');
     if (!fixServerAssets_isEnabled() && includeAssetsImportedByServer && isForClientSide && !isDev) {
         importStatements.push(`import '${extractAssetsAddQuery(getVirtualFileIdPageConfigValuesAll(pageId, false))}'`);

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVirtualFilePageConfigs.js

@@ -12,17 +12,18 @@ async function getVirtualFilePageConfigs(isForClientSide, isDev, id, isClientRou
 function getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting) {
     const lines = [];
     const importStatements = [];
+    const filesEnv = new Map();
     lines.push('export const pageConfigsSerialized = [');
-    lines.push(getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, isDev, importStatements));
+    lines.push(getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, isDev, importStatements, filesEnv));
     lines.push('];');
     lines.push('export const pageConfigGlobalSerialized = {');
-    lines.push(getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isClientRouting, isDev, importStatements));
+    lines.push(getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isClientRouting, isDev, importStatements, filesEnv));
     lines.push('};');
     const code = [...importStatements, ...lines].join('\n');
     debug(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
     return code;
 }
-function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, isDev, importStatements) {
+function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRouting, isDev, importStatements, filesEnv) {
     const lines = [];
     pageConfigs.forEach((pageConfig) => {
         const { pageId, routeFilesystem, isErrorPage } = pageConfig;
@@ -34,17 +35,17 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
         const load = `() => ({ moduleId: ${virtualFileId}, moduleExports: import(${virtualFileId}) })`;
         lines.push(`    loadConfigValuesAll: ${load},`);
         lines.push(`    configValuesSerialized: {`);
-        lines.push(...serializeConfigValues(pageConfig, importStatements, (configEnv) => isRuntimeEnvMatch(configEnv, { isForClientSide, isClientRouting, isDev }), '    ', true));
+        lines.push(...serializeConfigValues(pageConfig, importStatements, filesEnv, (configEnv) => isRuntimeEnvMatch(configEnv, { isForClientSide, isClientRouting, isDev }), '    ', true));
         lines.push(`    },`);
         lines.push(`  },`);
     });
     const code = lines.join('\n');
     return code;
 }
-function getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isClientRouting, isDev, importStatements) {
+function getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isClientRouting, isDev, importStatements, filesEnv) {
     const lines = [];
     lines.push(`  configValuesSerialized: {`);
-    lines.push(...serializeConfigValues(pageConfigGlobal, importStatements, (configEnv) => isRuntimeEnvMatch(configEnv, { isForClientSide, isClientRouting, isDev }), '    ', null));
+    lines.push(...serializeConfigValues(pageConfigGlobal, importStatements, filesEnv, (configEnv) => isRuntimeEnvMatch(configEnv, { isForClientSide, isClientRouting, isDev }), '    ', null));
     lines.push(`  },`);
     const code = lines.join('\n');
     return code;

package/dist/esm/node/plugin/plugins/packageJsonFile.js

@@ -8,7 +8,7 @@
  */
 export { packageJsonFile };
 import { rollupIsEsm } from '../shared/rollupIsEsm.js';
-import { viteIsSSR } from '../utils.js';
+import { viteIsSSR } from '../shared/viteIsSSR.js';
 function packageJsonFile() {
     let config;
     return {

package/dist/esm/node/plugin/plugins/previewConfig.js

@@ -1,10 +1,11 @@
 export { previewConfig };
-import { assertUsage, getOutDirs, resolveOutDir, applyPreview } from '../utils.js';
+import { assertUsage, applyPreview } from '../utils.js';
 import fs from 'fs';
 import path from 'path';
 import { addSsrMiddleware } from '../shared/addSsrMiddleware.js';
 import pc from '@brillout/picocolors';
 import { logDockerHint } from './devConfig/index.js';
+import { getOutDirs, resolveOutDir } from '../shared/getOutDirs.js';
 function previewConfig() {
     let config;
     // let vikeConfig: VikeConfigObject

package/dist/esm/node/plugin/plugins/setGlobalContext.js

@@ -1,7 +1,8 @@
 export { setGlobalContext };
 import { setGlobalContext_isViteDev, setGlobalContext_viteDevServer, setGlobalContext_viteConfig, setGlobalContext_vikeConfig } from '../../runtime/globalContext.js';
-import { assertFilePathAbsoluteFilesystem, getOutDirs, isDevCheck, markSetup_isViteDev, markSetup_viteDevServer, markSetup_vitePreviewServer } from '../utils.js';
+import { assertFilePathAbsoluteFilesystem, isDevCheck, markSetup_isViteDev, markSetup_viteDevServer, markSetup_vitePreviewServer } from '../utils.js';
 import { getVikeConfig } from './importUserCode/v1-design/getVikeConfig.js';
+import { getOutDirs } from '../shared/getOutDirs.js';
 function setGlobalContext() {
     return [
         {

package/dist/esm/node/plugin/shared/findPageFiles.js

@@ -1,7 +1,8 @@
 export { findPageFiles };
 import glob from 'fast-glob';
-import { assertWarning, toPosixPath, scriptFileExtensions, getOutDirs } from '../utils.js';
+import { assertWarning, toPosixPath, scriptFileExtensions } from '../utils.js';
 import pc from '@brillout/picocolors';
+import { getOutDirs } from './getOutDirs.js';
 async function findPageFiles(config, fileTypes, isDev) {
     const cwd = config.root;
     const { outDirRoot } = getOutDirs(config);

package/dist/esm/node/plugin/{getOutDirs.js → shared/getOutDirs.js}

@@ -1,11 +1,8 @@
 export { getOutDirs };
 export { resolveOutDir };
-import { viteIsSSR } from '../../utils/viteIsSSR.js';
-import { assert, assertUsage } from '../../utils/assert.js';
-import { pathJoin } from '../../utils/path-shim.js';
-import { assertPosixPath, toPosixPath } from '../../utils/toPosixPath.js';
 import pc from '@brillout/picocolors';
-import { createDebugger } from '../../utils/debug.js';
+import { assert, assertPosixPath, assertUsage, createDebugger, pathJoin, toPosixPath } from '../utils.js';
+import { viteIsSSR } from './viteIsSSR.js';
 const debug = createDebugger('vike:outDir');
 function getOutDirs(config) {
     debug('getOutDirs()', new Error().stack);

package/dist/esm/node/plugin/{resolveClientEntriesDev.js → shared/resolveClientEntriesDev.js}

@@ -1,12 +1,9 @@
 export { resolveClientEntriesDev };
-import { assert, assertPosixPath, toPosixPath, pathJoin, assertIsNpmPackageImport, assertIsNotProductionRuntime } from './utils.js';
+import { assert, assertPosixPath, toPosixPath, pathJoin, assertIsNpmPackageImport, assertIsNotProductionRuntime } from '../utils.js';
 import { createRequire } from 'module';
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
-const __dirname_ = dirname(fileURLToPath(importMetaUrl));
 assertIsNotProductionRuntime();
 async function resolveClientEntriesDev(clientEntry, viteDevServer) {
     let root = viteDevServer.config.root;
@@ -32,13 +29,13 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer) {
             assert(clientEntry.endsWith('.js'));
             try {
                 // For Vitest (which doesn't resolve vike to its dist but to its source files)
-                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/node/plugin/resolveClientEntriesDev.js
-                filePath = toPosixPath(require_.resolve(clientEntry.replace('@@vike/dist/esm/client/', '../../client/').replace('.js', '.ts')));
+                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/node/plugin/shared/resolveClientEntriesDev.js
+                filePath = toPosixPath(require_.resolve(clientEntry.replace('@@vike/dist/esm/client/', '../../../client/').replace('.js', '.ts')));
             }
             catch {
                 // For users
-                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/resolveClientEntriesDev.js
-                filePath = toPosixPath(require_.resolve(clientEntry.replace('@@vike/dist/esm/client/', '../../../../dist/esm/client/')));
+                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/shared/resolveClientEntriesDev.js
+                filePath = toPosixPath(require_.resolve(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/')));
             }
         }
         else {

package/dist/esm/{utils → node/plugin/shared}/viteIsSSR.js

@@ -1,5 +1,5 @@
-import { assert } from './assert.js';
-import { isObject } from './isObject.js';
+import { assert } from '../../../utils/assert.js';
+import { isObject } from '../../../utils/isObject.js';
 export { viteIsSSR };
 export { viteIsSSR_options };
 function viteIsSSR(config) {

package/dist/esm/node/plugin/utils.d.ts

@@ -1,5 +1,4 @@
 export * from '../runtime/utils.js';
-export * from '../../utils/viteIsSSR.js';
 export * from '../../utils/requireResolve.js';
 export * from '../../utils/includes.js';
 export * from '../../utils/isDev.js';

package/dist/esm/node/plugin/utils.js

@@ -5,7 +5,6 @@ onLoad();
 // It's common practice for Vike's Vite plugin to import from Vike's sever runtime
 export * from '../runtime/utils.js';
 // Utils only needed by `plugin/*`
-export * from '../../utils/viteIsSSR.js';
 export * from '../../utils/requireResolve.js';
 export * from '../../utils/includes.js';
 export * from '../../utils/isDev.js';

package/dist/esm/node/prerender/context.d.ts

@@ -1,8 +1,10 @@
+export { isPrerenderEnabled };
 export { isPrerenderAutoRunEnabled };
 export { temp_disablePrerenderAutoRun };
 export { isPrerendering };
 export { setContextIsPrerendering };
 import type { VikeConfigObject } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
+declare function isPrerenderEnabled(vikeConfig: VikeConfigObject): boolean;
 declare function isPrerenderAutoRunEnabled(vikeConfig: VikeConfigObject): boolean;
 declare function temp_disablePrerenderAutoRun(): void;
 declare function isPrerendering(): boolean;

package/dist/esm/node/prerender/context.js

@@ -1,3 +1,4 @@
+export { isPrerenderEnabled };
 export { isPrerenderAutoRunEnabled };
 export { temp_disablePrerenderAutoRun };
 export { isPrerendering };
@@ -5,10 +6,14 @@ export { setContextIsPrerendering };
 import { getGlobalObject } from '../../utils/getGlobalObject.js';
 import { resolvePrerenderConfig } from './resolvePrerenderConfig.js';
 const globalObject = getGlobalObject('prerender/context.ts', {});
+function isPrerenderEnabled(vikeConfig) {
+    const prerenderConfig = resolvePrerenderConfig(vikeConfig);
+    return !!prerenderConfig;
+}
 function isPrerenderAutoRunEnabled(vikeConfig) {
-    const prerenderConfig = resolvePrerenderConfig(vikeConfig.global.config.prerender);
-    return (prerenderConfig &&
-        !prerenderConfig.disableAutoRun &&
+    const prerenderConfig = resolvePrerenderConfig(vikeConfig);
+    return (isPrerenderEnabled(vikeConfig) &&
+        !(prerenderConfig || {}).disableAutoRun &&
         !globalObject.isDisabled &&
         vikeConfig.global.config.disableAutoFullBuild !== 'prerender');
 }

package/dist/esm/node/prerender/resolvePrerenderConfig.d.ts

@@ -1,5 +1,12 @@
 export { resolvePrerenderConfig };
+export { resolvePrerenderConfigLocal };
 import type { ConfigResolved } from '../../shared/page-configs/Config/PageContextConfig.js';
+import { VikeConfigObject } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
+import type { PageConfigBuildTime } from '../../shared/page-configs/PageConfig.js';
 type PrerenderConfigSemiResolved = ConfigResolved['prerender'];
 type PrerenderConfig = false | Exclude<Required<NonNullable<PrerenderConfigSemiResolved>[number]>, boolean>;
-declare function resolvePrerenderConfig(prerenderConfigs: PrerenderConfigSemiResolved): PrerenderConfig;
+declare function resolvePrerenderConfig(vikeConfig: VikeConfigObject): PrerenderConfig;
+declare function resolvePrerenderConfigLocal(pageConfig: PageConfigBuildTime): {
+    value: boolean;
+    configValueFilePathToShowToUser: string;
+} | null;

package/dist/esm/node/prerender/resolvePrerenderConfig.js

@@ -1,12 +1,20 @@
 export { resolvePrerenderConfig };
+export { resolvePrerenderConfigLocal };
+import { assert, isArray } from './utils.js';
+import { getConfigValueBuildTime } from '../../shared/page-configs/getConfigValueBuildTime.js';
+import { getConfigValueFilePathToShowToUser } from '../../shared/page-configs/helpers.js';
 // TODO/now:
 // - prerender.value
-// - correct isPrerendering
-function resolvePrerenderConfig(prerenderConfigs) {
-    if (!prerenderConfigs || prerenderConfigs.every((configVal) => !configVal)) {
+function resolvePrerenderConfig(vikeConfig) {
+    const prerenderConfigs = vikeConfig.global.config.prerender;
+    if (!prerenderConfigs &&
+        !vikeConfig.pageConfigs.some((pageConfig) => resolvePrerenderConfigLocal(pageConfig)?.value)) {
         return false;
     }
-    const prerenderSettings = prerenderConfigs.filter(isObject2);
+    let prerenderSettings = prerenderConfigs || [];
+    // Needed because of backwards compatibility of `vike({prerender:true})` in `vite.config.js`; after we remove it we can remove this line.
+    prerenderSettings = prerenderSettings.filter(isObject2);
+    assert(prerenderSettings.every(isObject2));
     const prerenderConfig = {
         partial: pickFirst(prerenderSettings.map((c) => c.partial)) ?? false,
         noExtraDir: pickFirst(prerenderSettings.map((c) => c.noExtraDir)) ?? false,
@@ -15,8 +23,21 @@ function resolvePrerenderConfig(prerenderConfigs) {
     };
     return prerenderConfig;
 }
+function resolvePrerenderConfigLocal(pageConfig) {
+    const configValue = getConfigValueBuildTime(pageConfig, 'prerender');
+    if (!configValue)
+        return null;
+    const values = configValue.value;
+    assert(isArray(values));
+    const value = values[0];
+    assert(typeof value === 'boolean');
+    assert(isArray(configValue.definedAtData));
+    const configValueFilePathToShowToUser = getConfigValueFilePathToShowToUser(configValue.definedAtData[0]);
+    assert(configValueFilePathToShowToUser);
+    return { value, configValueFilePathToShowToUser };
+}
 function isObject2(p) {
-    return typeof p === 'object';
+    return typeof p === 'object' && p !== null;
 }
 function pickFirst(arr) {
     return arr.filter((v) => v !== undefined)[0];

package/dist/esm/node/prerender/runPrerender.js

@@ -4,7 +4,7 @@ export { runPrerenderFromAutoRun };
 export { runPrerender_forceExit };
 import path from 'path';
 import { route } from '../../shared/route/index.js';
-import { assert, assertUsage, assertWarning, hasProp, projectInfo, objectAssign, isObjectWithKeys, isCallable, getOutDirs, isPropertyGetter, assertPosixPath, urlToFile, isPlainObject, pLimit, isArray, changeEnumerable, onSetupPrerender, isObject, makePublicCopy } from './utils.js';
+import { assert, assertUsage, assertWarning, hasProp, projectInfo, objectAssign, isObjectWithKeys, isCallable, isPropertyGetter, assertPosixPath, urlToFile, isPlainObject, pLimit, isArray, changeEnumerable, onSetupPrerender, isObject, makePublicCopy } from './utils.js';
 import { prerenderPage, prerender404Page, getPageContextInitEnhanced } from '../runtime/renderPage/renderPageAlreadyRouted.js';
 import pc from '@brillout/picocolors';
 import { cpus } from 'os';
@@ -13,7 +13,6 @@ import { resolveConfig } from 'vite';
 import { getPageFilesServerSide } from '../../shared/getPageFiles.js';
 import { getPageContextRequestUrl } from '../../shared/getPageContextRequestUrl.js';
 import { getUrlFromRouteString } from '../../shared/route/resolveRouteString.js';
-import { getConfigValueFilePathToShowToUser } from '../../shared/page-configs/helpers.js';
 import { getConfigValueRuntime } from '../../shared/page-configs/getConfigValueRuntime.js';
 import { loadConfigValues } from '../../shared/page-configs/loadConfigValues.js';
 import { isErrorPage } from '../../shared/error-page.js';
@@ -25,10 +24,10 @@ import { noRouteMatch } from '../../shared/route/noRouteMatch.js';
 import { getVikeConfig } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
 import { logErrorHint } from '../runtime/renderPage/logErrorHint.js';
 import { executeHook, isUserHookError } from '../../shared/hooks/executeHook.js';
-import { getConfigValueBuildTime } from '../../shared/page-configs/getConfigValueBuildTime.js';
 import { prepareViteApiCall } from '../api/prepareViteApiCall.js';
 import { setContextIsPrerendering } from './context.js';
-import { resolvePrerenderConfig } from './resolvePrerenderConfig.js';
+import { resolvePrerenderConfig, resolvePrerenderConfigLocal } from './resolvePrerenderConfig.js';
+import { getOutDirs } from '../plugin/shared/getOutDirs.js';
 async function runPrerenderFromAPI(options = {}) {
     return await runPrerender(options, 'prerender()');
     // - We purposely propagate the error to the user land, so that the error interrupts the user land. It's also, I guess, a nice-to-have that the user has control over the error.
@@ -75,7 +74,7 @@ async function runPrerender(options = {}, standaloneTrigger) {
     const vikeConfig = await getVikeConfig(viteConfig);
     const { outDirClient } = getOutDirs(viteConfig);
     const { root } = viteConfig;
-    const prerenderConfig = resolvePrerenderConfig(vikeConfig.global.config.prerender);
+    const prerenderConfig = resolvePrerenderConfig(vikeConfig);
     validatePrerenderConfig(prerenderConfig);
     if (!prerenderConfig) {
         assert(standaloneTrigger);
@@ -122,15 +121,11 @@ async function runPrerender(options = {}, standaloneTrigger) {
 async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, concurrencyLimit) {
     // V1 design
     pageConfigs.forEach((pageConfig) => {
-        const configName = 'prerender';
-        const configValue = getConfigValueBuildTime(pageConfig, configName);
+        const configValue = resolvePrerenderConfigLocal(pageConfig);
         if (!configValue)
             return;
-        assert(hasProp(configValue, 'value', 'array'));
-        if (configValue.value[0] === false) {
-            assert(isArray(configValue.definedAtData));
-            const configValueFilePathToShowToUser = getConfigValueFilePathToShowToUser(configValue.definedAtData[0]);
-            assert(configValueFilePathToShowToUser);
+        const { value, configValueFilePathToShowToUser } = configValue;
+        if (value === false) {
             doNotPrerenderList.push({
                 pageId: pageConfig.pageId,
                 setByConfigName: 'prerender',

package/dist/esm/node/prerender/utils.d.ts

@@ -4,9 +4,8 @@ export * from '../../utils/projectInfo.js';
 export * from '../../utils/objectAssign.js';
 export * from '../../utils/isObjectWithKeys.js';
 export * from '../../utils/isCallable.js';
-export * from '../plugin/getOutDirs.js';
 export * from '../../utils/isPropertyGetter.js';
-export * from '../../utils/toPosixPath.js';
+export * from '../../utils/path.js';
 export * from '../../utils/urlToFile.js';
 export * from '../../utils/isPlainObject.js';
 export * from '../../utils/assertSetup.js';

package/dist/esm/node/prerender/utils.js

@@ -6,9 +6,8 @@ export * from '../../utils/projectInfo.js';
 export * from '../../utils/objectAssign.js';
 export * from '../../utils/isObjectWithKeys.js';
 export * from '../../utils/isCallable.js';
-export * from '../plugin/getOutDirs.js';
 export * from '../../utils/isPropertyGetter.js';
-export * from '../../utils/toPosixPath.js';
+export * from '../../utils/path.js';
 export * from '../../utils/urlToFile.js';
 export * from '../../utils/isPlainObject.js';
 export * from '../../utils/assertSetup.js';

package/dist/esm/node/runtime/html/injectAssets/getHtmlTags.js

@@ -1,3 +1,4 @@
+import { isFontFallback } from '../../renderPage/isFontFallback.js';
 export { getHtmlTags };
 import { assert, assertWarning, assertUsage, isObject, freezePartial } from '../../utils.js';
 import { serializePageContextClientSide } from '../serializePageContextClientSide.js';
@@ -15,7 +16,8 @@ function getHtmlTags(pageContext, streamFromReactStreamingPackage, injectFilter,
     const isHtmlOnly = pageContext._isHtmlOnly;
     const { isProduction } = getGlobalContext();
     const injectScriptsAt = getInjectScriptsAt(pageContext.pageId, pageContext._pageConfigs);
-    const injectFilterEntries = pageAssets
+    const injectFilterEntries = [];
+    pageAssets
         .filter((asset) => {
         if (asset.isEntry && asset.assetType === 'script') {
             // We could allow the user to change the position of <script> but we currently don't:
@@ -26,15 +28,18 @@ function getHtmlTags(pageContext, streamFromReactStreamingPackage, injectFilter,
         }
         return true;
     })
-        .map((asset) => {
+        .forEach((asset) => {
         const inject = (() => {
             if (!isProduction) {
                 // In development, we should always load assets as soon as possible, in order to eagerly process assets (e.g. applying the transform() hooks of Vite plugins) which are lazily discovered.
                 return 'HTML_BEGIN';
             }
-            if (asset.assetType === 'style' || asset.assetType === 'font') {
+            if (asset.assetType === 'style') {
                 return 'HTML_BEGIN';
             }
+            if (asset.assetType === 'font') {
+                return !isFontFallback(asset, injectFilterEntries) ? 'HTML_BEGIN' : false;
+            }
             if (asset.assetType === 'script') {
                 if (isHtmlOnly)
                     return false;
@@ -48,7 +53,7 @@ function getHtmlTags(pageContext, streamFromReactStreamingPackage, injectFilter,
             // @ts-ignore
             [stamp]: true
         };
-        return entry;
+        injectFilterEntries.push(entry);
     });
     assertInjectFilterEntries(injectFilterEntries);
     // ==============

package/dist/esm/node/runtime/renderPage/getEarlyHints.js

@@ -1,6 +1,6 @@
 export { getEarlyHints };
+import { isFontFallback } from './isFontFallback.js';
 import { inferEarlyHintLink } from '../html/injectAssets/inferHtmlTags.js';
-import { assert } from '../utils.js';
 function getEarlyHints(assets) {
     const earlyHints = [];
     {
@@ -16,28 +16,3 @@ function getEarlyHints(assets) {
     }
     return earlyHints;
 }
-function isFontFallback(asset, earlyHints) {
-    if (asset.assetType !== 'font') {
-        return false;
-    }
-    const fontUrlBase = removeFileExtentionAndHash(asset.src);
-    return earlyHints.some((hint) => {
-        return hint.assetType === 'font' && removeFileExtentionAndHash(hint.src) === fontUrlBase;
-    });
-}
-function removeFileExtentionAndHash(assetUrl) {
-    assert(!assetUrl.includes('\\'));
-    // The logic below doesn't work for '/assets/chunk-0e184ced.js'
-    assert(!assetUrl.endsWith('.js'));
-    const paths = assetUrl.split('/');
-    {
-        const filename = paths[paths.length - 1];
-        const filenameParts = filename.split('.');
-        assert(filenameParts.length >= 2);
-        // User may set config.build.rollupOptions.output.assetFileNames => we can't assume the filename to be `*.${hash}.${ext}`
-        const filenameBase = filenameParts.slice(0, filenameParts.length === 2 ? -1 : -2);
-        assert(filenameBase.length >= 1);
-        paths[paths.length - 1] = filenameBase.join('.');
-    }
-    return paths.join('/');
-}

package/dist/esm/node/runtime/renderPage/getPageAssets.d.ts

@@ -5,7 +5,7 @@ export type { GetPageAssets };
 export type { PageContextGetPageAssets };
 import { type MediaType } from './inferMediaType.js';
 import type { ClientDependency } from '../../../shared/getPageFiles/analyzePageClientSide/ClientDependency.js';
-import type { ResolveClientEntriesDev } from '../../plugin/resolveClientEntriesDev.js';
+import type { ResolveClientEntriesDev } from '../../plugin/shared/resolveClientEntriesDev.js';
 type PageAsset = {
     src: string;
     assetType: null | NonNullable<MediaType>['assetType'];

package/dist/esm/node/runtime/renderPage/isFontFallback.d.ts

@@ -0,0 +1,3 @@
+export { isFontFallback };
+import type { PageAsset } from './getPageAssets.js';
+declare function isFontFallback(asset: PageAsset, pageAssets: PageAsset[]): boolean;

package/dist/esm/node/runtime/renderPage/isFontFallback.js

@@ -0,0 +1,27 @@
+export { isFontFallback };
+import { assert } from '../../../utils/assert.js';
+function isFontFallback(asset, pageAssets) {
+    if (asset.assetType !== 'font') {
+        return false;
+    }
+    const fontUrlBase = removeFileExtentionAndHash(asset.src);
+    return pageAssets.some((assetOther) => {
+        return assetOther.assetType === 'font' && removeFileExtentionAndHash(assetOther.src) === fontUrlBase;
+    });
+}
+function removeFileExtentionAndHash(assetUrl) {
+    assert(!assetUrl.includes('\\'));
+    // The logic below doesn't work for '/assets/chunk-0e184ced.js'
+    assert(!assetUrl.endsWith('.js'));
+    const paths = assetUrl.split('/');
+    {
+        const filename = paths[paths.length - 1];
+        const filenameParts = filename.split('.');
+        assert(filenameParts.length >= 2);
+        // User may set config.build.rollupOptions.output.assetFileNames => we can't assume the filename to be `*.${hash}.${ext}`
+        const filenameBase = filenameParts.slice(0, filenameParts.length === 2 ? -1 : -2);
+        assert(filenameBase.length >= 1);
+        paths[paths.length - 1] = filenameBase.join('.');
+    }
+    return paths.join('/');
+}

package/dist/esm/node/runtime/utils.d.ts

@@ -21,8 +21,6 @@ export * from '../../utils/compareString.js';
 export * from '../../utils/isObjectWithKeys.js';
 export * from '../../utils/stringifyStringArray.js';
 export * from '../../utils/unique.js';
-export * from '../../utils/toPosixPath.js';
-export * from '../plugin/getOutDirs.js';
 export * from '../../utils/capitalizeFirstLetter.js';
 export * from '../../utils/debugGlob.js';
 export * from '../../utils/isSameErrorMessage.js';
@@ -41,7 +39,7 @@ export * from '../../utils/objectEntries.js';
 export * from '../../utils/objectFromEntries.js';
 export * from '../../utils/getFileExtension.js';
 export * from '../../utils/assertSetup.js';
-export * from '../../utils/path-shim.js';
+export * from '../../utils/path.js';
 export * from '../../utils/isHtml.js';
 export * from '../../utils/warnIfErrorIsNotObject.js';
 export * from '../../utils/stripAnsi.js';

package/dist/esm/node/runtime/utils.js

@@ -25,8 +25,6 @@ export * from '../../utils/compareString.js';
 export * from '../../utils/isObjectWithKeys.js';
 export * from '../../utils/stringifyStringArray.js';
 export * from '../../utils/unique.js';
-export * from '../../utils/toPosixPath.js';
-export * from '../plugin/getOutDirs.js';
 export * from '../../utils/capitalizeFirstLetter.js';
 export * from '../../utils/debugGlob.js';
 export * from '../../utils/isSameErrorMessage.js';
@@ -45,7 +43,7 @@ export * from '../../utils/objectEntries.js';
 export * from '../../utils/objectFromEntries.js';
 export * from '../../utils/getFileExtension.js';
 export * from '../../utils/assertSetup.js';
-export * from '../../utils/path-shim.js';
+export * from '../../utils/path.js';
 export * from '../../utils/isHtml.js';
 export * from '../../utils/warnIfErrorIsNotObject.js';
 export * from '../../utils/stripAnsi.js';

package/dist/esm/shared/getPageFiles/fileTypes.js

@@ -2,7 +2,7 @@
 export { fileTypes };
 export { isValidFileType };
 export { determineFileType };
-import { assert, assertPosixPath } from '../utils.js';
+import { assert } from '../utils.js';
 import { isScriptFile } from '../../utils/isScriptFile.js';
 const fileTypes = [
     '.page',
@@ -18,7 +18,6 @@ function isValidFileType(filePath) {
     return ['.js', '.mjs', '.cjs', '.css'].some((ext) => filePath.endsWith(ext));
 }
 function determineFileType(filePath) {
-    assertPosixPath(filePath);
     {
         const isCSS = filePath.endsWith('.css');
         if (isCSS) {

package/dist/esm/shared/getPageFiles/getAllPageIdFiles.js

@@ -2,7 +2,6 @@
 export { getPageFilesClientSide };
 export { getPageFilesServerSide };
 import { assert, assertUsage, isNotNullish } from '../utils.js';
-import { assertPageFilePath } from '../assertPageFilePath.js';
 function getPageFilesClientSide(pageFilesAll, pageId) {
     return determine(pageFilesAll, pageId, true);
 }
@@ -86,8 +85,6 @@ function getPageFilesSorter(envIsClient, pageId) {
     };
 }
 function getPathDistance(pathA, pathB) {
-    assertPageFilePath(pathA);
-    assertPageFilePath(pathB);
     // Index of first different character
     let idx = 0;
     for (; idx < pathA.length && idx < pathB.length; idx++) {

package/dist/esm/shared/getPageFiles/getPageFileObject.js

@@ -1,7 +1,6 @@
 // TODO/v1-release: remove
 export { getPageFileObject };
 import { determinePageIdOld } from '../determinePageIdOld.js';
-import { assertPageFilePath } from '../assertPageFilePath.js';
 import { isErrorPageId } from '../error-page.js';
 import { assert, slice } from '../utils.js';
 import { determineFileType } from './fileTypes.js';
@@ -36,19 +35,15 @@ function getPageFileObject(filePath) {
     return pageFile;
 }
 function isDefaultFilePath(filePath) {
-    assertPageFilePath(filePath);
     if (isErrorPageId(filePath, false)) {
         return false;
     }
     return filePath.includes('/_default');
 }
 function isRendererFilePath(filePath) {
-    assertPageFilePath(filePath);
     return filePath.includes('/renderer/');
 }
 function isAncestorDefaultPage(pageId, defaultPageFilePath) {
-    assertPageFilePath(pageId);
-    assertPageFilePath(defaultPageFilePath);
     assert(!pageId.endsWith('/'));
     assert(!defaultPageFilePath.endsWith('/'));
     assert(isDefaultFilePath(defaultPageFilePath));

package/dist/esm/shared/page-configs/PageConfig.d.ts

@@ -49,7 +49,6 @@ type PageConfigBuildTime = PageConfigCommon & {
 /** Global config that applies to all pages, build-time data structure */
 type PageConfigGlobalBuildTime = {
     configValueSources: ConfigValueSources;
-    interfaceFiles: InterfaceFilesByLocationId;
     configDefinitions: ConfigDefinitions;
     configValuesComputed?: undefined;
 };

package/dist/esm/shared/page-configs/serialize/serializeConfigValues.d.ts

@@ -1,7 +1,8 @@
 export { serializeConfigValues };
 export { getConfigValuesBase };
+export type { FilesEnv };
 import type { ConfigEnvInternal, ConfigValueSource, DefinedAtFile, PageConfigBuildTime, PageConfigGlobalBuildTime } from '../PageConfig.js';
-declare function serializeConfigValues(pageConfig: PageConfigBuildTime | PageConfigGlobalBuildTime, importStatements: string[], isEnvMatch: (configEnv: ConfigEnvInternal) => boolean, tabspace: string, isEager: boolean | null): string[];
+declare function serializeConfigValues(pageConfig: PageConfigBuildTime | PageConfigGlobalBuildTime, importStatements: string[], filesEnv: FilesEnv, isEnvMatch: (configEnv: ConfigEnvInternal) => boolean, tabspace: string, isEager: boolean | null): string[];
 declare function getConfigValuesBase(pageConfig: PageConfigBuildTime | PageConfigGlobalBuildTime, isEnvMatch: (configEnv: ConfigEnvInternal) => boolean, isEager: boolean | null): ConfigValuesBase;
 type ConfigValuesBase = ({
     configValueBase: {
@@ -9,6 +10,7 @@ type ConfigValuesBase = ({
         definedAtData: null;
     };
     value: unknown;
+    configEnv: ConfigEnvInternal;
     configName: string;
 } | {
     configValueBase: {
@@ -25,3 +27,7 @@ type ConfigValuesBase = ({
     sourcesRelevant: ConfigValueSource[];
     configName: string;
 })[];
+type FilesEnv = Map<string, {
+    configEnv: ConfigEnvInternal;
+    configName: string;
+}[]>;