vike 0.4.230-commit-f07cc20 → 0.4.231-commit-a0ca5e4

package/dist/cjs/node/{plugin/plugins/build → vite/plugins/pluginBuild}/pluginBuildConfig.js

@@ -5,9 +5,9 @@ exports.pluginBuildConfig = pluginBuildConfig;
 exports.assertRollupInput = assertRollupInput;
 exports.analyzeClientEntries = analyzeClientEntries;
 const utils_js_1 = require("../../utils.js");
-const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
+const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const findPageFiles_js_1 = require("../../shared/findPageFiles.js");
-const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
+const virtualFilePageConfigLazy_js_1 = require("../../../shared/virtualFiles/virtualFilePageConfigLazy.js");
 const extractAssetsQuery_js_1 = require("../../../shared/extractAssetsQuery.js");
 const prependEntriesDir_js_1 = require("../../../shared/prependEntriesDir.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.js");
@@ -15,6 +15,7 @@ const getConfigValueBuildTime_js_1 = require("../../../../shared/page-configs/ge
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const handleAssetsManifest_js_1 = require("./handleAssetsManifest.js");
+const getPageAssets_js_1 = require("../../../runtime/renderPage/getPageAssets.js");
 const manifestTempFile = '_temp_manifest.json';
 exports.manifestTempFile = manifestTempFile;
 function pluginBuildConfig() {
@@ -39,12 +40,12 @@ function pluginBuildConfig() {
             },
             config: {
                 order: 'post',
-                handler(config) {
+                async handler(config) {
                     (0, utils_js_1.onSetupBuild)();
                     return {
                         build: {
                             outDir: (0, getOutDirs_js_1.resolveOutDir)(config),
-                            ...(0, handleAssetsManifest_js_1.handleAssetsManifest_getBuildConfig)(config)
+                            ...(await (0, handleAssetsManifest_js_1.handleAssetsManifest_getBuildConfig)(config))
                         }
                     };
                 }
@@ -56,12 +57,10 @@ function pluginBuildConfig() {
     ];
 }
 async function getEntries(config) {
-    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
-    const { pageConfigs } = vikeConfig;
+    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+    const { _pageConfigs: pageConfigs } = vikeConfig;
     // TODO/v1-release: remove
-    const pageFileEntries = await getPageFileEntries(config, 
-    // TODO/now: add meta.default
-    vikeConfig.global.config.includeAssetsImportedByServer ?? true);
+    const pageFileEntries = await getPageFileEntries(config, (0, getPageAssets_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config));
     (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, isViteServerBuild_js_1.isViteServerBuild)(config)) {
         const pageEntries = getPageEntries(pageConfigs);
@@ -82,8 +81,8 @@ async function getEntries(config) {
             ...clientEntries,
             ...pageFileEntries
         };
-        const clientRoutingEntry = (0, utils_js_1.requireResolveVikeDistFile)('dist/esm/client/client-routing-runtime/entry.js');
-        const serverRoutingEntry = (0, utils_js_1.requireResolveVikeDistFile)('dist/esm/client/server-routing-runtime/entry.js');
+        const clientRoutingEntry = (0, utils_js_1.requireResolveVikeDistFile)('dist/esm/client/runtime-client-routing/entry.js');
+        const serverRoutingEntry = (0, utils_js_1.requireResolveVikeDistFile)('dist/esm/client/runtime-server-routing/entry.js');
         if (hasClientRouting) {
             entries['entries/entry-client-routing'] = clientRoutingEntry;
         }
@@ -180,7 +179,7 @@ function getEntryFromClientEntry(clientEntry, config, addExtractAssetsQuery) {
 }
 function getEntryFromPageConfig(pageConfig, isForClientSide) {
     let { pageId } = pageConfig;
-    const entryTarget = (0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageId, isForClientSide);
+    const entryTarget = (0, virtualFilePageConfigLazy_js_1.getVirtualFileIdPageConfigLazy)(pageId, isForClientSide);
     let entryName = pageId;
     // Avoid:
     // ```

package/dist/cjs/node/{plugin/plugins/build → vite/plugins/pluginBuild}/pluginBuildEntry.js

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginBuildEntry = pluginBuildEntry;
 exports.set_macro_ASSETS_MANIFEST = set_macro_ASSETS_MANIFEST;
 const plugin_1 = require("@brillout/vite-plugin-server-entry/plugin");
-const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/virtualFileImportUserCode.js");
+const virtualFileEntry_js_1 = require("../../../shared/virtualFiles/virtualFileEntry.js");
 const utils_js_1 = require("../../utils.js");
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
-const extractExportNamesPlugin_js_1 = require("../extractExportNamesPlugin.js");
+const pluginExtractExportNames_js_1 = require("../pluginExtractExportNames.js");
 const globalContext_js_1 = require("../../../runtime/globalContext.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const getViteConfigRuntime_js_1 = require("../../shared/getViteConfigRuntime.js");
@@ -38,14 +38,14 @@ function getServerProductionEntryCode(config) {
     const importPath = getImportPath(config);
     const buildInfo = {
         versionAtBuildTime: utils_js_1.PROJECT_VERSION,
-        usesClientRouter: (0, extractExportNamesPlugin_js_1.isUsingClientRouter)(), // TODO/v1-release: remove
+        usesClientRouter: (0, pluginExtractExportNames_js_1.isUsingClientRouter)(), // TODO/v1-release: remove
         viteConfigRuntime: (0, getViteConfigRuntime_js_1.getViteConfigRuntime)(config)
     };
     (0, globalContext_js_1.assertBuildInfo)(buildInfo);
     // After the old design is removed, let's maybe simplify and move everything into a single virtual module
     const importerCode = [
         `  import { setGlobalContext_buildEntry } from '${importPath}';`,
-        `  import * as virtualFileExports from '${virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeServer}';`,
+        `  import * as virtualFileExports from '${virtualFileEntry_js_1.virtualFileIdEntryServer}';`,
         `  {`,
         // Because of a Rollup bug, we have to assign ASSETS_MANIFEST to a variable before passing it to setGlobalContext_buildEntry()
         // - This workaround doesn't work: https://github.com/vikejs/vike/commit/d5f3a4f7aae5a8bc44192e6cbb2bcb9007be188d

package/dist/cjs/node/{plugin/plugins/build → vite/plugins/pluginBuild}/pluginModuleBanner.js

@@ -5,14 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginModuleBanner = pluginModuleBanner;
 const magic_string_1 = __importDefault(require("magic-string"));
-const virtual_files_js_1 = require("../../../shared/virtual-files.js");
+const virtualFiles_js_1 = require("../../../shared/virtualFiles.js");
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 // Rollup's banner feature doesn't work with Vite: https://github.com/vitejs/vite/issues/8412
 // But, anyways, we want to prepend the banner at the beginning of each module, not at the beginning of each file (I believe that's what Rollup's banner feature does).
 function pluginModuleBanner() {
     let config;
     return {
-        name: 'vike:pluginModuleBanner',
+        name: 'vike:build:pluginModuleBanner',
         enforce: 'post',
         apply: 'build',
         configResolved(config_) {
@@ -28,7 +28,7 @@ function pluginModuleBanner() {
                 }
                 if (id.startsWith('\0'))
                     id = id;
-                id = (0, virtual_files_js_1.removeVirtualIdTag)(id);
+                id = (0, virtualFiles_js_1.removeVirtualIdTag)(id);
                 if (id.startsWith(config.root))
                     id = id.slice(config.root.length + 1);
                 id = id.replaceAll('*/', '*\\/'); // https://github.com/vikejs/vike/issues/2377

package/dist/cjs/node/vite/plugins/pluginBuild.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pluginBuild = pluginBuild;
+const pluginBuildApp_js_1 = require("./pluginBuild/pluginBuildApp.js");
+const pluginDistPackageJsonFile_js_1 = require("./pluginBuild/pluginDistPackageJsonFile.js");
+const pluginSuppressRollupWarning_js_1 = require("./pluginBuild/pluginSuppressRollupWarning.js");
+const pluginDistFileNames_js_1 = require("./pluginBuild/pluginDistFileNames.js");
+const pluginAutoFullBuild_js_1 = require("./pluginBuild/pluginAutoFullBuild.js");
+const pluginBuildEntry_js_1 = require("./pluginBuild/pluginBuildEntry.js");
+const pluginBuildConfig_js_1 = require("./pluginBuild/pluginBuildConfig.js");
+const pluginModuleBanner_js_1 = require("./pluginBuild/pluginModuleBanner.js");
+function pluginBuild() {
+    return [
+        ...(0, pluginBuildConfig_js_1.pluginBuildConfig)(),
+        ...(0, pluginBuildApp_js_1.pluginBuildApp)(),
+        ...(0, pluginAutoFullBuild_js_1.pluginAutoFullBuild)(),
+        ...(0, pluginBuildEntry_js_1.pluginBuildEntry)(),
+        (0, pluginDistPackageJsonFile_js_1.pluginDistPackageJsonFile)(),
+        (0, pluginSuppressRollupWarning_js_1.pluginSuppressRollupWarning)(),
+        (0, pluginDistFileNames_js_1.pluginDistFileNames)(),
+        (0, pluginModuleBanner_js_1.pluginModuleBanner)()
+    ];
+}

package/dist/cjs/node/{plugin/plugins/commonConfig.js → vite/plugins/pluginCommon.js}

@@ -3,25 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.commonConfig = commonConfig;
-exports.getVikeConfigPublic = getVikeConfigPublic;
-exports.getVikeConfigInternal = getVikeConfigInternal;
+exports.pluginCommon = pluginCommon;
 const utils_js_1 = require("../utils.js");
-const pluginBuildConfig_js_1 = require("./build/pluginBuildConfig.js");
+const pluginBuildConfig_js_1 = require("./pluginBuild/pluginBuildConfig.js");
 const require_shim_1 = require("@brillout/require-shim");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const path_1 = __importDefault(require("path"));
-const assertResolveAlias_js_1 = require("./commonConfig/assertResolveAlias.js");
+const assertResolveAlias_js_1 = require("./pluginCommon/assertResolveAlias.js");
 const isViteCliCall_js_1 = require("../shared/isViteCliCall.js");
 const context_js_1 = require("../../api/context.js");
-const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
+const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
 const prepareViteApiCall_js_1 = require("../../api/prepareViteApiCall.js");
 const context_js_2 = require("../../prerender/context.js");
-const resolvePrerenderConfig_js_1 = require("../../prerender/resolvePrerenderConfig.js");
-const pluginName = 'vike:commonConfig';
-function commonConfig(vikeVitePluginOptions) {
-    // We cache it => makes sure we only generate one object => we can mutate it at runPrerender()
-    let prerenderContext;
+const pluginName = 'vike:pluginCommon';
+function pluginCommon(vikeVitePluginOptions) {
     return [
         {
             name: `${pluginName}:pre`,
@@ -31,31 +26,19 @@ function commonConfig(vikeVitePluginOptions) {
                 async handler(configFromUser, env) {
                     const isDev = (0, utils_js_1.isDevCheck)(env);
                     const operation = env.command === 'build' ? 'build' : env.isPreview ? 'preview' : 'dev';
-                    const root = configFromUser.root ? (0, prepareViteApiCall_js_1.normalizeViteRoot)(configFromUser.root) : await (0, prepareViteApiCall_js_1.getViteRoot)(operation);
-                    (0, utils_js_1.assert)(root);
-                    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig2)(root, isDev, vikeVitePluginOptions);
-                    const { isPrerenderingEnabled, isPrerenderingEnabledForAllPages } = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(vikeConfig);
-                    prerenderContext ?? (prerenderContext = {
-                        isPrerenderingEnabled,
-                        isPrerenderingEnabledForAllPages,
-                        output: null,
-                        pageContexts: null
-                    });
-                    (0, utils_js_1.assert)(prerenderContext.isPrerenderingEnabled === isPrerenderingEnabled);
-                    (0, utils_js_1.assert)(prerenderContext.isPrerenderingEnabledForAllPages === isPrerenderingEnabledForAllPages);
+                    const rootResolvedEarly = configFromUser.root
+                        ? (0, prepareViteApiCall_js_1.normalizeViteRoot)(configFromUser.root)
+                        : await (0, prepareViteApiCall_js_1.getViteRoot)(operation);
+                    (0, utils_js_1.assert)(rootResolvedEarly);
+                    // TODO/v1-release: we can remove setVikeConfigContext() call here since with Vike's CLI it's already called at vike/node/api/prepareViteApiCall.ts
+                    (0, resolveVikeConfigInternal_js_1.setVikeConfigContext)({ userRootDir: rootResolvedEarly, isDev, vikeVitePluginOptions });
+                    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
                     return {
                         _isDev: isDev,
-                        _root: root,
-                        _vikeVitePluginOptions: vikeVitePluginOptions,
-                        _vikeConfigObject: vikeConfig,
-                        _vike: {
-                            pages: vikeConfig.pages,
-                            config: vikeConfig.global.config,
-                            prerenderContext
-                        },
+                        _rootResolvedEarly: rootResolvedEarly,
                         // TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
                         configVikePromise: Promise.resolve({
-                            prerender: isPrerenderingEnabled
+                            prerender: vikeConfig.prerenderContext.isPrerenderingEnabled
                         })
                     };
                 }
@@ -64,7 +47,7 @@ function commonConfig(vikeVitePluginOptions) {
         {
             name: pluginName,
             configResolved(config) {
-                (0, prepareViteApiCall_js_1.assertViteRoot)(config._root, config);
+                (0, prepareViteApiCall_js_1.assertViteRoot)(config._rootResolvedEarly, config);
                 assertSingleInstance(config);
                 (0, require_shim_1.installRequireShim_setUserRootDir)(config.root);
             }
@@ -74,7 +57,7 @@ function commonConfig(vikeVitePluginOptions) {
             enforce: 'post',
             configResolved: {
                 order: 'post',
-                handler(config) {
+                async handler(config) {
                     /* TODO: do this after implementing vike.config.js and new setting transformLinkedDependencies (or probably a better name like transpileLinkedDependencies/bundleLinkedDependencies or something else)
                     overrideViteDefaultSsrExternal(config)
                     //*/
@@ -84,25 +67,25 @@ function commonConfig(vikeVitePluginOptions) {
                     assertEsm(config.root);
                     assertVikeCliOrApi(config);
                     temp_supportOldInterface(config);
-                    emitServerEntryOnlyIfNeeded(config);
+                    await emitServerEntryOnlyIfNeeded(config);
                 }
             },
             config: {
                 order: 'post',
-                handler(configFromUser) {
+                async handler(configFromUser) {
                     let configFromVike = { server: {}, preview: {} };
-                    const vike = getVikeConfigInternal(configFromUser);
-                    if (vike.config.port !== undefined) {
+                    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+                    if (vikeConfig.config.port !== undefined) {
                         // https://vike.dev/port
-                        setDefault('port', vike.config.port, configFromUser, configFromVike);
+                        setDefault('port', vikeConfig.config.port, configFromUser, configFromVike);
                     }
                     else {
                         // Change Vite's default port
                         setDefault('port', 3000, configFromUser, configFromVike);
                     }
-                    if (vike.config.host) {
+                    if (vikeConfig.config.host) {
                         // https://vike.dev/host
-                        setDefault('host', vike.config.host, configFromUser, configFromVike);
+                        setDefault('host', vikeConfig.config.host, configFromUser, configFromVike);
                     }
                     else if ((0, utils_js_1.isDocker)()) {
                         // Set `--host` for Docker/Podman
@@ -200,30 +183,10 @@ function temp_supportOldInterface(config) {
     }
     (0, utils_js_1.assert)(false);
 }
-// TODO/soon rename:
-// - `getVikeConfig()` => `resolveVikeConfig()` ?
-// - `getVikeConfigInternal()` => `getVikeConfig()`
-// - `VikeConfigPublic` => `VikeConfig` ?
-// - `VikeConfigObject` => `VikeConfigInternal` ?
-/**
- * Get all the information Vike knows about the app in your Vite plugin.
- *
- * https://vike.dev/getVikeConfig
- */
-function getVikeConfigInternal(config) {
-    const vikeConfig = config._vike;
-    (0, utils_js_1.assert)(vikeConfig);
-    return vikeConfig;
-}
-function getVikeConfigPublic(config) {
-    const vikeConfig = config._vike;
-    (0, utils_js_1.assertUsage)(vikeConfig, "getVikeConfig() can only be used when Vite is running with Vike's Vite plugin");
-    return vikeConfig;
-}
 // Only emit dist/server/entry.mjs if necessary
-function emitServerEntryOnlyIfNeeded(config) {
-    if (config.vitePluginServerEntry?.inject &&
-        !(0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(config._vikeConfigObject).isPrerenderingEnabled) {
+async function emitServerEntryOnlyIfNeeded(config) {
+    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+    if (config.vitePluginServerEntry?.inject && !vikeConfig.prerenderContext.isPrerenderingEnabled) {
         config.vitePluginServerEntry.disableServerEntryEmit = true;
     }
 }

package/dist/cjs/node/{plugin/plugins/devConfig → vite/plugins/pluginDev}/determineOptimizeDeps.js

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.determineOptimizeDeps = determineOptimizeDeps;
 const findPageFiles_js_1 = require("../../shared/findPageFiles.js");
 const utils_js_1 = require("../../utils.js");
-const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
-const pluginBuildConfig_js_1 = require("../build/pluginBuildConfig.js");
-const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/virtualFileImportUserCode.js");
+const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
+const pluginBuildConfig_js_1 = require("../pluginBuild/pluginBuildConfig.js");
+const virtualFileEntry_js_1 = require("../../../shared/virtualFiles/virtualFileEntry.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.js");
 const debug = (0, utils_js_1.createDebugger)('vike:optimizeDeps');
 async function determineOptimizeDeps(config) {
-    const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(config);
+    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+    const { _pageConfigs: pageConfigs } = vikeConfig;
     const { entries, include } = await getPageDeps(config, pageConfigs);
     {
         // This actually doesn't work: Vite's dep optimizer doesn't seem to be able to crawl virtual files.
@@ -48,7 +49,7 @@ async function getPageDeps(config, pageConfigs) {
         pageConfigs.forEach((pageConfig) => {
             Object.entries(pageConfig.configValueSources).forEach(([configName, sources]) => {
                 sources
-                    .filter((source) => !(0, getVikeConfig_js_1.isOverriden)(source, configName, pageConfig))
+                    .filter((source) => !(0, resolveVikeConfigInternal_js_1.isOverriden)(source, configName, pageConfig))
                     .forEach((configValueSource) => {
                     if (!configValueSource.valueIsLoadedWithImport && !configValueSource.valueIsFilePath)
                         return;
@@ -92,9 +93,9 @@ function getVirtualFiles(config, pageConfigs) {
     const { hasClientRouting, hasServerRouting, clientEntries } = (0, pluginBuildConfig_js_1.analyzeClientEntries)(pageConfigs, config);
     const entriesVirtualFiles = Object.values(clientEntries);
     if (hasClientRouting)
-        entriesVirtualFiles.push(virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeClientCR);
+        entriesVirtualFiles.push(virtualFileEntry_js_1.virtualFileIdEntryClientCR);
     if (hasServerRouting)
-        entriesVirtualFiles.push(virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeClientSR);
+        entriesVirtualFiles.push(virtualFileEntry_js_1.virtualFileIdEntryClientSR);
     return entriesVirtualFiles;
 }
 function normalizeEntries(entries) {

package/dist/cjs/node/{plugin/plugins/devConfig/index.js → vite/plugins/pluginDev.js}

@@ -3,24 +3,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.devConfig = devConfig;
+exports.pluginDev = pluginDev;
 exports.logDockerHint = logDockerHint;
-const determineOptimizeDeps_js_1 = require("./determineOptimizeDeps.js");
-const determineFsAllowList_js_1 = require("./determineFsAllowList.js");
-const addSsrMiddleware_js_1 = require("../../shared/addSsrMiddleware.js");
-const utils_js_1 = require("../../utils.js");
-const loggerVite_js_1 = require("../../shared/loggerVite.js");
-const isErrorDebug_js_1 = require("../../../shared/isErrorDebug.js");
-const getHttpRequestAsyncStore_js_1 = require("../../shared/getHttpRequestAsyncStore.js");
+const determineOptimizeDeps_js_1 = require("./pluginDev/determineOptimizeDeps.js");
+const determineFsAllowList_js_1 = require("./pluginDev/determineFsAllowList.js");
+const addSsrMiddleware_js_1 = require("../shared/addSsrMiddleware.js");
+const utils_js_1 = require("../utils.js");
+const loggerVite_js_1 = require("../shared/loggerVite.js");
+const isErrorDebug_js_1 = require("../../shared/isErrorDebug.js");
+const getHttpRequestAsyncStore_js_1 = require("../shared/getHttpRequestAsyncStore.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 if ((0, isErrorDebug_js_1.isErrorDebug)()) {
     Error.stackTraceLimit = Infinity;
 }
-function devConfig() {
+function pluginDev() {
     let config;
     return [
         {
-            name: 'vike:devConfig',
+            name: 'vike:pluginDev',
             apply: utils_js_1.applyDev,
             config() {
                 return {
@@ -73,7 +73,7 @@ function devConfig() {
             }
         },
         {
-            name: 'vike:devConfig:addSsrMiddleware',
+            name: 'vike:pluginDev:addSsrMiddleware',
             apply: utils_js_1.applyDev,
             // The SSR middleware should be last middleware
             enforce: 'post',

package/dist/cjs/node/{plugin/plugins/envVars.js → vite/plugins/pluginEnvVars.js}

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.envVarsPlugin = envVarsPlugin;
+exports.pluginEnvVars = pluginEnvVars;
 const magic_string_1 = __importDefault(require("magic-string"));
 const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
@@ -20,11 +20,11 @@ const PUBLIC_ENV_ALLOWLIST = [
     // https://github.com/vikejs/vike/issues/1724
     'STORYBOOK'
 ];
-function envVarsPlugin() {
+function pluginEnvVars() {
     let envsAll;
     let config;
     return {
-        name: 'vike:envVars',
+        name: 'vike:pluginEnvVars',
         enforce: 'post',
         configResolved(config_) {
             config = config_;

package/dist/cjs/node/{plugin/plugins/extractAssetsPlugin.js → vite/plugins/pluginExtractAssets.js}

@@ -6,32 +6,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractAssetsRE = void 0;
-exports.extractAssetsPlugin = extractAssetsPlugin;
+exports.pluginExtractAssets = pluginExtractAssets;
 const utils_js_1 = require("../utils.js");
-const virtual_files_js_1 = require("../../shared/virtual-files.js");
+const virtualFiles_js_1 = require("../../shared/virtualFiles.js");
 const extractAssetsQuery_js_1 = require("../../shared/extractAssetsQuery.js");
 const isAsset_js_1 = require("../shared/isAsset.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const handleAssetsManifest_js_1 = require("./build/handleAssetsManifest.js");
-const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
+const handleAssetsManifest_js_1 = require("./pluginBuild/handleAssetsManifest.js");
+const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
 const assertV1Design_js_1 = require("../../shared/assertV1Design.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
 const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
+const getPageAssets_js_1 = require("../../runtime/renderPage/getPageAssets.js");
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 exports.extractAssetsRE = extractAssetsRE;
 const rawRE = /(\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;
 const EMPTY_MODULE_ID = 'virtual:vike:empty-module';
-const debug = (0, utils_js_1.createDebugger)('vike:extractAssets');
-function extractAssetsPlugin() {
+const debug = (0, utils_js_1.createDebugger)('vike:pluginExtractAssets');
+function pluginExtractAssets() {
     let config;
     let vikeConfig;
     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'`).
         {
-            name: 'vike:extractAssets:remove-javaScript',
+            name: 'vike:pluginExtractAssets:remove-javaScript',
             // In dev, things just work. (Because Vite's module graph erroneously conflates the Vite server-side importees with the client-side importees.)
             apply: 'build',
             enforce: 'post',
@@ -42,11 +43,11 @@ function extractAssetsPlugin() {
                 }
                 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, 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);
+                const includeAssetsImportedByServer = (0, getPageAssets_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config);
+                (0, utils_js_1.assert)(includeAssetsImportedByServer);
                 (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);
@@ -57,7 +58,7 @@ function extractAssetsPlugin() {
         },
         // This plugin appends `?extractAssets` to module IDs
         {
-            name: 'vike:extractAssets:append-extractAssets-query',
+            name: 'vike:pluginExtractAssets:append-extractAssets-query',
             apply: 'build',
             // We ensure this plugin to be run before:
             //  - rollup's `alias` plugin; https://github.com/rollup/plugins/blob/5363f55aa1933b6c650832b08d6a54cb9ea64539/packages/alias/src/index.ts
@@ -79,8 +80,8 @@ function extractAssetsPlugin() {
                 if (!extractAssetsRE.test(importer)) {
                     return;
                 }
-                // TODO/now: add meta.default
-                (0, utils_js_1.assert)(vikeConfig.global.config.includeAssetsImportedByServer ?? true);
+                const includeAssetsImportedByServer = (0, getPageAssets_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config);
+                (0, utils_js_1.assert)(includeAssetsImportedByServer);
                 let resolution = null;
                 try {
                     resolution = await this.resolve(source, importer, { skipSelf: true, ...options });
@@ -120,14 +121,14 @@ function extractAssetsPlugin() {
             }
         },
         {
-            name: 'vike:extractAssets-3',
+            name: 'vike:pluginExtractAssets-3',
             apply: 'build',
             load(id) {
-                if (!(0, virtual_files_js_1.isVirtualFileId)(id))
+                if (!(0, virtualFiles_js_1.isVirtualFileId)(id))
                     return undefined;
-                id = (0, virtual_files_js_1.getVirtualFileId)(id);
+                id = (0, virtualFiles_js_1.getVirtualFileId)(id);
                 if (id === EMPTY_MODULE_ID) {
-                    return '// Erased by vike:extractAssets';
+                    return '// Erased by vike:pluginExtractAssets';
                 }
             },
             config() {
@@ -137,10 +138,10 @@ function extractAssetsPlugin() {
             }
         },
         {
-            name: 'vike:extractAssets-4',
+            name: 'vike:pluginExtractAssets-4',
             async configResolved(config_) {
                 config = config_;
-                vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
+                vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
                 isFixEnabled = (0, handleAssetsManifest_js_1.handleAssetsManifest_isFixEnabled)(config);
                 if (!isFixEnabled) {
                     // https://github.com/vikejs/vike/issues/1060
@@ -152,7 +153,7 @@ function extractAssetsPlugin() {
 }
 function emptyModule(file, importer) {
     debugOperation('NUKED', file, importer);
-    return (0, virtual_files_js_1.resolveVirtualFileId)(EMPTY_MODULE_ID);
+    return (0, virtualFiles_js_1.resolveVirtualFileId)(EMPTY_MODULE_ID);
 }
 function appendExtractAssetsQuery(file, importer) {
     debugOperation('TRANSFORMED', file, importer);

package/dist/cjs/node/{plugin/plugins/extractExportNamesPlugin.js → vite/plugins/pluginExtractExportNames.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractExportNamesRE = void 0;
-exports.extractExportNamesPlugin = extractExportNamesPlugin;
+exports.pluginExtractExportNames = pluginExtractExportNames;
 exports.isUsingClientRouter = isUsingClientRouter;
 const utils_js_1 = require("../utils.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
@@ -9,12 +9,12 @@ const normalizeId_js_1 = require("../shared/normalizeId.js");
 const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 exports.extractExportNamesRE = extractExportNamesRE;
-const debug = (0, utils_js_1.createDebugger)('vike:extractExportNames');
-const globalObject = (0, utils_js_1.getGlobalObject)('plugins/extractExportNamesPlugin.ts', {});
-function extractExportNamesPlugin() {
+const debug = (0, utils_js_1.createDebugger)('vike:pluginExtractExportNames');
+const globalObject = (0, utils_js_1.getGlobalObject)('plugins/pluginExtractExportNames.ts', {});
+function pluginExtractExportNames() {
     let isDev = false;
     return {
-        name: 'vike:extractExportNames',
+        name: 'vike:pluginExtractExportNames',
         enforce: 'post',
         async transform(src, id, options) {
             id = (0, normalizeId_js_1.normalizeId)(id);

package/dist/cjs/node/{plugin/plugins/fileEnv.js → vite/plugins/pluginFileEnv.js}

@@ -3,25 +3,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fileEnv = fileEnv;
+exports.pluginFileEnv = pluginFileEnv;
 const utils_js_1 = require("../utils.js");
-const extractAssetsPlugin_js_1 = require("./extractAssetsPlugin.js");
-const extractExportNamesPlugin_js_1 = require("./extractExportNamesPlugin.js");
+const pluginExtractAssets_js_1 = require("./pluginExtractAssets.js");
+const pluginExtractExportNames_js_1 = require("./pluginExtractExportNames.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const getFilePath_js_1 = require("../shared/getFilePath.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
-const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
-function fileEnv() {
+const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
+function pluginFileEnv() {
     let config;
     let viteDevServer;
     return {
-        name: 'vike:fileEnv',
+        name: 'vike:pluginFileEnv',
         load(id, options) {
             // In build, we use generateBundle() instead of the load() hook. Using load() works for dynamic imports in dev thanks to Vite's lazy transpiling, but it doesn't work in build because Rollup transpiles any dynamically imported module even if it's never actually imported.
             if (!viteDevServer)
                 return;
-            if (!(0, getVikeConfig_js_1.isV1Design)(config))
+            if (!(0, resolveVikeConfigInternal_js_1.isV1Design)())
                 return;
             if (skip(id))
                 return;
@@ -119,7 +119,7 @@ function fileEnv() {
     }
     function skip(id) {
         // TODO/v1-release: remove
-        if (extractAssetsPlugin_js_1.extractAssetsRE.test(id) || extractExportNamesPlugin_js_1.extractExportNamesRE.test(id))
+        if (pluginExtractAssets_js_1.extractAssetsRE.test(id) || pluginExtractExportNames_js_1.extractExportNamesRE.test(id))
             return true;
         if (!id.includes(getSuffix('client')) && !id.includes(getSuffix('server')))
             return true;