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

package/dist/cjs/node/plugin/plugins/build/{pluginAssetsManifest/fixServerAssets.js → handleAssetsManifest.js}

@@ -4,38 +4,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleAssetsManifest = handleAssetsManifest;
-exports.fixServerAssets_getBuildConfig = fixServerAssets_getBuildConfig;
-exports.fixServerAssets_isEnabled = fixServerAssets_isEnabled;
-exports.fixServerAssets_assertUsageCssCodeSplit = fixServerAssets_assertUsageCssCodeSplit;
-exports.fixServerAssets_assertUsageCssTarget = fixServerAssets_assertUsageCssTarget;
-exports.writeManifestFile = writeManifestFile;
+exports.handleAssetsManifest_getBuildConfig = handleAssetsManifest_getBuildConfig;
+exports.handleAssetsManifest_isFixEnabled = handleAssetsManifest_isFixEnabled;
+exports.handleAssetsManifest_assertUsageCssCodeSplit = handleAssetsManifest_assertUsageCssCodeSplit;
+exports.handleAssetsManifest_assertUsageCssTarget = handleAssetsManifest_assertUsageCssTarget;
 const promises_1 = __importDefault(require("fs/promises"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const fs_2 = require("fs");
-const utils_js_1 = require("../../../utils.js");
-const virtualFilePageConfigValuesAll_js_1 = require("../../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
-const pluginBuildConfig_js_1 = require("../pluginBuildConfig.js");
-const getAssetsDir_js_1 = require("../../../shared/getAssetsDir.js");
+const utils_js_1 = require("../../utils.js");
+const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
+const pluginBuildConfig_js_1 = require("./pluginBuildConfig.js");
+const getAssetsDir_js_1 = require("../../shared/getAssetsDir.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const getVikeConfig_js_1 = require("../../importUserCode/v1-design/getVikeConfig.js");
-const getOutDirs_js_1 = require("../../../shared/getOutDirs.js");
-const viteIsSSR_js_1 = require("../../../shared/viteIsSSR.js");
-const commonConfig_js_1 = require("../../commonConfig.js");
-const pluginBuildEntry_js_1 = require("../pluginBuildEntry.js");
+const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
+const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
+const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
+const commonConfig_js_1 = require("../commonConfig.js");
+const pluginBuildEntry_js_1 = require("./pluginBuildEntry.js");
 (0, utils_js_1.assertIsSingleModuleInstance)('build/handleAssetsManifest.ts');
 let assetsJsonFilePath;
-// TODO/now move isV1Design() inside fixServerAssets_isEnabled()
-/**
- * true  => use workaround config.build.ssrEmitAssets
- * false => use workaround extractAssets plugin
- *
- * Only used by V1 design.
- */
-function fixServerAssets_isEnabled() {
-    // We currently apply the workaround iff V1 design.
-    // Shall we allow the user to toggle between the two workarounds? E.g. based on https://vike.dev/includeAssetsImportedByServer.
-    return true;
+// true  => use workaround config.build.ssrEmitAssets
+// false => use workaround extractAssets plugin
+function handleAssetsManifest_isFixEnabled(config) {
+    // Allow user to toggle between the two workarounds? E.g. based on https://vike.dev/includeAssetsImportedByServer.
+    return (0, getVikeConfig_js_1.isV1Design)(config);
 }
 /** https://github.com/vikejs/vike/issues/1339 */
 async function fixServerAssets(config) {
@@ -224,19 +217,16 @@ function getHash(src) {
     return hash;
 }
 // https://github.com/vikejs/vike/issues/1993
-function fixServerAssets_assertUsageCssCodeSplit(config) {
-    const isServerAssetsFixEnabled = fixServerAssets_isEnabled() && (0, getVikeConfig_js_1.isV1Design)(config);
-    if (!isServerAssetsFixEnabled)
+function handleAssetsManifest_assertUsageCssCodeSplit(config) {
+    if (!handleAssetsManifest_isFixEnabled(config))
         return;
     (0, utils_js_1.assertWarning)(config.build.cssCodeSplit, `${picocolors_1.default.cyan('build.cssCodeSplit')} shouldn't be set to ${picocolors_1.default.cyan('false')} (https://github.com/vikejs/vike/issues/1993)`, { onlyOnce: true });
 }
 const targets = [];
-function fixServerAssets_assertUsageCssTarget(config) {
-    if (!fixServerAssets_isEnabled())
-        return;
-    if (!(0, getVikeConfig_js_1.isV1Design)(config))
+function handleAssetsManifest_assertUsageCssTarget(config) {
+    if (!handleAssetsManifest_isFixEnabled(config))
         return;
-    const isServerSide = (0, viteIsSSR_js_1.viteIsSSR)(config);
+    const isServerSide = (0, isViteServerBuild_js_1.isViteServerBuild)(config);
     (0, utils_js_1.assert)(typeof isServerSide === 'boolean');
     (0, utils_js_1.assert)(config.build.target !== undefined);
     targets.push({ global: config.build.target, css: config.build.cssTarget, isServerSide });
@@ -295,39 +285,39 @@ async function writeManifestFile(manifest, manifestFilePath) {
     const manifestFileContent = JSON.stringify(manifest, null, 2);
     await promises_1.default.writeFile(manifestFilePath, manifestFileContent, 'utf-8');
 }
-function fixServerAssets_getBuildConfig(config) {
+function handleAssetsManifest_getBuildConfig(config) {
     const vike = (0, commonConfig_js_1.getVikeConfigPublic)(config);
-    const isServerAssetsFixEnabled = fixServerAssets_isEnabled() && (0, getVikeConfig_js_1.isV1Design)(config);
+    const isFixEnabled = handleAssetsManifest_isFixEnabled(config);
     return {
         // https://github.com/vikejs/vike/issues/1339
-        ssrEmitAssets: isServerAssetsFixEnabled ? true : undefined,
+        ssrEmitAssets: isFixEnabled ? true : undefined,
         // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
-        cssMinify: isServerAssetsFixEnabled ? 'esbuild' : undefined,
+        cssMinify: isFixEnabled ? 'esbuild' : undefined,
         manifest: pluginBuildConfig_js_1.manifestTempFile,
         copyPublicDir: vike.config.viteEnvironmentAPI
             ? // Already set by vike:build:pluginBuildApp
                 undefined
-            : !(0, viteIsSSR_js_1.viteIsSSR)(config)
+            : !(0, isViteServerBuild_js_1.isViteServerBuild)(config)
     };
 }
 async function handleAssetsManifest(config, viteEnv, options, bundle) {
-    if ((0, viteIsSSR_js_1.viteIsSSR)(config, viteEnv)) {
+    if ((0, isViteServerBuild_js_1.isViteServerBuild_onlySsrEnv)(config, viteEnv)) {
         (0, utils_js_1.assert)(!assetsJsonFilePath);
         const outDirs = (0, getOutDirs_js_1.getOutDirs)(config, viteEnv);
         assetsJsonFilePath = path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
         await writeAssetsManifestFile(outDirs, assetsJsonFilePath, config);
     }
-    if ((0, viteIsSSR_js_1.viteIsServerBuildEnvAny)(config, viteEnv)) {
+    if ((0, isViteServerBuild_js_1.isViteServerBuild)(config, viteEnv)) {
         (0, utils_js_1.assert)(assetsJsonFilePath);
         // Replace __VITE_ASSETS_MANIFEST__ in all server-side bundles
         await (0, pluginBuildEntry_js_1.set_macro_ASSETS_MANIFEST)(options, bundle, assetsJsonFilePath);
     }
 }
 async function writeAssetsManifestFile(outDirs, assetsJsonFilePath, config) {
-    const isServerAssetsFixEnabled = fixServerAssets_isEnabled() && (0, getVikeConfig_js_1.isV1Design)(config);
+    const isFixEnabled = handleAssetsManifest_isFixEnabled(config);
     const clientManifestFilePath = path_1.default.posix.join(outDirs.outDirClient, pluginBuildConfig_js_1.manifestTempFile);
     const serverManifestFilePath = path_1.default.posix.join(outDirs.outDirServer, pluginBuildConfig_js_1.manifestTempFile);
-    if (!isServerAssetsFixEnabled) {
+    if (!isFixEnabled) {
         await promises_1.default.copyFile(clientManifestFilePath, assetsJsonFilePath);
     }
     else {

package/dist/cjs/node/plugin/plugins/build/pluginAutoFullBuild.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginAutoFullBuild = pluginAutoFullBuild;
-const getFullBuildInlineConfig_js_1 = require("../../shared/getFullBuildInlineConfig.js");
+exports.isPrerenderForceExit = isPrerenderForceExit;
 const vite_1 = require("vite");
 const utils_js_1 = require("../../utils.js");
 const runPrerender_js_1 = require("../../../prerender/runPrerender.js");
@@ -15,7 +15,9 @@ const logErrorHint_js_1 = require("../../../runtime/renderPage/logErrorHint.js")
 const pluginBuildConfig_js_1 = require("./pluginBuildConfig.js");
 const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
 const context_js_2 = require("../../../api/context.js");
-const fixServerAssets_js_1 = require("./pluginAssetsManifest/fixServerAssets.js");
+const handleAssetsManifest_js_1 = require("./handleAssetsManifest.js");
+const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
+(0, utils_js_1.assertIsSingleModuleInstance)('build/pluginAutoFullBuild.ts');
 let forceExit = false;
 function pluginAutoFullBuild() {
     let config;
@@ -36,8 +38,8 @@ function pluginAutoFullBuild() {
                 order: 'pre',
                 */
                 async handler(options, bundle) {
-                    await (0, fixServerAssets_js_1.handleAssetsManifest)(config, this.environment, options, bundle);
-                    await triggerFullBuild(config, vikeConfig, bundle);
+                    await (0, handleAssetsManifest_js_1.handleAssetsManifest)(config, this.environment, options, bundle);
+                    await triggerFullBuild(config, vikeConfig, this.environment, bundle);
                 }
             }
         },
@@ -49,7 +51,11 @@ function pluginAutoFullBuild() {
                 sequential: true,
                 order: 'post',
                 handler() {
-                    if (forceExit) {
+                    (0, utils_js_1.onSetupBuild)();
+                    (0, handleAssetsManifest_js_1.handleAssetsManifest_assertUsageCssTarget)(config);
+                    if (forceExit &&
+                        // Let vike:build:pluginBuildApp force exit
+                        !vikeConfig.global.config.viteEnvironmentAPI) {
                         (0, runPrerender_js_1.runPrerender_forceExit)();
                         (0, utils_js_1.assert)(false);
                     }
@@ -58,10 +64,14 @@ function pluginAutoFullBuild() {
         }
     ];
 }
-async function triggerFullBuild(config, vikeConfig, bundle) {
-    if (config.build.ssr)
-        return; // already triggered
-    if (isDisabled(vikeConfig))
+async function triggerFullBuild(config, vikeConfig, viteEnv, bundle) {
+    // Whether builder.buildApp() is being used, see plugin:build:pluginBuildApp
+    const isBuilderApp = vikeConfig.global.config.viteEnvironmentAPI;
+    // If builder.buildApp() => trigger at end of `this.environment.name === 'ssr'`.
+    // Else => trigger at end of client-side build.
+    if (isBuilderApp ? !(0, isViteServerBuild_js_1.isViteServerBuild_onlySsrEnv)(config, viteEnv) : !(0, isViteServerBuild_js_1.isViteClientBuild)(config, viteEnv))
+        return;
+    if (isEntirelyDisabled(vikeConfig))
         return;
     // Workaround for @vitejs/plugin-legacy
     //  - The legacy plugin triggers its own Rollup build for the client-side.
@@ -69,15 +79,20 @@ async function triggerFullBuild(config, vikeConfig, bundle) {
     //  - Issue & reproduction: https://github.com/vikejs/vike/issues/1154#issuecomment-1965954636
     if (!bundle[pluginBuildConfig_js_1.manifestTempFile])
         return;
-    const configInline = (0, getFullBuildInlineConfig_js_1.getFullBuildInlineConfig)(config);
-    try {
-        await (0, vite_1.build)(setSSR(configInline));
+    const configInline = getFullBuildInlineConfig(config);
+    if (!isBuilderApp) {
+        try {
+            await (0, vite_1.build)(setSSR(configInline));
+        }
+        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);
+            (0, logErrorHint_js_1.logErrorHint)(err);
+            process.exit(1);
+        }
     }
-    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);
-        (0, logErrorHint_js_1.logErrorHint)(err);
-        process.exit(1);
+    else {
+        // The server bulid is already called by builder.buildApp()
     }
     if ((0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfig)) {
         const res = await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline, config);
@@ -99,16 +114,32 @@ function abortViteBuildSsr(vikeConfig) {
         process.exit(0);
     }
 }
-function isDisabled(vikeConfig) {
-    const { disableAutoFullBuild, viteEnvironmentAPI } = vikeConfig.global.config;
-    if (viteEnvironmentAPI) {
-        return true;
-    }
+function isEntirelyDisabled(vikeConfig) {
+    const { disableAutoFullBuild } = vikeConfig.global.config;
     if (disableAutoFullBuild === undefined || disableAutoFullBuild === 'prerender') {
-        const isViteApi = !(0, isViteCliCall_js_1.isViteCliCall)() && !(0, context_js_2.isVikeCliOrApi)();
-        return isViteApi;
+        const isUserUsingViteApi = !(0, isViteCliCall_js_1.isViteCliCall)() && !(0, context_js_2.isVikeCliOrApi)();
+        return isUserUsingViteApi;
     }
     else {
         return disableAutoFullBuild;
     }
 }
+function isPrerenderForceExit() {
+    return forceExit;
+}
+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/cjs/node/plugin/plugins/build/pluginBuildApp.js

@@ -2,17 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginBuildApp = pluginBuildApp;
 const runPrerender_js_1 = require("../../../prerender/runPrerender.js");
-const context_js_1 = require("../../../prerender/context.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const utils_js_1 = require("../../utils.js");
-const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
-const getFullBuildInlineConfig_js_1 = require("../../shared/getFullBuildInlineConfig.js");
 const commonConfig_js_1 = require("../commonConfig.js");
+const pluginAutoFullBuild_js_1 = require("./pluginAutoFullBuild.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 shouldn't `forceExit`.
-    let forceExit = false;
     return [
         {
             name: 'vike:build:pluginBuildApp',
@@ -23,12 +17,13 @@ function pluginBuildApp() {
                     return;
                 return {
                     builder: {
-                        buildApp: async (builder) => {
+                        // Can be overriden by another plugin e.g vike-vercel https://github.com/vikejs/vike/pull/2184#issuecomment-2659425195
+                        async buildApp(builder) {
                             (0, utils_js_1.assert)(builder.environments.client);
                             (0, utils_js_1.assert)(builder.environments.ssr);
                             await builder.build(builder.environments.client);
                             await builder.build(builder.environments.ssr);
-                            if (forceExit) {
+                            if ((0, pluginAutoFullBuild_js_1.isPrerenderForceExit)()) {
                                 (0, runPrerender_js_1.runPrerender_forceExit)();
                                 (0, utils_js_1.assert)(false);
                             }
@@ -52,28 +47,6 @@ function pluginBuildApp() {
                     }
                 };
             }
-        },
-        {
-            name: 'vike:build:pluginBuildApp:prerender',
-            apply: 'build',
-            enforce: 'pre',
-            applyToEnvironment(env) {
-                return env.name === 'ssr';
-            },
-            configResolved(_config) {
-                config = _config;
-            },
-            async writeBundle() {
-                const vike = (0, commonConfig_js_1.getVikeConfigPublic)(config);
-                if (!vike.config.viteEnvironmentAPI)
-                    return;
-                const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
-                if (!(0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfig))
-                    return;
-                const configInline = (0, getFullBuildInlineConfig_js_1.getFullBuildInlineConfig)(config);
-                const res = await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline, config);
-                forceExit = res.forceExit;
-            }
         }
     ];
 }

package/dist/cjs/node/plugin/plugins/build/pluginBuildConfig.js

@@ -13,9 +13,9 @@ const module_1 = require("module");
 const prependEntriesDir_js_1 = require("../../../shared/prependEntriesDir.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.js");
 const getConfigValueBuildTime_js_1 = require("../../../../shared/page-configs/getConfigValueBuildTime.js");
-const viteIsSSR_js_1 = require("../../shared/viteIsSSR.js");
+const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
-const fixServerAssets_js_1 = require("./pluginAssetsManifest/fixServerAssets.js");
+const handleAssetsManifest_js_1 = require("./handleAssetsManifest.js");
 // @ts-ignore `file://${__filename}` is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
@@ -38,7 +38,7 @@ function pluginBuildConfig() {
                     (0, utils_js_1.assert)(Object.keys(entries).length > 0);
                     config.build.rollupOptions.input = (0, utils_js_1.injectRollupInputs)(entries, config);
                     addLogHook();
-                    (0, fixServerAssets_js_1.fixServerAssets_assertUsageCssCodeSplit)(config);
+                    (0, handleAssetsManifest_js_1.handleAssetsManifest_assertUsageCssCodeSplit)(config);
                 }
             },
             config: {
@@ -48,17 +48,13 @@ function pluginBuildConfig() {
                     return {
                         build: {
                             outDir: (0, getOutDirs_js_1.resolveOutDir)(config),
-                            ...(0, fixServerAssets_js_1.fixServerAssets_getBuildConfig)(config)
+                            ...(0, handleAssetsManifest_js_1.handleAssetsManifest_getBuildConfig)(config)
                         }
                     };
                 }
             },
             buildStart() {
                 (0, utils_js_1.onSetupBuild)();
-            },
-            closeBundle() {
-                (0, utils_js_1.onSetupBuild)();
-                (0, fixServerAssets_js_1.fixServerAssets_assertUsageCssTarget)(config);
             }
         }
     ];
@@ -71,7 +67,7 @@ async function getEntries(config) {
     // TODO/now: add meta.default
     vikeConfig.global.config.includeAssetsImportedByServer ?? true);
     (0, utils_js_1.assertUsage)(Object.keys(pageFileEntries).length !== 0 || pageConfigs.length !== 0, 'At least one page should be defined, see https://vike.dev/add');
-    if ((0, viteIsSSR_js_1.viteIsSSR)(config)) {
+    if ((0, isViteServerBuild_js_1.isViteServerBuild)(config)) {
         const pageEntries = getPageEntries(pageConfigs);
         const entries = {
             ...pageFileEntries,
@@ -144,7 +140,7 @@ function analyzeClientEntries(pageConfigs, config) {
 // Ensure Rollup creates entries for each page file, see https://github.com/vikejs/vike/issues/350
 // (Otherwise the page files may be missing in the client manifest.json)
 async function getPageFileEntries(config, includeAssetsImportedByServer) {
-    const isForClientSide = !(0, viteIsSSR_js_1.viteIsSSR)(config);
+    const isForClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild)(config);
     const fileTypes = isForClientSide ? ['.page', '.page.client'] : ['.page', '.page.server'];
     if (isForClientSide && includeAssetsImportedByServer) {
         fileTypes.push('.page.server');

package/dist/cjs/node/plugin/plugins/build/pluginBuildEntry.js

@@ -64,7 +64,7 @@ function getServerProductionEntryCode(config) {
     ].join('\n');
     return importerCode;
 }
-/** Set the value of the ASSETS_MANIFEST constant inside dist/server/entry.js (or dist/server/index.js) */
+// Set the value of the ASSETS_MANIFEST constant inside dist/server/entry.js (or dist/server/index.js)
 async function set_macro_ASSETS_MANIFEST(options, bundle, assetsJsonFilePath) {
     const { dir } = options;
     (0, utils_js_1.assert)(dir);

package/dist/cjs/node/plugin/plugins/build/pluginDistFileNames.js

@@ -33,7 +33,7 @@ function pluginDistFileNames() {
                 else {
                     // If a user needs this:
                     //  - assertUsage() that the naming provided by the user ends with `.[hash][extname]`
-                    //    - It's needed for getHash() of fixServerAssets()
+                    //    - It's needed for getHash() of handleAssetsManifest()
                     //    - Asset URLs should always contain a hash: it's paramount for caching assets.
                     //    - If rollupOutput.assetFileNames is a function then use a wrapper function to apply the assertUsage()
                     (0, utils_js_1.assertUsage)(false, "Setting Vite's configuration build.rollupOptions.output.assetFileNames is currently forbidden. Reach out if you need to use.");

package/dist/cjs/node/plugin/plugins/build/pluginDistPackageJsonFile.js

@@ -10,7 +10,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginDistPackageJsonFile = pluginDistPackageJsonFile;
 const rollupIsEsm_js_1 = require("../../shared/rollupIsEsm.js");
-const viteIsSSR_js_1 = require("../../shared/viteIsSSR.js");
+const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 function pluginDistPackageJsonFile() {
     let config;
     return {
@@ -20,7 +20,7 @@ function pluginDistPackageJsonFile() {
             config = config_;
         },
         generateBundle(options, bundle) {
-            if (!(0, viteIsSSR_js_1.viteIsSSR)(config))
+            if (!(0, isViteServerBuild_js_1.isViteServerBuild)(config))
                 return;
             const isEsm = (0, rollupIsEsm_js_1.rollupIsEsm)(options);
             const fileName = 'package.json';

package/dist/cjs/node/plugin/plugins/envVars.js

@@ -6,7 +6,7 @@ const utils_js_1 = require("../utils.js");
 const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const getFilePath_js_1 = require("../shared/getFilePath.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
-const viteIsSSR_js_1 = require("../shared/viteIsSSR.js");
+const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
 // TODO/enventually: (after we implemented vike.config.js)
 // - Make import.meta.env work inside +config.js
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
@@ -39,7 +39,7 @@ function envVarsPlugin() {
             if (!code.includes('import.meta.env.'))
                 return;
             const isBuild = config.command === 'build';
-            const isClientSide = !(0, viteIsSSR_js_1.viteIsSSR_safe)(config, options);
+            const isClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options);
             Object.entries(envsAll)
                 .filter(([key]) => {
                 // Already handled by Vite

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

@@ -14,11 +14,11 @@ const isAsset_js_1 = require("../shared/isAsset.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const fixServerAssets_js_1 = require("./build/pluginAssetsManifest/fixServerAssets.js");
+const handleAssetsManifest_js_1 = require("./build/handleAssetsManifest.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 const assertV1Design_js_1 = require("../../shared/assertV1Design.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
-const viteIsSSR_js_1 = require("../shared/viteIsSSR.js");
+const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 exports.extractAssetsRE = extractAssetsRE;
 const rawRE = /(\?|&)raw(?:&|$)/;
@@ -28,7 +28,7 @@ const debug = (0, utils_js_1.createDebugger)('vike:extractAssets');
 function extractAssetsPlugin() {
     let config;
     let vikeConfig;
-    let isServerAssetsFixEnabled;
+    let isFixEnabled;
     return [
         // This plugin removes all JavaScript from server-side only code, so that only CSS imports remains. (And also satic files imports e.g. `import logoURL from './logo.svg.js'`).
         {
@@ -41,14 +41,14 @@ function extractAssetsPlugin() {
                 if (!extractAssetsRE.test(id)) {
                     return;
                 }
-                if (isServerAssetsFixEnabled) {
-                    // I'm guessing isServerAssetsFixEnabled can only be true when mixing both designs: https://github.com/vikejs/vike/issues/1480
+                if (isFixEnabled) {
+                    // I'm guessing isFixEnabled can only be true when mixing both designs: https://github.com/vikejs/vike/issues/1480
                     (0, assertV1Design_js_1.assertV1Design)(vikeConfig.pageConfigs, true);
                     (0, utils_js_1.assert)(false);
                 }
                 // TODO/now: add meta.default
                 (0, utils_js_1.assert)(vikeConfig.global.config.includeAssetsImportedByServer ?? true);
-                (0, utils_js_1.assert)(!(0, viteIsSSR_js_1.viteIsSSR_safe)(config, options));
+                (0, utils_js_1.assert)(!(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options));
                 const importStatements = await (0, parseEsModule_js_1.getImportStatements)(src);
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
@@ -65,7 +65,7 @@ function extractAssetsPlugin() {
             //  - Vite's `vite:resolve` plugin; https://github.com/vitejs/vite/blob/d649daba7682791178b711d9a3e44a6b5d00990c/packages/vite/src/node/plugins/resolve.ts#L105
             enforce: 'pre',
             async resolveId(source, importer, options) {
-                if ((0, viteIsSSR_js_1.viteIsSSR_safe)(config, options)) {
+                if ((0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options)) {
                     // When building for the server, there should never be a `?extractAssets` query
                     (0, utils_js_1.assert)(!extractAssetsRE.test(source));
                     (0, utils_js_1.assert)(importer === undefined || !extractAssetsRE.test(importer));
@@ -142,8 +142,8 @@ function extractAssetsPlugin() {
             async configResolved(config_) {
                 config = config_;
                 vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
-                isServerAssetsFixEnabled = (0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && (await (0, getVikeConfig_js_1.isV1Design)(config));
-                if (!isServerAssetsFixEnabled) {
+                isFixEnabled = (0, handleAssetsManifest_js_1.handleAssetsManifest_isFixEnabled)(config);
+                if (!isFixEnabled) {
                     // https://github.com/vikejs/vike/issues/1060
                     (0, utils_js_1.assertUsage)(!config.plugins.find((p) => p.name === 'vite-tsconfig-paths'), 'vite-tsconfig-paths not supported, remove it and use vite.config.js#resolve.alias instead');
                 }

package/dist/cjs/node/plugin/plugins/extractExportNamesPlugin.js

@@ -7,7 +7,7 @@ const utils_js_1 = require("../utils.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
-const viteIsSSR_js_1 = require("../shared/viteIsSSR.js");
+const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 exports.extractExportNamesRE = extractExportNamesRE;
 const debug = (0, utils_js_1.createDebugger)('vike:extractExportNames');
@@ -19,7 +19,7 @@ function extractExportNamesPlugin() {
         enforce: 'post',
         async transform(src, id, options) {
             id = (0, normalizeId_js_1.normalizeId)(id);
-            const isClientSide = !(0, viteIsSSR_js_1.viteIsSSR_options)(options);
+            const isClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild_options)(options);
             if (extractExportNamesRE.test(id)) {
                 const code = await getExtractExportNamesCode(src, isClientSide, !isDev, id);
                 debug('id ' + id, ['result:\n' + code.code.trim(), 'src:\n' + src.trim()]);

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

@@ -12,12 +12,12 @@ const path_1 = __importDefault(require("path"));
 const getVirtualFilePageConfigs_js_1 = require("./v1-design/virtual-files/getVirtualFilePageConfigs.js");
 const getVikeConfig_js_1 = require("./v1-design/getVikeConfig.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
-const viteIsSSR_js_1 = require("../../shared/viteIsSSR.js");
+const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 async function getVirtualFileImportUserCode(id, options, vikeConfig, config, isDev) {
     const idParsed = (0, virtualFileImportUserCode_js_1.isVirtualFileIdImportUserCode)(id);
     (0, utils_js_1.assert)(idParsed);
     const { isForClientSide, isClientRouting } = idParsed;
-    (0, utils_js_1.assert)(isForClientSide === !(0, viteIsSSR_js_1.viteIsSSR_options)(options));
+    (0, utils_js_1.assert)(isForClientSide === !(0, isViteServerBuild_js_1.isViteServerBuild_options)(options));
     const code = await getCode(config, vikeConfig, isForClientSide, isClientRouting, isDev, id);
     return code;
 }
@@ -74,7 +74,7 @@ ${await (0, getVirtualFilePageConfigs_js_1.getVirtualFilePageConfigs)(isForClien
 
 `;
     // We still use import.meta.glob() when using th V1 design in order to not break the V1 design deprecation warning
-    const isV1Design = await (0, getVikeConfig_js_1.isV1Design)(config);
+    const isV1Design = (0, getVikeConfig_js_1.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_js_1.fileTypes

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

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

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

@@ -73,6 +73,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;
@@ -91,7 +92,6 @@ async function getVikeConfigEntry(userRootDir, isDev, vikeVitePluginOptions, doN
     }
     return await vikeConfigPromise;
 }
-// TODO/now update all isV1Design() usage
 function isV1Design(config) {
     const vikeConfig = config._vikeConfigObject;
     (0, utils_js_1.assert)(vikeConfig);

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

@@ -8,7 +8,7 @@ const extractAssetsQuery_js_1 = require("../../../../../shared/extractAssetsQuer
 const debug_js_1 = require("./debug.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
 const serializeConfigValues_js_1 = require("../../../../../../shared/page-configs/serialize/serializeConfigValues.js");
-const fixServerAssets_js_1 = require("../../../build/pluginAssetsManifest/fixServerAssets.js");
+const handleAssetsManifest_js_1 = require("../../../build/handleAssetsManifest.js");
 const getConfigValueBuildTime_js_1 = require("../../../../../../shared/page-configs/getConfigValueBuildTime.js");
 async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     const result = (0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(id);
@@ -26,11 +26,11 @@ async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     (0, utils_js_1.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);
     (0, debug_js_1.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();
@@ -38,7 +38,7 @@ function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAsse
     lines.push('export const configValuesSerialized = {');
     lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, filesEnv, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), '', false));
     lines.push('};');
-    if (!(0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && includeAssetsImportedByServer && isForClientSide && !isDev) {
+    if (!(0, handleAssetsManifest_js_1.handleAssetsManifest_isFixEnabled)(config) && includeAssetsImportedByServer && isForClientSide && !isDev) {
         importStatements.push(`import '${(0, extractAssetsQuery_js_1.extractAssetsAddQuery)((0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageId, false))}'`);
     }
     const code = [...importStatements, ...lines].join('\n');