vike 0.4.189 → 0.4.191-commit-a91fd40

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

@@ -95,6 +95,7 @@ async function triggerFullBuild(config, configVike, bundle) {
         process.exit(1);
     }
     if (configVike.prerender && !configVike.prerender.disableAutoRun) {
+        return;
         await (0, runPrerender_js_1.runPrerenderFromAutoFullBuild)({ viteConfig: configInline });
         forceExit = true;
     }

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

@@ -53,7 +53,8 @@ function distFileNames() {
                         }
                         // Disable CSS bundling to workaround https://github.com/vikejs/vike/issues/1815
                         if (id.endsWith('.css')) {
-                            if ((0, utils_js_1.isFilePathAbsolute)(id)) {
+                            const userRootDir = config.root;
+                            if (id.startsWith(userRootDir)) {
                                 (0, utils_js_1.assertPosixPath)(id);
                                 (0, getFilePath_js_1.assertModuleId)(id);
                                 let name;
@@ -65,10 +66,10 @@ function distFileNames() {
                                     const filePath = (0, getFilePath_js_1.getModuleFilePathAbsolute)(id, config);
                                     name = filePath;
                                     name = name.split('.').slice(0, -1).join('.'); // remove file extension
-                                    name = name.split('/').join('_');
+                                    name = name.split('/').filter(Boolean).join('_');
                                 }
                                 // Make fileHash the same between local development and CI
-                                const idStable = path_1.default.posix.relative(config.root, id);
+                                const idStable = path_1.default.posix.relative(userRootDir, id);
                                 // Don't remove `?` queries because each `id` should belong to a unique bundle.
                                 const hash = getIdHash(idStable);
                                 return `${name}-${hash}`;
@@ -76,13 +77,18 @@ function distFileNames() {
                             else {
                                 let name;
                                 const isVirtualModule = id.match(/virtual:([^:]+):/);
-                                if (!isVirtualModule) {
-                                    name = 'style';
-                                }
-                                else {
+                                if (isVirtualModule) {
                                     name = isVirtualModule[1];
                                     (0, utils_js_1.assert)(name);
                                 }
+                                else if (
+                                // https://github.com/vikejs/vike/issues/1818#issuecomment-2298478321
+                                id.startsWith('/__uno')) {
+                                    name = 'uno';
+                                }
+                                else {
+                                    name = 'style';
+                                }
                                 const hash = getIdHash(id);
                                 return `${name}-${hash}`;
                             }

package/dist/cjs/node/runtime/globalContext.js

@@ -11,6 +11,7 @@ const assertPluginManifest_js_1 = require("../shared/assertPluginManifest.js");
 const getConfigVike_js_1 = require("../shared/getConfigVike.js");
 const assertRuntimeManifest_js_1 = require("../shared/assertRuntimeManifest.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const getPageFilesExports_js_1 = require("./page-files/getPageFilesExports.js");
 let resolveGlobalContext;
 const globalObject = (0, utils_js_1.getGlobalObject)('globalContext.ts', {
     globalContextPromise: new Promise((r) => (resolveGlobalContext = r))
@@ -63,6 +64,7 @@ function setGlobalContext_viteDevServer(viteDevServer) {
     (0, utils_js_1.assert)(!globalObject.globalContext);
     globalObject.viteConfig = viteDevServer.config;
     globalObject.viteDevServer = viteDevServer;
+    eagerlyLoadUserFiles();
 }
 exports.setGlobalContext_viteDevServer = setGlobalContext_viteDevServer;
 function setGlobalContext_isDev(isDev) {
@@ -186,3 +188,8 @@ function assertViteManifest(manifest) {
       })
     */
 }
+function eagerlyLoadUserFiles() {
+    // Other than here, the getPageFilesExports() function is only called only upon calling the renderPage() function.
+    // We call it as early as possible here for better performance.
+    (0, getPageFilesExports_js_1.getPageFilesExports)();
+}

package/dist/cjs/node/runtime/page-files/getPageFilesExports.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPageFilesExports = void 0;
+const utils_js_1 = require("../utils.js");
+const globalContext_js_1 = require("../globalContext.js");
+const virtualFileImportUserCode_js_1 = require("../../shared/virtual-files/virtualFileImportUserCode.js");
+async function getPageFilesExports() {
+    const viteDevServer = (0, globalContext_js_1.getViteDevServer)();
+    (0, utils_js_1.assert)(viteDevServer);
+    let moduleExports;
+    try {
+        moduleExports = await viteDevServer.ssrLoadModule(virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeServer);
+    }
+    catch (err) {
+        (0, utils_js_1.debugGlob)(`Glob error: ${virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeServer} transpile error: `, err);
+        throw err;
+    }
+    moduleExports = moduleExports.default || moduleExports;
+    (0, utils_js_1.debugGlob)('Glob result: ', moduleExports);
+    (0, utils_js_1.assert)((0, utils_js_1.isObject)(moduleExports));
+    return moduleExports;
+}
+exports.getPageFilesExports = getPageFilesExports;

package/dist/cjs/node/runtime/page-files/setup.js

@@ -1,23 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const getPageFiles_js_1 = require("../../../shared/getPageFiles.js");
-const utils_js_1 = require("../utils.js");
-const globalContext_js_1 = require("../globalContext.js");
-const virtualFileImportUserCode_js_1 = require("../../shared/virtual-files/virtualFileImportUserCode.js");
-(0, getPageFiles_js_1.setPageFilesAsync)(getPageFilesExports);
-async function getPageFilesExports() {
-    const viteDevServer = (0, globalContext_js_1.getViteDevServer)();
-    (0, utils_js_1.assert)(viteDevServer);
-    let moduleExports;
-    try {
-        moduleExports = await viteDevServer.ssrLoadModule(virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeServer);
-    }
-    catch (err) {
-        (0, utils_js_1.debugGlob)(`Glob error: ${virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeServer} transpile error: `, err);
-        throw err;
-    }
-    moduleExports = moduleExports.default || moduleExports;
-    (0, utils_js_1.debugGlob)('Glob result: ', moduleExports);
-    (0, utils_js_1.assert)((0, utils_js_1.isObject)(moduleExports));
-    return moduleExports;
-}
+const getPageFilesExports_js_1 = require("./getPageFilesExports.js");
+(0, getPageFiles_js_1.setPageFilesAsync)(getPageFilesExports_js_1.getPageFilesExports);

package/dist/cjs/shared/getPageContext.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPageContext = void 0;
+exports.providePageContext = exports.getPageContext = void 0;
 var executeHook_js_1 = require("./hooks/executeHook.js");
 Object.defineProperty(exports, "getPageContext", { enumerable: true, get: function () { return executeHook_js_1.getPageContext; } });
+Object.defineProperty(exports, "providePageContext", { enumerable: true, get: function () { return executeHook_js_1.providePageContext; } });

package/dist/cjs/shared/hooks/executeHook.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isUserHookError = exports.getPageContext = exports.executeHook = void 0;
+exports.isUserHookError = exports.providePageContext = exports.getPageContext = exports.executeHook = void 0;
 const assert_js_1 = require("../../utils/assert.js");
 const getGlobalObject_js_1 = require("../../utils/getGlobalObject.js");
 const humanizeTime_js_1 = require("../../utils/humanizeTime.js");
@@ -72,6 +72,11 @@ function getPageContext() {
     return globalObject.pageContext;
 }
 exports.getPageContext = getPageContext;
+/**
+ * Provide `pageContext` for universal hooks.
+ *
+ * https://vike.dev/getPageContext
+ */
 function providePageContext(pageContext) {
     globalObject.pageContext = pageContext;
     // Promise.resolve() is quicker than process.nextTick() and setImmediate()
@@ -80,3 +85,4 @@ function providePageContext(pageContext) {
         globalObject.pageContext = null;
     });
 }
+exports.providePageContext = providePageContext;

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.189';
+exports.PROJECT_VERSION = '0.4.191-commit-a91fd40';

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

@@ -89,6 +89,7 @@ async function triggerFullBuild(config, configVike, bundle) {
         process.exit(1);
     }
     if (configVike.prerender && !configVike.prerender.disableAutoRun) {
+        return;
         await runPrerenderFromAutoFullBuild({ viteConfig: configInline });
         forceExit = true;
     }

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

@@ -2,7 +2,7 @@ export { distFileNames };
 // Attempt to preserve file structure of `.page.js` files:
 //  - https://github.com/vikejs/vike/commit/11a4c49e5403aa7c37c8020c462b499425b41854
 //  - Blocker: https://github.com/rollup/rollup/issues/4724
-import { assertPosixPath, assert, assertUsage, isArray, isCallable, isFilePathAbsolute } from '../utils.js';
+import { assertPosixPath, assert, assertUsage, isArray, isCallable } from '../utils.js';
 import path from 'path';
 import crypto from 'crypto';
 import { getAssetsDir } from '../shared/getAssetsDir.js';
@@ -48,7 +48,8 @@ function distFileNames() {
                         }
                         // Disable CSS bundling to workaround https://github.com/vikejs/vike/issues/1815
                         if (id.endsWith('.css')) {
-                            if (isFilePathAbsolute(id)) {
+                            const userRootDir = config.root;
+                            if (id.startsWith(userRootDir)) {
                                 assertPosixPath(id);
                                 assertModuleId(id);
                                 let name;
@@ -60,10 +61,10 @@ function distFileNames() {
                                     const filePath = getModuleFilePathAbsolute(id, config);
                                     name = filePath;
                                     name = name.split('.').slice(0, -1).join('.'); // remove file extension
-                                    name = name.split('/').join('_');
+                                    name = name.split('/').filter(Boolean).join('_');
                                 }
                                 // Make fileHash the same between local development and CI
-                                const idStable = path.posix.relative(config.root, id);
+                                const idStable = path.posix.relative(userRootDir, id);
                                 // Don't remove `?` queries because each `id` should belong to a unique bundle.
                                 const hash = getIdHash(idStable);
                                 return `${name}-${hash}`;
@@ -71,13 +72,18 @@ function distFileNames() {
                             else {
                                 let name;
                                 const isVirtualModule = id.match(/virtual:([^:]+):/);
-                                if (!isVirtualModule) {
-                                    name = 'style';
-                                }
-                                else {
+                                if (isVirtualModule) {
                                     name = isVirtualModule[1];
                                     assert(name);
                                 }
+                                else if (
+                                // https://github.com/vikejs/vike/issues/1818#issuecomment-2298478321
+                                id.startsWith('/__uno')) {
+                                    name = 'uno';
+                                }
+                                else {
+                                    name = 'style';
+                                }
                                 const hash = getIdHash(id);
                                 return `${name}-${hash}`;
                             }

package/dist/esm/node/runtime/globalContext.js

@@ -17,6 +17,7 @@ import { assertPluginManifest } from '../shared/assertPluginManifest.js';
 import { getConfigVike } from '../shared/getConfigVike.js';
 import { assertRuntimeManifest } from '../shared/assertRuntimeManifest.js';
 import pc from '@brillout/picocolors';
+import { getPageFilesExports } from './page-files/getPageFilesExports.js';
 let resolveGlobalContext;
 const globalObject = getGlobalObject('globalContext.ts', {
     globalContextPromise: new Promise((r) => (resolveGlobalContext = r))
@@ -66,6 +67,7 @@ function setGlobalContext_viteDevServer(viteDevServer) {
     assert(!globalObject.globalContext);
     globalObject.viteConfig = viteDevServer.config;
     globalObject.viteDevServer = viteDevServer;
+    eagerlyLoadUserFiles();
 }
 function setGlobalContext_isDev(isDev) {
     globalObject.isDev = isDev;
@@ -182,3 +184,8 @@ function assertViteManifest(manifest) {
       })
     */
 }
+function eagerlyLoadUserFiles() {
+    // Other than here, the getPageFilesExports() function is only called only upon calling the renderPage() function.
+    // We call it as early as possible here for better performance.
+    getPageFilesExports();
+}

package/dist/esm/node/runtime/page-files/getPageFilesExports.d.ts

@@ -0,0 +1,2 @@
+export { getPageFilesExports };
+declare function getPageFilesExports(): Promise<Record<string, unknown>>;

package/dist/esm/node/runtime/page-files/getPageFilesExports.js

@@ -0,0 +1,20 @@
+export { getPageFilesExports };
+import { assert, debugGlob, isObject } from '../utils.js';
+import { getViteDevServer } from '../globalContext.js';
+import { virtualFileIdImportUserCodeServer } from '../../shared/virtual-files/virtualFileImportUserCode.js';
+async function getPageFilesExports() {
+    const viteDevServer = getViteDevServer();
+    assert(viteDevServer);
+    let moduleExports;
+    try {
+        moduleExports = await viteDevServer.ssrLoadModule(virtualFileIdImportUserCodeServer);
+    }
+    catch (err) {
+        debugGlob(`Glob error: ${virtualFileIdImportUserCodeServer} transpile error: `, err);
+        throw err;
+    }
+    moduleExports = moduleExports.default || moduleExports;
+    debugGlob('Glob result: ', moduleExports);
+    assert(isObject(moduleExports));
+    return moduleExports;
+}

package/dist/esm/node/runtime/page-files/setup.js

@@ -1,21 +1,3 @@
 import { setPageFilesAsync } from '../../../shared/getPageFiles.js';
-import { assert, debugGlob, isObject } from '../utils.js';
-import { getViteDevServer } from '../globalContext.js';
-import { virtualFileIdImportUserCodeServer } from '../../shared/virtual-files/virtualFileImportUserCode.js';
+import { getPageFilesExports } from './getPageFilesExports.js';
 setPageFilesAsync(getPageFilesExports);
-async function getPageFilesExports() {
-    const viteDevServer = getViteDevServer();
-    assert(viteDevServer);
-    let moduleExports;
-    try {
-        moduleExports = await viteDevServer.ssrLoadModule(virtualFileIdImportUserCodeServer);
-    }
-    catch (err) {
-        debugGlob(`Glob error: ${virtualFileIdImportUserCodeServer} transpile error: `, err);
-        throw err;
-    }
-    moduleExports = moduleExports.default || moduleExports;
-    debugGlob('Glob result: ', moduleExports);
-    assert(isObject(moduleExports));
-    return moduleExports;
-}

package/dist/esm/shared/getPageContext.d.ts

@@ -1 +1 @@
-export { getPageContext } from './hooks/executeHook.js';
+export { getPageContext, providePageContext } from './hooks/executeHook.js';

package/dist/esm/shared/getPageContext.js

@@ -1 +1 @@
-export { getPageContext } from './hooks/executeHook.js';
+export { getPageContext, providePageContext } from './hooks/executeHook.js';

package/dist/esm/shared/hooks/executeHook.d.ts

@@ -1,9 +1,10 @@
 export { executeHook };
 export { getPageContext };
+export { providePageContext };
 export { isUserHookError };
 import type { PageContextClient, PageContextServer } from '../types.js';
 import type { Hook, HookLoc } from './getHook.js';
-type PageContextUnknown = null | Record<string, unknown>;
+type PageContextUnknown = null | Record<string, any>;
 declare function isUserHookError(err: unknown): false | HookLoc;
 declare function executeHook<T = unknown>(hookFnCaller: () => T, hook: Omit<Hook, 'hookFn'>, pageContext: PageContextUnknown): Promise<T>;
 /**
@@ -12,3 +13,9 @@ declare function executeHook<T = unknown>(hookFnCaller: () => T, hook: Omit<Hook
  * https://vike.dev/getPageContext
  */
 declare function getPageContext<PageContext = PageContextClient | PageContextServer>(): null | PageContext;
+/**
+ * Provide `pageContext` for universal hooks.
+ *
+ * https://vike.dev/getPageContext
+ */
+declare function providePageContext(pageContext: PageContextUnknown): void;

package/dist/esm/shared/hooks/executeHook.js

@@ -1,5 +1,6 @@
 export { executeHook };
 export { getPageContext };
+export { providePageContext };
 export { isUserHookError };
 import { getProjectError, assertWarning } from '../../utils/assert.js';
 import { getGlobalObject } from '../../utils/getGlobalObject.js';
@@ -69,6 +70,11 @@ function isNotDisabled(timeout) {
 function getPageContext() {
     return globalObject.pageContext;
 }
+/**
+ * Provide `pageContext` for universal hooks.
+ *
+ * https://vike.dev/getPageContext
+ */
 function providePageContext(pageContext) {
     globalObject.pageContext = pageContext;
     // Promise.resolve() is quicker than process.nextTick() and setImmediate()

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.189";
+export declare const PROJECT_VERSION: "0.4.191-commit-a91fd40";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.189';
+export const PROJECT_VERSION = '0.4.191-commit-a91fd40';

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.189";
+    projectVersion: "0.4.191-commit-a91fd40";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.189",
+  "version": "0.4.191-commit-a91fd40",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",