vike 0.4.220-commit-a9f46b8 → 0.4.220-commit-5c7810f

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/loadFileAtConfigTime.d.ts

@@ -1,10 +1,12 @@
 export { loadImportedFile };
 export { loadValueFile };
+export { loadValueFiles };
 export { loadConfigFile };
 export type { ImportedFilesLoaded };
 export type { ConfigFile };
 import type { FilePathResolved } from '../../../../../../shared/page-configs/FilePath.js';
-import type { InterfaceValueFile } from '../getVikeConfig.js';
+import { InterfaceFilesByLocationId, type InterfaceValueFile } from '../getVikeConfig.js';
+import type { ConfigDefinitions } from './configDefinitionsBuiltIn.js';
 type ImportedFilesLoaded = Record<string, Promise<Record<string, unknown>>>;
 type ConfigFile = {
     fileExports: Record<string, unknown>;
@@ -14,7 +16,8 @@ type ConfigFile = {
 declare function loadImportedFile(import_: FilePathResolved & {
     fileExportName: string;
 }, userRootDir: string, importedFilesLoaded: ImportedFilesLoaded): Promise<unknown>;
-declare function loadValueFile(interfaceValueFile: InterfaceValueFile, configName: string, userRootDir: string): Promise<void>;
+declare function loadValueFile(interfaceValueFile: InterfaceValueFile, configDefinitions: ConfigDefinitions, userRootDir: string): Promise<void>;
+declare function loadValueFiles(interfaceFiles: InterfaceFilesByLocationId, configDefinitions: ConfigDefinitions, userRootDir: string): Promise<void>;
 declare function loadConfigFile(configFilePath: FilePathResolved, userRootDir: string, visited: string[], isExtensionConfig: boolean): Promise<{
     configFile: ConfigFile;
     extendsConfigs: ConfigFile[];

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

@@ -1,9 +1,11 @@
-// Files loadded at config time:
+// Files loaded at config time:
 export { loadImportedFile };
 export { loadValueFile };
+export { loadValueFiles };
 export { loadConfigFile };
-import { assert, assertUsage, assertIsNotProductionRuntime, isArrayOfStrings, isObject } from '../../../../utils.js';
+import { assert, assertUsage, assertIsNotProductionRuntime, isArrayOfStrings, isObject, genPromise } from '../../../../utils.js';
 import { transpileAndExecuteFile } from './transpileAndExecuteFile.js';
+import { getConfigDefinitionOptional, shouldBeLoadableAtBuildTime } from '../getVikeConfig.js';
 import { assertPlusFileExport } from '../../../../../../shared/page-configs/assertPlusFileExport.js';
 import pc from '@brillout/picocolors';
 import { parsePointerImportData } from './transformPointerImports.js';
@@ -21,15 +23,39 @@ async function loadImportedFile(import_, userRootDir, importedFilesLoaded) {
     return fileExport;
 }
 // Load +{configName}.js
-async function loadValueFile(interfaceValueFile, configName, userRootDir) {
+async function loadValueFile(interfaceValueFile, configDefinitions, userRootDir) {
+    const { configName } = interfaceValueFile;
+    const configDef = getConfigDefinitionOptional(configDefinitions, configName);
+    if (!configDef || !shouldBeLoadableAtBuildTime(configDef)) {
+        // Only load value files with `env.config===true`
+        return;
+    }
+    if (interfaceValueFile.isValueLoaded) {
+        await interfaceValueFile.isValueLoaded;
+        if (
+        // Help TS
+        true)
+            return;
+    }
+    const { promise, resolve } = genPromise();
+    interfaceValueFile.isValueLoaded = promise;
+    assert(interfaceValueFile.isValueLoaded);
+    interfaceValueFile.fileExportsByConfigName = {};
     const { fileExports } = await transpileAndExecuteFile(interfaceValueFile.filePath, userRootDir, false);
+    resolve();
     const { filePathToShowToUser } = interfaceValueFile.filePath;
     assertPlusFileExport(fileExports, filePathToShowToUser, configName);
     Object.entries(fileExports).forEach(([exportName, configValue]) => {
         const configName_ = exportName === 'default' ? configName : exportName;
-        interfaceValueFile.fileExportsByConfigName[configName_] = { configValue };
+        interfaceValueFile.fileExportsByConfigName[configName_] = configValue;
     });
 }
+async function loadValueFiles(interfaceFiles, configDefinitions, userRootDir) {
+    await Promise.all(Object.values(interfaceFiles)
+        .flat(1)
+        .filter((interfaceFile) => interfaceFile.isValueFile)
+        .map(async (interfaceFile) => await loadValueFile(interfaceFile, configDefinitions, userRootDir)));
+}
 // Load +config.js, including all its extends pointer imports
 async function loadConfigFile(configFilePath, userRootDir, visited, isExtensionConfig) {
     const { filePathAbsoluteFilesystem } = configFilePath;

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.d.ts

@@ -4,13 +4,15 @@ export { reloadVikeConfig };
 export { vikeConfigDependencies };
 export { isVikeConfigFile };
 export { isV1Design };
-export { getConfigValueInterfaceFile };
+export { getConfVal };
+export { getConfigDefinitionOptional };
+export { shouldBeLoadableAtBuildTime };
 export type { VikeConfigObject };
 export type { InterfaceValueFile };
 export type { InterfaceFile };
-export type { VikeConfigGlobal };
-export type { VikeVitePluginOptions };
+export type { InterfaceFilesByLocationId };
 import type { PageConfigGlobalBuildTime, PageConfigBuildTime } from '../../../../../shared/page-configs/PageConfig.js';
+import { type ConfigDefinitions, type ConfigDefinitionInternal } from './getVikeConfig/configDefinitionsBuiltIn.js';
 import { type LocationId } from './getVikeConfig/filesystemRouting.js';
 import type { ResolvedConfig } from 'vite';
 import type { FilePathResolved } from '../../../../../shared/page-configs/FilePath.js';
@@ -19,26 +21,31 @@ type InterfaceFile = InterfaceConfigFile | InterfaceValueFile;
 type InterfaceFileCommons = {
     locationId: LocationId;
     filePath: FilePathResolved;
-    fileExportsByConfigName: Record<ConfigName, {
-        configValue?: unknown;
-    }>;
 };
 type InterfaceConfigFile = InterfaceFileCommons & {
     isConfigFile: true;
     isValueFile: false;
     extendsFilePaths: string[];
     isConfigExtend: boolean;
+    isValueLoaded: true;
+    fileExportsByConfigName: Record<string, // configName
+    unknown>;
 };
 type InterfaceValueFile = InterfaceFileCommons & {
     isConfigFile: false;
     isValueFile: true;
     configName: string;
-};
-type ConfigName = string;
+} & ({
+    isValueLoaded: Promise<void>;
+    fileExportsByConfigName: Record<string, // configName
+    unknown>;
+} | {
+    isValueLoaded: false;
+});
+type InterfaceFilesByLocationId = Record<LocationId, InterfaceFile[]>;
 type VikeConfigObject = {
     pageConfigs: PageConfigBuildTime[];
     pageConfigGlobal: PageConfigGlobalBuildTime;
-    vikeConfigGlobal: VikeConfigGlobal;
     global: ReturnType<typeof getPageConfigUserFriendlyNew>;
 };
 declare const vikeConfigDependencies: Set<string>;
@@ -49,96 +56,11 @@ declare function getVikeConfig(config: ResolvedConfig, { doNotRestartViteOnError
 declare function getVikeConfig2(userRootDir: string, isDev: boolean, vikeVitePluginOptions: unknown): Promise<VikeConfigObject>;
 declare function isV1Design(config: ResolvedConfig): Promise<boolean>;
 declare function isVikeConfigFile(filePath: string): boolean;
-declare function getConfigValueInterfaceFile(interfaceFile: InterfaceFile, configName: string): unknown;
-type VikeConfigGlobal = {
-    prerender: false | {
-        noExtraDir: boolean;
-        parallel: boolean | number;
-        partial: boolean;
-        disableAutoRun: boolean;
-    };
-    disableAutoFullBuild: boolean | 'prerender' | null;
-    includeAssetsImportedByServer: boolean;
-    baseAssets: string | null;
-    baseServer: string | null;
-    trailingSlash: boolean;
-    disableUrlNormalization: boolean;
-};
-type VikeVitePluginOptions = {
-    /**
-     * Enable pre-rendering.
-     *
-     * https://vike.dev/pre-rendering
-     *
-     * @default false
-     */
-    prerender?: boolean | {
-        /**
-         * Don't create a new directory for each HTML file.
-         *
-         * For example, generate `dist/client/about.html` instead of `dist/client/about/index.html`.
-         *
-         * @default false
-         */
-        noExtraDir?: boolean;
-        /**
-         * Number of concurrent pre-render jobs.
-         *
-         * Set to `false` to disable concurrency.
-         *
-         * @default os.cpus().length
-         */
-        parallel?: boolean | number;
-        /**
-     * Allow only some of your pages to be pre-rendered.
-     *
-     * This setting doesn't affect the pre-rendering process: it merely suppresses the warnings when some of your pages cannot be pre-rendered.
- 
-     * @default false
-     */
-        partial?: boolean;
-        /**
-         * Disable the automatic initiation of the pre-rendering process when running `$ vike build`.
-         *
-         * Use this if you want to programmatically initiate the pre-rendering process instead.
-         *
-         * https://vike.dev/api#prerender
-         *
-         * @default false
-         */
-        disableAutoRun?: boolean;
-    };
-    /** @deprecated See https://vike.dev/disableAutoFullBuild */
-    disableAutoFullBuild?: boolean | 'prerender';
-    /** The Base URL of your server.
-     *
-     * https://vike.dev/base-url
-     */
-    baseServer?: string;
-    /** The Base URL of your static assets.
-     *
-     * https://vike.dev/base-url
-     */
-    baseAssets?: string;
-    /** @deprecated It's now `true` by default. You can remove this option. */
-    includeAssetsImportedByServer?: boolean;
-    /** Permanent redirections (HTTP status code 301)
-     *
-     * https://vike.dev/redirects
-     */
-    redirects?: Record<string, string>;
-    /** Whether URLs should end with a trailing slash.
-     *
-     * https://vike.dev/url-normalization
-     *
-     * @default false
-     */
-    trailingSlash?: boolean;
-    /** Disable automatic URL normalization.
-     *
-     * https://vike.dev/url-normalization
-     *
-     * @default false
-     */
-    disableUrlNormalization?: boolean;
+declare function getConfigDefinitionOptional(configDefinitions: ConfigDefinitions, configName: string): ConfigDefinitionInternal | null;
+declare function shouldBeLoadableAtBuildTime(configDef: ConfigDefinitionInternal): boolean;
+declare function getConfVal(interfaceFile: InterfaceFile, configName: string): null | {
+    configValue: unknown;
+    configValueLoaded: true;
+} | {
+    configValueLoaded: false;
 };