vike 0.4.223-commit-f1089b4 → 0.4.223-commit-6adb186

package/dist/esm/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.js

@@ -7,12 +7,12 @@ import path from 'path';
 import { getVirtualFilePageConfigs } from './v1-design/virtual-files/getVirtualFilePageConfigs.js';
 import { isV1Design as isV1Design_ } from './v1-design/getVikeConfig.js';
 import { getOutDirs } from '../../shared/getOutDirs.js';
-import { viteIsSSR_options } from '../../shared/viteIsSSR.js';
+import { isViteServerBuild_options } from '../../shared/isViteServerBuild.js';
 async function getVirtualFileImportUserCode(id, options, vikeConfig, config, isDev) {
     const idParsed = isVirtualFileIdImportUserCode(id);
     assert(idParsed);
     const { isForClientSide, isClientRouting } = idParsed;
-    assert(isForClientSide === !viteIsSSR_options(options));
+    assert(isForClientSide === !isViteServerBuild_options(options));
     const code = await getCode(config, vikeConfig, isForClientSide, isClientRouting, isDev, id);
     return code;
 }
@@ -69,7 +69,7 @@ ${await getVirtualFilePageConfigs(isForClientSide, isDev, id, isClientRouting, c
 
 `;
     // We still use import.meta.glob() when using th V1 design in order to not break the V1 design deprecation warning
-    const isV1Design = await isV1Design_(config);
+    const isV1Design = isV1Design_(config);
     // Old design => no + files => only to enable pre-rendering is setting `vike({prerender})` in vite.config.js
     const isPrerendering = !!vikeConfig.global.config.prerender;
     fileTypes

package/dist/esm/node/plugin/plugins/importUserCode/index.js

@@ -21,11 +21,8 @@ function importUserCode() {
             vikeConfig = await getVikeConfig(config_);
             config = config_;
             // TODO/v1-release: remove
-            {
-                const isV1 = await isV1Design(config);
-                if (!isV1)
-                    config.experimental.importGlobRestoreExtension = true;
-            }
+            if (!isV1Design(config))
+                config.experimental.importGlobRestoreExtension = true;
         },
         resolveId(id) {
             if (isVirtualFileId(id)) {

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

@@ -67,6 +67,7 @@ async function handleReloadSideEffects() {
         }
     }
 }
+// TODO/soon: predominantly use getVikeConfigPublic() instead of getVikeConfig() then maybe refector?
 async function getVikeConfig(config, { doNotRestartViteOnError } = {}) {
     const userRootDir = config.root;
     const vikeVitePluginOptions = config._vikeVitePluginOptions;
@@ -85,7 +86,6 @@ async function getVikeConfigEntry(userRootDir, isDev, vikeVitePluginOptions, doN
     }
     return await vikeConfigPromise;
 }
-// TODO/now update all isV1Design() usage
 function isV1Design(config) {
     const vikeConfig = config._vikeConfigObject;
     assert(vikeConfig);

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 '../../../build/pluginAssetsManifest/fixServerAssets.js';
+import { handleAssetsManifest_isFixEnabled } from '../../../build/handleAssetsManifest.js';
 import { getConfigValueBuildTime } from '../../../../../../shared/page-configs/getConfigValueBuildTime.js';
 async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     const result = isVirtualFileIdPageConfigValuesAll(id);
@@ -24,11 +24,11 @@ async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     assert(pageConfig, { id, pageId });
     const code = getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, 
     // TODO/now: add meta.default
-    vikeConfig.global.config.includeAssetsImportedByServer ?? true, isDev);
+    vikeConfig.global.config.includeAssetsImportedByServer ?? true, config, isDev);
     debug(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
     return code;
 }
-function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAssetsImportedByServer, isDev) {
+function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAssetsImportedByServer, config, isDev) {
     const lines = [];
     const importStatements = [];
     const filesEnv = new Map();
@@ -36,7 +36,7 @@ function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAsse
     lines.push('export const configValuesSerialized = {');
     lines.push(...serializeConfigValues(pageConfig, importStatements, filesEnv, (configEnv) => isRuntimeEnvMatch(configEnv, { isForClientSide, isClientRouting, isDev }), '', false));
     lines.push('};');
-    if (!fixServerAssets_isEnabled() && includeAssetsImportedByServer && isForClientSide && !isDev) {
+    if (!handleAssetsManifest_isFixEnabled(config) && includeAssetsImportedByServer && isForClientSide && !isDev) {
         importStatements.push(`import '${extractAssetsAddQuery(getVirtualFileIdPageConfigValuesAll(pageId, false))}'`);
     }
     const code = [...importStatements, ...lines].join('\n');

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

@@ -2,7 +2,7 @@ export { getOutDirs };
 export { resolveOutDir };
 import pc from '@brillout/picocolors';
 import { assert, assertPosixPath, assertUsage, createDebugger, pathJoin, toPosixPath } from '../utils.js';
-import { viteIsSSR } from './viteIsSSR.js';
+import { isViteServerBuild } from './isViteServerBuild.js';
 const debug = createDebugger('vike:outDir');
 function getOutDirs(configGlobal, viteEnv) {
     const configEnv = viteEnv?.config ?? configGlobal;
@@ -16,7 +16,7 @@ function getOutDirs(configGlobal, viteEnv) {
 /** Appends `client/` or `server/` to `config.build.outDir` */
 function resolveOutDir(config, isSSR) {
     debug('resolveOutDir()', new Error().stack);
-    const isServerSide = viteIsSSR(config) || isSSR;
+    const isServerSide = isViteServerBuild(config) || isSSR;
     debug('isServerSide', isServerSide);
     const outDir = getOutDirFromViteUserConfig(config) || 'dist';
     debug('outDir', outDir);
@@ -105,7 +105,7 @@ function assertOutDirResolved(outDir, config) {
     assert('/client'.length === '/server'.length);
     const outDirCorrected = outDir.slice(0, -1 * '/client'.length);
     const wrongUsage = `You've set Vite's config.build.outDir to ${pc.cyan(outDir)} but you should set it to ${pc.cyan(outDirCorrected)} instead.`;
-    if (viteIsSSR(config)) {
+    if (isViteServerBuild(config)) {
         assertUsage(outDir.endsWith('/server'), wrongUsage);
     }
     else {

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

@@ -0,0 +1,15 @@
+export { isViteServerBuild };
+export { isViteClientBuild };
+export { isViteServerBuild_options };
+export { isViteServerBuild_safe };
+export { isViteServerBuild_onlySsrEnv };
+import type { Environment, ResolvedConfig, UserConfig } from 'vite';
+declare function isViteServerBuild(configGlobal: ResolvedConfig | UserConfig, viteEnv?: Environment): boolean;
+declare function isViteServerBuild_onlySsrEnv(configGlobal: ResolvedConfig, viteEnv: Environment | undefined): boolean;
+declare function isViteClientBuild(configGlobal: ResolvedConfig, viteEnv: Environment): boolean;
+declare function isViteServerBuild_options(options: {
+    ssr?: boolean;
+} | undefined): boolean;
+declare function isViteServerBuild_safe(config: ResolvedConfig, options: {
+    ssr?: boolean;
+} | undefined): boolean;

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

@@ -1,23 +1,32 @@
-export { viteIsSSR };
-export { viteIsServerBuildEnvAny };
-export { viteIsSSR_options };
-export { viteIsSSR_safe };
+export { isViteServerBuild };
+export { isViteClientBuild };
+export { isViteServerBuild_options };
+export { isViteServerBuild_safe };
+export { isViteServerBuild_onlySsrEnv };
 import { assert } from '../../../utils/assert.js';
-// TODO/now: rename_full viteIsSSR isViteServerBuildEnvSsr
-function viteIsSSR(configGlobal, viteEnv) {
+function isViteServerBuild(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);
+// Only `ssr` env: for example don't include `vercel_edge` nor `vercel_node`.
+function isViteServerBuild_onlySsrEnv(configGlobal, viteEnv) {
+    return viteEnv ? viteEnv.name === 'ssr' : isViteServerBuild(configGlobal);
 }
-function viteIsSSR_options(options) {
+function isViteClientBuild(configGlobal, viteEnv) {
+    const yes = !isViteServerBuild(configGlobal, viteEnv);
+    const isVite5 = viteEnv === undefined;
+    if (!isVite5) {
+        const yes2 = viteEnv.name === 'client';
+        assert(yes === yes2);
+    }
+    return yes;
+}
+function isViteServerBuild_options(options) {
     return !!options?.ssr;
 }
 // Vite is quite messy about setting `ssr: boolean`, thus we use an extra safe implemention for security purposes.
 // It's used for .client.js and .server.js guarantee thus we use agressive assert() calls for added safety.
-function viteIsSSR_safe(config, options) {
+function isViteServerBuild_safe(config, options) {
     if (config.command === 'build') {
         assert(typeof config.build.ssr === 'boolean');
         const val = config.build.ssr;

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.223-commit-f1089b4";
+export declare const PROJECT_VERSION: "0.4.223-commit-6adb186";

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-f1089b4';
+export const PROJECT_VERSION = '0.4.223-commit-6adb186';

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.223-commit-f1089b4",
+  "version": "0.4.223-commit-6adb186",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {

package/dist/cjs/node/plugin/shared/getFullBuildInlineConfig.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFullBuildInlineConfig = getFullBuildInlineConfig;
-const isViteCliCall_js_1 = require("./isViteCliCall.js");
-function getFullBuildInlineConfig(config) {
-    const configFromCli = !(0, isViteCliCall_js_1.isViteCliCall)() ? null : (0, isViteCliCall_js_1.getViteConfigFromCli)();
-    if (config._viteConfigEnhanced) {
-        return config._viteConfigEnhanced;
-    }
-    else {
-        return {
-            ...configFromCli,
-            configFile: configFromCli?.configFile || config.configFile,
-            root: config.root,
-            build: {
-                ...configFromCli?.build
-            }
-        };
-    }
-}

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

@@ -1,27 +0,0 @@
-export { handleAssetsManifest };
-export { fixServerAssets_getBuildConfig };
-export { fixServerAssets_isEnabled };
-export { fixServerAssets_assertUsageCssCodeSplit };
-export { fixServerAssets_assertUsageCssTarget };
-export { writeManifestFile };
-import type { ViteManifest } from '../../../../shared/ViteManifest.js';
-import type { Environment, ResolvedConfig, Rollup, UserConfig } from 'vite';
-type Bundle = Rollup.OutputBundle;
-type Options = Rollup.NormalizedOutputOptions;
-/**
- * true  => use workaround config.build.ssrEmitAssets
- * false => use workaround extractAssets plugin
- *
- * Only used by V1 design.
- */
-declare function fixServerAssets_isEnabled(): boolean;
-declare function fixServerAssets_assertUsageCssCodeSplit(config: ResolvedConfig): void;
-declare function fixServerAssets_assertUsageCssTarget(config: ResolvedConfig): void;
-declare function writeManifestFile(manifest: ViteManifest, manifestFilePath: string): Promise<void>;
-declare function fixServerAssets_getBuildConfig(config: UserConfig): {
-    readonly ssrEmitAssets: true | undefined;
-    readonly cssMinify: "esbuild" | undefined;
-    readonly manifest: "_temp_manifest.json";
-    readonly copyPublicDir: boolean | undefined;
-};
-declare function handleAssetsManifest(config: ResolvedConfig, viteEnv: Environment | undefined, options: Options, bundle: Bundle): Promise<void>;

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

@@ -1,2 +0,0 @@
-import type { InlineConfig, ResolvedConfig } from 'vite';
-export declare function getFullBuildInlineConfig(config: ResolvedConfig): InlineConfig;

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

@@ -1,17 +0,0 @@
-import { getViteConfigFromCli, isViteCliCall } from './isViteCliCall.js';
-export function getFullBuildInlineConfig(config) {
-    const configFromCli = !isViteCliCall() ? null : getViteConfigFromCli();
-    if (config._viteConfigEnhanced) {
-        return config._viteConfigEnhanced;
-    }
-    else {
-        return {
-            ...configFromCli,
-            configFile: configFromCli?.configFile || config.configFile,
-            root: config.root,
-            build: {
-                ...configFromCli?.build
-            }
-        };
-    }
-}

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

@@ -1,13 +0,0 @@
-export { viteIsSSR };
-export { viteIsServerBuildEnvAny };
-export { viteIsSSR_options };
-export { viteIsSSR_safe };
-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;
-declare function viteIsSSR_safe(config: ResolvedConfig, options: {
-    ssr?: boolean;
-} | undefined): boolean;