vike 0.4.223-commit-586dbfb → 0.4.223-commit-f1089b4

package/dist/esm/node/plugin/plugins/{buildApp.js → build/pluginBuildApp.js}

@@ -1,19 +1,19 @@
-import { runPrerender_forceExit, runPrerenderFromAutoRun } from '../../prerender/runPrerender.js';
-export { buildApp };
-import { isPrerenderAutoRunEnabled } from '../../prerender/context.js';
-import { resolveOutDir } from '../shared/getOutDirs.js';
-import { assert } from '../utils.js';
-import { getVikeConfig } from './importUserCode/v1-design/getVikeConfig.js';
-import { getFullBuildInlineConfig } from '../shared/getFullBuildInlineConfig.js';
-import { getVikeConfigPublic } from './commonConfig.js';
-function buildApp() {
+export { pluginBuildApp };
+import { runPrerender_forceExit, runPrerenderFromAutoRun } from '../../../prerender/runPrerender.js';
+import { isPrerenderAutoRunEnabled } from '../../../prerender/context.js';
+import { resolveOutDir } from '../../shared/getOutDirs.js';
+import { assert } from '../../utils.js';
+import { getVikeConfig } from '../importUserCode/v1-design/getVikeConfig.js';
+import { getFullBuildInlineConfig } from '../../shared/getFullBuildInlineConfig.js';
+import { getVikeConfigPublic } from '../commonConfig.js';
+function pluginBuildApp() {
     let config;
-    // `builder.buildApp` can be overriden by another plugin e.g vike-vercel https://github.com/vikejs/vike/pull/2184#issuecomment-2659425195
-    // In that case, we should'nt `forceExit`.
+    // `builder.buildApp()` can be overriden by another plugin e.g vike-vercel https://github.com/vikejs/vike/pull/2184#issuecomment-2659425195
+    // In that case, we shouldn't `forceExit`.
     let forceExit = false;
     return [
         {
-            name: 'vike:buildApp',
+            name: 'vike:build:pluginBuildApp',
             apply: 'build',
             config(config) {
                 const vike = getVikeConfigPublic(config);
@@ -52,7 +52,7 @@ function buildApp() {
             }
         },
         {
-            name: 'vike:buildApp:prerender',
+            name: 'vike:build:pluginBuildApp:prerender',
             apply: 'build',
             enforce: 'pre',
             applyToEnvironment(env) {

package/dist/esm/node/plugin/plugins/{buildConfig.d.ts → build/pluginBuildConfig.d.ts}

@@ -1,11 +1,11 @@
-export { buildConfig };
+export { pluginBuildConfig };
 export { assertRollupInput };
 export { analyzeClientEntries };
 export { manifestTempFile };
 import type { ResolvedConfig, Plugin } from 'vite';
-import type { PageConfigBuildTime } from '../../../shared/page-configs/PageConfig.js';
+import type { PageConfigBuildTime } from '../../../../shared/page-configs/PageConfig.js';
 declare const manifestTempFile = "_temp_manifest.json";
-declare function buildConfig(): Plugin[];
+declare function pluginBuildConfig(): Plugin[];
 declare function analyzeClientEntries(pageConfigs: PageConfigBuildTime[], config: ResolvedConfig): {
     hasClientRouting: boolean;
     hasServerRouting: boolean;

package/dist/esm/node/plugin/plugins/{buildConfig.js → build/pluginBuildConfig.js}

@@ -1,72 +1,51 @@
-export { buildConfig };
+export { pluginBuildConfig };
 export { assertRollupInput };
 export { analyzeClientEntries };
 export { manifestTempFile };
-import { assert, addOnBeforeLogHook, removeFileExtention, unique, assertUsage, injectRollupInputs, normalizeRollupInput, onSetupBuild, assertIsNpmPackageImport } from '../utils.js';
-import { getVikeConfig, isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
-import { findPageFiles } from '../shared/findPageFiles.js';
-import { getVirtualFileIdPageConfigValuesAll } from '../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
-import { extractAssetsAddQuery } from '../../shared/extractAssetsQuery.js';
+import { assert, addOnBeforeLogHook, removeFileExtention, unique, assertUsage, injectRollupInputs, normalizeRollupInput, onSetupBuild, assertIsNpmPackageImport } from '../../utils.js';
+import { getVikeConfig } from '../importUserCode/v1-design/getVikeConfig.js';
+import { findPageFiles } from '../../shared/findPageFiles.js';
+import { getVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
+import { extractAssetsAddQuery } from '../../../shared/extractAssetsQuery.js';
 import { createRequire } from 'module';
-import fs from 'fs/promises';
-import path from 'path';
-import { fixServerAssets, fixServerAssets_assertCssCodeSplit, fixServerAssets_assertCssTarget, fixServerAssets_isEnabled } from './buildConfig/fixServerAssets.js';
-import { set_ASSETS_MANIFEST } from './buildEntry/index.js';
-import { prependEntriesDir } from '../../shared/prependEntriesDir.js';
-import { getFilePathResolved } from '../shared/getFilePath.js';
-import { getConfigValueBuildTime } from '../../../shared/page-configs/getConfigValueBuildTime.js';
-import { getOutDirs, resolveOutDir } from '../shared/getOutDirs.js';
-import { viteIsSSR } from '../shared/viteIsSSR.js';
-import { getVikeConfigPublic } from './commonConfig.js';
-// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+import { prependEntriesDir } from '../../../shared/prependEntriesDir.js';
+import { getFilePathResolved } from '../../shared/getFilePath.js';
+import { getConfigValueBuildTime } from '../../../../shared/page-configs/getConfigValueBuildTime.js';
+import { viteIsSSR } from '../../shared/viteIsSSR.js';
+import { resolveOutDir } from '../../shared/getOutDirs.js';
+import { fixServerAssets_assertUsageCssCodeSplit, fixServerAssets_assertUsageCssTarget, fixServerAssets_getBuildConfig } from './pluginAssetsManifest/fixServerAssets.js';
+// @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
 const manifestTempFile = '_temp_manifest.json';
-function buildConfig() {
-    let isServerAssetsFixEnabled;
-    let outDirs;
+function pluginBuildConfig() {
     let config;
     return [
         {
-            name: 'vike:buildConfig:post',
+            name: 'vike:build:pluginBuildConfig',
             apply: 'build',
             enforce: 'post',
             configResolved: {
                 order: 'post',
                 async handler(config_) {
-                    config = config_;
                     onSetupBuild();
+                    config = config_;
                     assertRollupInput(config);
                     const entries = await getEntries(config);
                     assert(Object.keys(entries).length > 0);
                     config.build.rollupOptions.input = injectRollupInputs(entries, config);
                     addLogHook();
-                    outDirs = getOutDirs(config);
-                    {
-                        isServerAssetsFixEnabled = fixServerAssets_isEnabled() && (await isV1Design(config));
-                        if (isServerAssetsFixEnabled) {
-                            // https://github.com/vikejs/vike/issues/1339
-                            config.build.ssrEmitAssets = true;
-                            // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
-                            config.build.cssMinify = 'esbuild';
-                            fixServerAssets_assertCssCodeSplit(config);
-                        }
-                    }
+                    fixServerAssets_assertUsageCssCodeSplit(config);
                 }
             },
             config: {
                 order: 'post',
                 handler(config) {
                     onSetupBuild();
-                    const vike = getVikeConfigPublic(config);
                     return {
                         build: {
                             outDir: resolveOutDir(config),
-                            manifest: manifestTempFile,
-                            copyPublicDir: vike.config.viteEnvironmentAPI
-                                ? // Already set by buildApp() plugin
-                                    undefined
-                                : !viteIsSSR(config)
+                            ...fixServerAssets_getBuildConfig(config)
                         }
                     };
                 }
@@ -74,44 +53,9 @@ function buildConfig() {
             buildStart() {
                 onSetupBuild();
             },
-            async closeBundle() {
+            closeBundle() {
                 onSetupBuild();
-                await fixServerAssets_assertCssTarget(config);
-            }
-        },
-        {
-            name: 'vike:buildConfig:pre',
-            apply: 'build',
-            applyToEnvironment(env) {
-                return env.name === 'ssr';
-            },
-            // Make sure other writeBundle() hooks are called after this writeBundle() hook.
-            //  - set_ASSETS_MANIFEST() needs to be called before dist/server/ code is executed.
-            //    - For example, the writeBundle() hook of vite-plugin-vercel needs to be called after this writeBundle() hook, otherwise: https://github.com/vikejs/vike/issues/1527
-            enforce: 'pre',
-            writeBundle: {
-                order: 'pre',
-                sequential: true,
-                async handler(options, bundle) {
-                    if (viteIsSSR(config)) {
-                        // Ideally we'd move dist/_temp_manifest.json to dist/server/client-assets.json instead of dist/assets.json
-                        //  - But we can't because there is no guarentee whether dist/server/ is generated before or after dist/client/ (generating dist/server/ after dist/client/ erases dist/server/client-assets.json)
-                        //  - We'll able to do so once we replace `$ vite build` with `$ vike build`
-                        const assetsJsonFilePath = path.posix.join(outDirs.outDirRoot, 'assets.json');
-                        const clientManifestFilePath = path.posix.join(outDirs.outDirClient, manifestTempFile);
-                        const serverManifestFilePath = path.posix.join(outDirs.outDirServer, manifestTempFile);
-                        if (!isServerAssetsFixEnabled) {
-                            await fs.copyFile(clientManifestFilePath, assetsJsonFilePath);
-                        }
-                        else {
-                            const { clientManifestMod } = await fixServerAssets(config);
-                            await fs.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
-                        }
-                        await fs.rm(clientManifestFilePath);
-                        await fs.rm(serverManifestFilePath);
-                        await set_ASSETS_MANIFEST(options, bundle);
-                    }
-                }
+                fixServerAssets_assertUsageCssTarget(config);
             }
         }
     ];
@@ -127,7 +71,6 @@ async function getEntries(config) {
     if (viteIsSSR(config)) {
         const pageEntries = getPageEntries(pageConfigs);
         const entries = {
-            // buildEntry: resolve('dist/esm/node/buildEntry.js'), // TODO/next-major-release: remove
             ...pageFileEntries,
             // Ensure Rollup generates a bundle per page: https://github.com/vikejs/vike/issues/349#issuecomment-1166247275
             ...pageEntries
@@ -257,8 +200,8 @@ function getEntryFromPageConfig(pageConfig, isForClientSide) {
 }
 function resolve(filePath) {
     assert(filePath.startsWith('dist/'));
-    // [RELATIVE_PATH_FROM_DIST] Current directory: node_modules/vike/dist/esm/node/plugin/plugins/
-    return require_.resolve(`../../../../../${filePath}`);
+    // [RELATIVE_PATH_FROM_DIST] Current directory: node_modules/vike/dist/esm/node/plugin/plugins/build/
+    return require_.resolve(`../../../../../../${filePath}`);
 }
 function addLogHook() {
     const tty = process.stdout.isTTY && !process.env.CI; // Equals https://github.com/vitejs/vite/blob/193d55c7b9cbfec5b79ebfca276d4a721e7de14d/packages/vite/src/node/plugins/reporter.ts#L27

package/dist/esm/node/plugin/plugins/build/pluginBuildEntry.d.ts

@@ -0,0 +1,8 @@
+export { pluginBuildEntry };
+export { set_macro_ASSETS_MANIFEST };
+import type { Plugin, Rollup } from 'vite';
+type Bundle = Rollup.OutputBundle;
+type Options = Rollup.NormalizedOutputOptions;
+declare function pluginBuildEntry(): Plugin[];
+/** Set the value of the ASSETS_MANIFEST constant inside dist/server/entry.js (or dist/server/index.js) */
+declare function set_macro_ASSETS_MANIFEST(options: Options, bundle: Bundle, assetsJsonFilePath: string): Promise<void>;

package/dist/esm/node/plugin/plugins/{buildEntry/index.js → build/pluginBuildEntry.js}

@@ -1,23 +1,24 @@
-export { buildEntry };
-export { set_ASSETS_MANIFEST };
+export { pluginBuildEntry };
+export { set_macro_ASSETS_MANIFEST };
 import { serverProductionEntryPlugin } from '@brillout/vite-plugin-server-entry/plugin';
 import { virtualFileIdImportUserCodeServer } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
 import { assert, projectInfo, toPosixPath } from '../../utils.js';
 import fs from 'fs/promises';
 import path from 'path';
 import { createRequire } from 'module';
-// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+// @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
 import { isUsingClientRouter } from '../extractExportNamesPlugin.js';
 import { assertBuildInfo, getViteConfigRuntime } from '../../../runtime/globalContext.js';
 import { getOutDirs } from '../../shared/getOutDirs.js';
 const ASSETS_MANIFEST = '__VITE_ASSETS_MANIFEST__';
-function buildEntry() {
+function pluginBuildEntry() {
     let config;
     return [
         {
-            name: 'vike:buildEntry',
+            name: 'vike:build:pluginBuildEntry',
+            apply: 'build',
             enforce: 'post',
             async configResolved(config_) {
                 config = config_;
@@ -59,12 +60,11 @@ function getServerProductionEntryCode(config) {
     return importerCode;
 }
 /** Set the value of the ASSETS_MANIFEST constant inside dist/server/entry.js (or dist/server/index.js) */
-async function set_ASSETS_MANIFEST(options, bundle) {
+async function set_macro_ASSETS_MANIFEST(options, bundle, assetsJsonFilePath) {
     const { dir } = options;
     assert(dir);
     const chunkPath = find_ASSETS_MANIFEST(bundle);
     const chunkFilePath = path.join(dir, chunkPath);
-    const assetsJsonFilePath = path.join(dir, '..', 'assets.json');
     const [assetsJsonString, chunkFileContent] = await Promise.all([
         await fs.readFile(assetsJsonFilePath, 'utf8'),
         await fs.readFile(chunkFilePath, 'utf8')
@@ -88,7 +88,7 @@ function find_ASSETS_MANIFEST(bundle) {
 function getImportPath(config) {
     // We resolve filePathAbsolute even if we don't use it: we use require.resolve() as an assertion that the relative path is correct
     const filePathAbsolute = toPosixPath(
-    // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/plugins/buildEntry/index.js
+    // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/plugins/pluginBuildEntry/index.js
     require_.resolve(`../../../../../../dist/esm/__internal/index.js`));
     if (
     // Let's implement a new config if a user needs the import to be a relative path instead of 'vike/__internal' (AFAIK a relative path is needed only if a framework has npm package 'vike' as direct dependency instead of a peer dependency and if the user of that framework uses pnpm)

package/dist/esm/node/plugin/plugins/build/pluginDistFileNames.d.ts

@@ -0,0 +1,3 @@
+export { pluginDistFileNames };
+import type { Plugin } from 'vite';
+declare function pluginDistFileNames(): Plugin;

package/dist/esm/node/plugin/plugins/{distFileNames.js → build/pluginDistFileNames.js}

@@ -1,15 +1,15 @@
-export { distFileNames };
+export { pluginDistFileNames };
 // Attempt to preserve file structure of `.page.js` files:
 //  - https://github.com/vikejs/vike/commit/11a4c49e5403aa7c37c8020c462b499425b41854
 //  - Blocker: https://github.com/rollup/rollup/issues/4724
-import { assertPosixPath, assert, assertUsage, isArray, isCallable } from '../utils.js';
+import { assertPosixPath, assert, assertUsage, isArray, isCallable } from '../../utils.js';
 import path from 'path';
 import crypto from 'crypto';
-import { getAssetsDir } from '../shared/getAssetsDir.js';
-import { assertModuleId, getModuleFilePathAbsolute } from '../shared/getFilePath.js';
-function distFileNames() {
+import { getAssetsDir } from '../../shared/getAssetsDir.js';
+import { assertModuleId, getModuleFilePathAbsolute } from '../../shared/getFilePath.js';
+function pluginDistFileNames() {
     return {
-        name: 'vike:distFileNames',
+        name: 'vike:build:pluginDistFileNames',
         apply: 'build',
         enforce: 'post',
         configResolved(config) {

package/dist/esm/node/plugin/plugins/build/pluginDistPackageJsonFile.d.ts

@@ -0,0 +1,3 @@
+export { pluginDistPackageJsonFile };
+import type { Plugin } from 'vite';
+declare function pluginDistPackageJsonFile(): Plugin;

package/dist/esm/node/plugin/plugins/{packageJsonFile.js → build/pluginDistPackageJsonFile.js}

@@ -6,13 +6,14 @@
  *   require() of dist/server/pageFiles.js from node_modules/vike/dist/esm/node/runtime/page-files/setup.js is an ES module file as it is a .js file whose nearest parent package.json contains "type": "module" which defines all .js files in that package scope as ES modules.
  * Reproduction: https://github.com/brillout/vite-plugin-ssr-server-import-syntax
  */
-export { packageJsonFile };
-import { rollupIsEsm } from '../shared/rollupIsEsm.js';
-import { viteIsSSR } from '../shared/viteIsSSR.js';
-function packageJsonFile() {
+// TODO/refactor: prefix all other plugins with `plugin` as well?
+export { pluginDistPackageJsonFile };
+import { rollupIsEsm } from '../../shared/rollupIsEsm.js';
+import { viteIsSSR } from '../../shared/viteIsSSR.js';
+function pluginDistPackageJsonFile() {
     let config;
     return {
-        name: 'vike:packageJsonFile',
+        name: 'vike:build:pluginDistPackageJsonFile',
         apply: 'build',
         configResolved(config_) {
             config = config_;

package/dist/esm/node/plugin/plugins/build/pluginSuppressRollupWarning.d.ts

@@ -0,0 +1,3 @@
+export { pluginSuppressRollupWarning };
+import type { Plugin } from 'vite';
+declare function pluginSuppressRollupWarning(): Plugin;

package/dist/esm/node/plugin/plugins/{suppressRollupWarning.js → build/pluginSuppressRollupWarning.js}

@@ -1,8 +1,8 @@
 // Suppress Rollup warnings `Generated an empty chunk: "index.page.server"`
-export { suppressRollupWarning };
-function suppressRollupWarning() {
+export { pluginSuppressRollupWarning };
+function pluginSuppressRollupWarning() {
     return {
-        name: 'vike:suppressRollupWarning',
+        name: 'vike:build:pluginSuppressRollupWarning',
         apply: 'build',
         enforce: 'post',
         async configResolved(config) {

package/dist/esm/node/plugin/plugins/build.d.ts

@@ -0,0 +1,3 @@
+export { build };
+import type { Plugin } from 'vite';
+declare function build(): Plugin[];

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

@@ -0,0 +1,19 @@
+export { build };
+import { pluginBuildApp } from './build/pluginBuildApp.js';
+import { pluginDistPackageJsonFile } from './build/pluginDistPackageJsonFile.js';
+import { pluginSuppressRollupWarning } from './build/pluginSuppressRollupWarning.js';
+import { pluginDistFileNames } from './build/pluginDistFileNames.js';
+import { pluginAutoFullBuild } from './build/pluginAutoFullBuild.js';
+import { pluginBuildEntry } from './build/pluginBuildEntry.js';
+import { pluginBuildConfig } from './build/pluginBuildConfig.js';
+function build() {
+    return [
+        ...pluginBuildConfig(),
+        ...pluginBuildApp(),
+        ...pluginAutoFullBuild(),
+        ...pluginBuildEntry(),
+        pluginDistPackageJsonFile(),
+        pluginSuppressRollupWarning(),
+        pluginDistFileNames()
+    ];
+}

package/dist/esm/node/plugin/plugins/commonConfig.d.ts

@@ -11,6 +11,7 @@ declare module 'vite' {
         _baseViteOriginal?: string;
         _viteConfigEnhanced?: InlineConfig;
         _vike?: VikeConfigPublic;
+        _vikeConfigObject?: VikeConfigObject;
     }
 }
 type VikeConfigPublic = {

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

@@ -2,7 +2,7 @@ export { commonConfig };
 export { getVikeConfigPublic };
 import { mergeConfig } from 'vite';
 import { assert, assertUsage, assertWarning, findPackageJson, hasProp, isDevCheck, isDocker, isObject } from '../utils.js';
-import { assertRollupInput } from './buildConfig.js';
+import { assertRollupInput } from './build/pluginBuildConfig.js';
 import { installRequireShim_setUserRootDir } from '@brillout/require-shim';
 import pc from '@brillout/picocolors';
 import path from 'path';
@@ -31,6 +31,7 @@ function commonConfig(vikeVitePluginOptions) {
                         _isDev: isDev,
                         _root: root,
                         _vikeVitePluginOptions: vikeVitePluginOptions,
+                        _vikeConfigObject: vikeConfig,
                         _vike: {
                             pages: vikeConfig.pages,
                             config: vikeConfig.global.config

package/dist/esm/node/plugin/plugins/devConfig/determineFsAllowList.js

@@ -5,7 +5,7 @@ import { assert } 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.
+// @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
 const __dirname_ = dirname(fileURLToPath(importMetaUrl));

package/dist/esm/node/plugin/plugins/devConfig/determineOptimizeDeps.js

@@ -2,7 +2,7 @@ export { determineOptimizeDeps };
 import { findPageFiles } from '../../shared/findPageFiles.js';
 import { assert, assertIsNpmPackageImport, createDebugger, isArray, unique } from '../../utils.js';
 import { getVikeConfig } from '../importUserCode/v1-design/getVikeConfig.js';
-import { analyzeClientEntries } from '../buildConfig.js';
+import { analyzeClientEntries } from '../build/pluginBuildConfig.js';
 import { virtualFileIdImportUserCodeClientCR, virtualFileIdImportUserCodeClientSR } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
 import { getFilePathResolved } from '../../shared/getFilePath.js';
 const debug = createDebugger('vike:optimizeDeps');

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

@@ -13,7 +13,7 @@ import { isAsset } from '../shared/isAsset.js';
 import { getImportStatements } from '../shared/parseEsModule.js';
 import { sourceMapRemove } from '../shared/rollupSourceMap.js';
 import pc from '@brillout/picocolors';
-import { fixServerAssets_isEnabled } from './buildConfig/fixServerAssets.js';
+import { fixServerAssets_isEnabled } from './build/pluginAssetsManifest/fixServerAssets.js';
 import { getVikeConfig, isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 import { assertV1Design } from '../../shared/assertV1Design.js';
 import { normalizeId } from '../shared/normalizeId.js';

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

@@ -13,7 +13,7 @@ import { vikeConfigDependencies } from '../getVikeConfig.js';
 import 'source-map-support/register.js';
 import { getFilePathAbsoluteUserRootDir } from '../../../../shared/getFilePath.js';
 import { createRequire } from 'module';
-// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+// @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
 assertIsNotProductionRuntime();

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

@@ -8,7 +8,7 @@ export { getConfigDefinitionOptional };
 export type { VikeConfigObject };
 import type { PageConfigGlobalBuildTime, PageConfigBuildTime } from '../../../../../shared/page-configs/PageConfig.js';
 import { type ConfigDefinitions, type ConfigDefinitionInternal } from './getVikeConfig/configDefinitionsBuiltIn.js';
-import type { ResolvedConfig } from 'vite';
+import type { ResolvedConfig, UserConfig } from 'vite';
 import { type PageConfigUserFriendly, type PageConfigsUserFriendly } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
 import { type PlusFile } from './getVikeConfig/getPlusFilesAll.js';
 type VikeConfigObject = {
@@ -23,7 +23,7 @@ declare function getVikeConfig(config: ResolvedConfig, { doNotRestartViteOnError
     doNotRestartViteOnError?: true;
 }): Promise<VikeConfigObject>;
 declare function getVikeConfig2(userRootDir: string, isDev: boolean, vikeVitePluginOptions: unknown): Promise<VikeConfigObject>;
-declare function isV1Design(config: ResolvedConfig): Promise<boolean>;
+declare function isV1Design(config: ResolvedConfig | UserConfig): boolean;
 declare function getConfigDefinitionOptional(configDefinitions: ConfigDefinitions, configName: string): ConfigDefinitionInternal | null;
 declare function getConfVal(plusFile: PlusFile, configName: string): null | {
     value: unknown;

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

@@ -85,8 +85,10 @@ async function getVikeConfigEntry(userRootDir, isDev, vikeVitePluginOptions, doN
     }
     return await vikeConfigPromise;
 }
-async function isV1Design(config) {
-    const vikeConfig = await getVikeConfig(config);
+// TODO/now update all isV1Design() usage
+function isV1Design(config) {
+    const vikeConfig = config._vikeConfigObject;
+    assert(vikeConfig);
     const { pageConfigs } = vikeConfig;
     const isV1Design = pageConfigs.length > 0;
     return isV1Design;

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

@@ -6,7 +6,7 @@ import { extractAssetsAddQuery } from '../../../../../shared/extractAssetsQuery.
 import { debug } from './debug.js';
 import { isRuntimeEnvMatch } from './isRuntimeEnvMatch.js';
 import { serializeConfigValues } from '../../../../../../shared/page-configs/serialize/serializeConfigValues.js';
-import { fixServerAssets_isEnabled } from '../../../buildConfig/fixServerAssets.js';
+import { fixServerAssets_isEnabled } from '../../../build/pluginAssetsManifest/fixServerAssets.js';
 import { getConfigValueBuildTime } from '../../../../../../shared/page-configs/getConfigValueBuildTime.js';
 async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     const result = isVirtualFileIdPageConfigValuesAll(id);

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

@@ -1,9 +1,7 @@
 // Purpose of this file:
 //  - Swallow redundant error messages (Vite is buggy and emits the same error multiple times)
 //  - Prepend "[request(n)]" tag to Vite logs
-// The mechanism is skipped if the runtime doesn't support Async Hooks:
-//  - Bun doesn't support Async Hooks: https://github.com/oven-sh/bun/issues/1832
-//  - Node.js and Deno support Async Hooks
+// The mechanism is skipped if the development environment doesn't support Async Hooks.
 // We purposely don't use config.logger.hasErrorLogged(err) because:
 // - We don't trust Vite with such details
 //   - Example of Vite bug leading to swallowing of errors: https://github.com/vitejs/vite/issues/12631

package/dist/esm/node/plugin/shared/getOutDirs.d.ts

@@ -1,7 +1,7 @@
 export { getOutDirs };
 export { resolveOutDir };
 export type { OutDirs };
-import type { UserConfig, ResolvedConfig } from 'vite';
+import type { UserConfig, ResolvedConfig, Environment } from 'vite';
 type OutDirs = {
     /** Absolute path to `outDir` */
     outDirRoot: string;
@@ -10,6 +10,6 @@ type OutDirs = {
     /** Absolute path to `${outDir}/server` */
     outDirServer: string;
 };
-declare function getOutDirs(config: ResolvedConfig): OutDirs;
+declare function getOutDirs(configGlobal: ResolvedConfig, viteEnv?: Environment): OutDirs;
 /** Appends `client/` or `server/` to `config.build.outDir` */
 declare function resolveOutDir(config: UserConfig, isSSR?: true): string;

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

@@ -4,12 +4,13 @@ import pc from '@brillout/picocolors';
 import { assert, assertPosixPath, assertUsage, createDebugger, pathJoin, toPosixPath } from '../utils.js';
 import { viteIsSSR } from './viteIsSSR.js';
 const debug = createDebugger('vike:outDir');
-function getOutDirs(config) {
+function getOutDirs(configGlobal, viteEnv) {
+    const configEnv = viteEnv?.config ?? configGlobal;
     debug('getOutDirs()', new Error().stack);
-    const outDir = getOutDirFromViteResolvedConfig(config);
+    const outDir = getOutDirFromViteResolvedConfig(configEnv);
     if (!isOutDirRoot(outDir))
-        assertOutDirResolved(outDir, config);
-    const outDirs = getOutDirsAll(outDir, config.root);
+        assertOutDirResolved(outDir, configEnv);
+    const outDirs = getOutDirsAll(outDir, configEnv.root);
     return outDirs;
 }
 /** Appends `client/` or `server/` to `config.build.outDir` */

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

@@ -1,7 +1,7 @@
 export { resolveClientEntriesDev };
 import { assert, assertPosixPath, toPosixPath, pathJoin, assertIsNpmPackageImport, assertIsNotProductionRuntime } from '../utils.js';
 import { createRequire } from 'module';
-// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+// @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
 assertIsNotProductionRuntime();

package/dist/esm/node/plugin/shared/viteIsSSR.d.ts

@@ -1,8 +1,10 @@
 export { viteIsSSR };
+export { viteIsServerBuildEnvAny };
 export { viteIsSSR_options };
 export { viteIsSSR_safe };
-import type { ResolvedConfig, UserConfig } from 'vite';
-declare function viteIsSSR(config: ResolvedConfig | UserConfig): boolean;
+import type { Environment, ResolvedConfig, UserConfig } from 'vite';
+declare function viteIsSSR(configGlobal: ResolvedConfig | UserConfig, viteEnv?: Environment): boolean;
+declare function viteIsServerBuildEnvAny(configGlobal: ResolvedConfig, viteEnv: Environment | undefined): boolean;
 declare function viteIsSSR_options(options: {
     ssr?: boolean;
 } | undefined): boolean;

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

@@ -1,9 +1,16 @@
 export { viteIsSSR };
+export { viteIsServerBuildEnvAny };
 export { viteIsSSR_options };
 export { viteIsSSR_safe };
 import { assert } from '../../../utils/assert.js';
-function viteIsSSR(config) {
-    return !!config?.build?.ssr;
+// TODO/now: rename_full viteIsSSR isViteServerBuildEnvSsr
+function viteIsSSR(configGlobal, viteEnv) {
+    const configEnv = viteEnv?.config ?? configGlobal;
+    return !!configEnv?.build?.ssr;
+}
+// All server-side environments: not only `ssr` but, for example, also `vercel_edge` and `vercel_node`.
+function viteIsServerBuildEnvAny(configGlobal, viteEnv) {
+    return viteEnv ? viteEnv.name === 'ssr' : viteIsSSR(configGlobal);
 }
 function viteIsSSR_options(options) {
     return !!options?.ssr;

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

@@ -57,6 +57,7 @@ async function runPrerenderFromAutoRun(viteConfig, config) {
         prerenderContextPublic = ret.prerenderContextPublic;
     }
     catch (err) {
+        // Avoid Rollup prefixing the error with [vike:build:pluginAutoFullBuild], see for example https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
         console.error(err);
         logErrorHint(err);
         process.exit(1);

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.223-commit-586dbfb";
+export declare const PROJECT_VERSION: "0.4.223-commit-f1089b4";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.223-commit-586dbfb';
+export const PROJECT_VERSION = '0.4.223-commit-f1089b4';

package/dist/esm/utils/findPackageJson.js

@@ -1,7 +1,7 @@
 export { findPackageJson };
 import { findFile } from './findFile.js';
 import { createRequire } from 'module';
-// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+// @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
 function findPackageJson(cwd) {

package/dist/esm/utils/projectInfo.d.ts

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.223-commit-586dbfb";
+    projectVersion: "0.4.223-commit-f1089b4";
 };