vike 0.4.218-commit-ed9b3d4 → 0.4.218-commit-85af52a

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

@@ -53,7 +53,7 @@ function plugin(vikeVitePluginOptions = {}) {
         (0, suppressRollupWarning_js_1.suppressRollupWarning)(),
         ...(0, setGlobalContext_js_1.setGlobalContext)(),
         ...(0, index_js_3.buildEntry)(),
-        (0, baseUrls_js_1.baseUrls)(vikeVitePluginOptions),
+        (0, baseUrls_js_1.baseUrls)(),
         (0, envVars_js_1.envVarsPlugin)(),
         (0, fileEnv_js_1.fileEnv)(),
         (0, workaroundCssModuleHmr_js_1.workaroundCssModuleHmr)(),

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

@@ -4,22 +4,16 @@ exports.baseUrls = baseUrls;
 const resolveBase_js_1 = require("../../shared/resolveBase.js");
 const utils_js_1 = require("../utils.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
-const prepareViteApiCall_js_1 = require("../../api/prepareViteApiCall.js");
-function baseUrls(vikeVitePluginOptions) {
+function baseUrls() {
     let basesResolved;
-    let root;
     return {
         name: 'vike:baseUrls',
         enforce: 'post',
-        async config(config, env) {
+        async config(config) {
             const isDev = config._isDev;
             (0, utils_js_1.assert)(typeof isDev === 'boolean');
-            const operation = env.command === 'build' ? 'build' : env.isPreview ? 'preview' : 'dev';
-            root = config.root ? (0, prepareViteApiCall_js_1.normalizeViteRoot)(config.root) : await (0, prepareViteApiCall_js_1.getViteRoot)(operation);
-            (0, utils_js_1.assert)(root);
             const baseViteOriginal = config.base ?? '/__UNSET__'; // '/__UNSET__' because Vite resolves `_baseViteOriginal: null` to `undefined`
-            const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig2)(root, isDev, vikeVitePluginOptions);
-            basesResolved = (0, resolveBase_js_1.resolveBase)(baseViteOriginal, vikeConfig.vikeConfigGlobal.baseServer, vikeConfig.vikeConfigGlobal.baseAssets);
+            basesResolved = (0, resolveBase_js_1.resolveBase)(baseViteOriginal, config.vikeTmp.vikeConfigGlobal.baseServer, config.vikeTmp.vikeConfigGlobal.baseAssets);
             // We cannot define these in configResolved() because Vite picks up the env variables before any configResolved() hook is called
             process.env.BASE_SERVER = basesResolved.baseServer;
             process.env.BASE_ASSETS = basesResolved.baseAssets;
@@ -34,7 +28,6 @@ function baseUrls(vikeVitePluginOptions) {
             };
         },
         async configResolved(config) {
-            (0, prepareViteApiCall_js_1.assertViteRoot)(root, config);
             const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
             const basesResolved2 = (0, resolveBase_js_1.resolveBaseFromResolvedConfig)(vikeConfig.vikeConfigGlobal.baseServer, vikeConfig.vikeConfigGlobal.baseAssets, config);
             (0, utils_js_1.assert)(basesResolved2.baseServer === basesResolved.baseServer);

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

@@ -14,6 +14,8 @@ const assertResolveAlias_js_1 = require("./commonConfig/assertResolveAlias.js");
 const getEnvVarObject_js_1 = require("../shared/getEnvVarObject.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 prepareViteApiCall_js_1 = require("../../api/prepareViteApiCall.js");
 const pluginName = 'vike:commonConfig';
 function commonConfig(vikeVitePluginOptions) {
     return [
@@ -22,10 +24,18 @@ function commonConfig(vikeVitePluginOptions) {
             enforce: 'pre',
             config: {
                 order: 'pre',
-                handler(_config, env) {
+                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);
                     return {
-                        _isDev: (0, utils_js_1.isDevCheck)(env),
-                        _vikeVitePluginOptions: vikeVitePluginOptions
+                        _isDev: isDev,
+                        _root: root,
+                        _vikeVitePluginOptions: vikeVitePluginOptions,
+                        vike: vikeConfig.vikeConfigNew,
+                        vikeTmp: vikeConfig
                     };
                 }
             }
@@ -33,6 +43,7 @@ function commonConfig(vikeVitePluginOptions) {
         {
             name: pluginName,
             configResolved(config) {
+                (0, prepareViteApiCall_js_1.assertViteRoot)(config._root, config);
                 assertSingleInstance(config);
                 (0, require_shim_1.installRequireShim_setUserRootDir)(config.root);
             }

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.218-commit-ed9b3d4';
+exports.PROJECT_VERSION = '0.4.218-commit-85af52a';

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

@@ -47,7 +47,7 @@ function plugin(vikeVitePluginOptions = {}) {
         suppressRollupWarning(),
         ...setGlobalContext(),
         ...buildEntry(),
-        baseUrls(vikeVitePluginOptions),
+        baseUrls(),
         envVarsPlugin(),
         fileEnv(),
         workaroundCssModuleHmr(),

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

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

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

@@ -1,23 +1,17 @@
 export { baseUrls };
 import { resolveBase, resolveBaseFromResolvedConfig } from '../../shared/resolveBase.js';
 import { assert } from '../utils.js';
-import { getVikeConfig, getVikeConfig2 } from './importUserCode/v1-design/getVikeConfig.js';
-import { assertViteRoot, getViteRoot, normalizeViteRoot } from '../../api/prepareViteApiCall.js';
-function baseUrls(vikeVitePluginOptions) {
+import { getVikeConfig } from './importUserCode/v1-design/getVikeConfig.js';
+function baseUrls() {
     let basesResolved;
-    let root;
     return {
         name: 'vike:baseUrls',
         enforce: 'post',
-        async config(config, env) {
+        async config(config) {
             const isDev = config._isDev;
             assert(typeof isDev === 'boolean');
-            const operation = env.command === 'build' ? 'build' : env.isPreview ? 'preview' : 'dev';
-            root = config.root ? normalizeViteRoot(config.root) : await getViteRoot(operation);
-            assert(root);
             const baseViteOriginal = config.base ?? '/__UNSET__'; // '/__UNSET__' because Vite resolves `_baseViteOriginal: null` to `undefined`
-            const vikeConfig = await getVikeConfig2(root, isDev, vikeVitePluginOptions);
-            basesResolved = resolveBase(baseViteOriginal, vikeConfig.vikeConfigGlobal.baseServer, vikeConfig.vikeConfigGlobal.baseAssets);
+            basesResolved = resolveBase(baseViteOriginal, config.vikeTmp.vikeConfigGlobal.baseServer, config.vikeTmp.vikeConfigGlobal.baseAssets);
             // We cannot define these in configResolved() because Vite picks up the env variables before any configResolved() hook is called
             process.env.BASE_SERVER = basesResolved.baseServer;
             process.env.BASE_ASSETS = basesResolved.baseAssets;
@@ -32,7 +26,6 @@ function baseUrls(vikeVitePluginOptions) {
             };
         },
         async configResolved(config) {
-            assertViteRoot(root, config);
             const vikeConfig = await getVikeConfig(config);
             const basesResolved2 = resolveBaseFromResolvedConfig(vikeConfig.vikeConfigGlobal.baseServer, vikeConfig.vikeConfigGlobal.baseAssets, config);
             assert(basesResolved2.baseServer === basesResolved.baseServer);

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

@@ -1,9 +1,14 @@
 export { commonConfig };
 import { type Plugin } from 'vite';
+import { type VikeConfigObject, type VikeConfigNew } from './importUserCode/v1-design/getVikeConfig.js';
 declare module 'vite' {
     interface UserConfig {
         _isDev?: boolean;
         _vikeVitePluginOptions?: unknown;
+        _root?: string;
+        vike?: VikeConfigNew;
+        /** @deprecated */
+        vikeTmp?: VikeConfigObject;
     }
 }
 declare function commonConfig(vikeVitePluginOptions: unknown): Plugin[];

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

@@ -9,6 +9,8 @@ import { assertResolveAlias } from './commonConfig/assertResolveAlias.js';
 import { getEnvVarObject } from '../shared/getEnvVarObject.js';
 import { isViteCliCall } from '../shared/isViteCliCall.js';
 import { isVikeCliOrApi } from '../../api/context.js';
+import { getVikeConfig2 } from './importUserCode/v1-design/getVikeConfig.js';
+import { assertViteRoot, getViteRoot, normalizeViteRoot } from '../../api/prepareViteApiCall.js';
 const pluginName = 'vike:commonConfig';
 function commonConfig(vikeVitePluginOptions) {
     return [
@@ -17,10 +19,18 @@ function commonConfig(vikeVitePluginOptions) {
             enforce: 'pre',
             config: {
                 order: 'pre',
-                handler(_config, env) {
+                async handler(configFromUser, env) {
+                    const isDev = isDevCheck(env);
+                    const operation = env.command === 'build' ? 'build' : env.isPreview ? 'preview' : 'dev';
+                    const root = configFromUser.root ? normalizeViteRoot(configFromUser.root) : await getViteRoot(operation);
+                    assert(root);
+                    const vikeConfig = await getVikeConfig2(root, isDev, vikeVitePluginOptions);
                     return {
-                        _isDev: isDevCheck(env),
-                        _vikeVitePluginOptions: vikeVitePluginOptions
+                        _isDev: isDev,
+                        _root: root,
+                        _vikeVitePluginOptions: vikeVitePluginOptions,
+                        vike: vikeConfig.vikeConfigNew,
+                        vikeTmp: vikeConfig
                     };
                 }
             }
@@ -28,6 +38,7 @@ function commonConfig(vikeVitePluginOptions) {
         {
             name: pluginName,
             configResolved(config) {
+                assertViteRoot(config._root, config);
                 assertSingleInstance(config);
                 installRequireShim_setUserRootDir(config.root);
             }

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

@@ -9,6 +9,7 @@ export type { VikeConfigObject };
 export type { InterfaceValueFile };
 export type { InterfaceFile };
 export type { VikeConfigGlobal };
+export type { VikeConfigNew };
 export type { VikeVitePluginOptions };
 import type { PageConfigGlobalBuildTime, PageConfigBuildTime } from '../../../../../shared/page-configs/PageConfig.js';
 import { type LocationId } from './getVikeConfig/filesystemRouting.js';
@@ -35,13 +36,14 @@ type InterfaceValueFile = InterfaceFileCommons & {
     configName: string;
 };
 type ConfigName = string;
+type VikeConfigNew = {
+    global: ReturnType<typeof getPageConfigUserFriendlyNew>;
+};
 type VikeConfigObject = {
     pageConfigs: PageConfigBuildTime[];
     pageConfigGlobal: PageConfigGlobalBuildTime;
     vikeConfigGlobal: VikeConfigGlobal;
-    vikeConfigNew: {
-        global: ReturnType<typeof getPageConfigUserFriendlyNew>;
-    };
+    vikeConfigNew: VikeConfigNew;
 };
 declare const vikeConfigDependencies: Set<string>;
 declare function reloadVikeConfig(config: ResolvedConfig): void;

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.218-commit-ed9b3d4";
+export declare const PROJECT_VERSION: "0.4.218-commit-85af52a";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.218-commit-ed9b3d4';
+export const PROJECT_VERSION = '0.4.218-commit-85af52a';

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.218-commit-ed9b3d4";
+    projectVersion: "0.4.218-commit-85af52a";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.218-commit-ed9b3d4",
+  "version": "0.4.218-commit-85af52a",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {