vike 0.4.149 → 0.4.150-commit-d0822a3

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

@@ -1,7 +1,7 @@
 export { createDebugger };
 export { isDebugEnabled };
 export type { Debug };
-type Namespace = 'vike:error' | 'vike:extractAssets' | 'vike:extractExportNames' | 'vike:glob' | 'vike:pageFiles' | 'vike:log' | 'vike:routing' | 'vike:virtual-files' | 'vike:stem' | 'vike:stream';
+type Namespace = 'vike:error' | 'vike:extractAssets' | 'vike:extractExportNames' | 'vike:glob' | 'vike:pageFiles' | 'vike:log' | 'vike:routing' | 'vike:virtual-files' | 'vike:stem' | 'vike:stream' | 'vike:outDir';
 type Debug = ReturnType<typeof createDebugger>;
 type Options = {
     serialization?: {
@@ -9,7 +9,7 @@ type Options = {
     };
 };
 declare function createDebugger(namespace: Namespace, optionsGlobal?: Options): ((...msgs: unknown[]) => void) & {
-    options: (options: Options) => (...msgs: unknown[]) => void;
+    options: (optionsLocal: Options) => (...msgs: unknown[]) => void;
     isEnabled: boolean;
 };
 declare function isDebugEnabled(namespace: Namespace): boolean;

package/dist/esm/utils/debug.js

@@ -11,28 +11,42 @@ assert(!isBrowser());
 globalThis.__brillout_debug_createDebugger = createDebugger;
 function createDebugger(namespace, optionsGlobal) {
     checkType(namespace);
-    const debugWithOptions = (options) => {
+    const debugWithOptions = (optionsLocal) => {
         return (...msgs) => {
-            if (!isDebugEnabled(namespace))
-                return;
-            let [msgFirst, ...msgsRest] = msgs;
-            const padding = ' '.repeat(namespace.length + 1);
-            const optionsResolved = { ...optionsGlobal, ...options };
-            msgFirst = formatMsg(msgFirst, optionsResolved, padding, 'FIRST');
-            msgsRest = msgsRest.map((msg, i) => {
-                const position = i === msgsRest.length - 1 ? 'LAST' : 'MIDDLE';
-                return formatMsg(msg, optionsResolved, padding, position);
-            });
-            console.log('\x1b[1m%s\x1b[0m', namespace, msgFirst);
-            msgsRest.forEach((msg) => {
-                console.log(msg);
-            });
+            const options = { ...optionsGlobal, ...optionsLocal };
+            debug_(namespace, options, ...msgs);
         };
     };
     const debug = (...msgs) => debugWithOptions({})(...msgs);
     objectAssign(debug, { options: debugWithOptions, isEnabled: isDebugEnabled(namespace) });
     return debug;
 }
+function debug_(namespace, options, ...msgs) {
+    if (!isDebugEnabled(namespace))
+        return;
+    let [msgFirst, ...msgsRest] = msgs;
+    const padding = ' '.repeat(namespace.length + 1);
+    msgFirst = formatMsg(msgFirst, options, padding, 'FIRST');
+    msgsRest = msgsRest.map((msg, i) => {
+        const position = i === msgsRest.length - 1 ? 'LAST' : 'MIDDLE';
+        return formatMsg(msg, options, padding, position);
+    });
+    let logFirst;
+    let logsRest;
+    const noNewLine = msgsRest.length <= 1 && [msgFirst, ...msgsRest].every((m) => typeof m === 'string' && !m.includes('\n'));
+    if (noNewLine) {
+        logFirst = [msgFirst, ...msgsRest].map((m) => String(m).trim());
+        logsRest = [];
+    }
+    else {
+        logFirst = [msgFirst];
+        logsRest = msgsRest;
+    }
+    console.log('\x1b[1m%s\x1b[0m', namespace, ...logFirst);
+    logsRest.forEach((msg) => {
+        console.log(msg);
+    });
+}
 function isDebugEnabled(namespace) {
     checkType(namespace);
     let DEBUG;

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

@@ -1,5 +1,5 @@
 export declare const debugGlob: ((...msgs: unknown[]) => void) & {
-    options: (options: {
+    options: (optionsLocal: {
         serialization?: {
             emptyArray?: string | undefined;
         } | undefined;

package/dist/esm/utils/getDependencyPackageJson.js

@@ -14,7 +14,7 @@ import path from 'path';
 import fs from 'fs';
 import { assertIsNotProductionRuntime } from './assertIsNotProductionRuntime.js';
 import { createRequire } from 'module';
-// @ts-ignore Shimed by dist-cjs-fixup.js for CJS build.
+// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
 assertIsNotProductionRuntime();

package/dist/esm/utils/getFilePathAbsolute.js

@@ -7,7 +7,7 @@ import { assertIsNotProductionRuntime } from './assertIsNotProductionRuntime.js'
 import { isNpmPackageImport } from './isNpmPackage.js';
 import { assertPathIsFilesystemAbsolute } from './assertPathIsFilesystemAbsolute.js';
 import { createRequire } from 'module';
-// @ts-ignore Shimed by dist-cjs-fixup.js for CJS build.
+// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
 assertIsNotProductionRuntime();

package/dist/esm/utils/getOutDirs.js

@@ -5,7 +5,10 @@ import { assert, assertUsage } from './assert.js';
 import { pathJoin } from './path-shim.js';
 import { assertPosixPath, toPosixPath } from './filesystemPathHandling.js';
 import pc from '@brillout/picocolors';
+import { createDebugger } from './debug.js';
+const debug = createDebugger('vike:outDir');
 function getOutDirs(config) {
+    debug('getOutDirs()', new Error().stack);
     let outDirRoot;
     {
         const outDir = getOutDirFromViteResolvedConfig(config);
@@ -19,11 +22,16 @@ function getOutDirs(config) {
             outDirRoot = outDir.slice(0, -1 * '/client'.length);
         }
     }
-    return getOutDirsAll(outDirRoot, config.root);
+    const outDirs = getOutDirsAll(outDirRoot, config.root);
+    debug('outDirRoot', outDirRoot);
+    debug('outDirs', outDirs);
+    return outDirs;
 }
 /** Appends `client/` or `server/` to `config.build.outDir` */
 function resolveOutDir(config) {
+    debug('resolveOutDir()', new Error().stack);
     const outDir = getOutDirFromViteUserConfig(config) || 'dist';
+    debug('outDir', 'outDir');
     // outDir may already be resolved when using Telefunc + vike (because both Telefunc and vike use this logic)
     if (!isOutDirRoot(outDir)) {
         assertOutDirResolved(outDir, config);
@@ -32,9 +40,11 @@ function resolveOutDir(config) {
     else {
         const { outDirClient, outDirServer } = determineOutDirs(outDir);
         if (viteIsSSR(config)) {
+            debug('outDirServer', 'outDirServer');
             return outDirServer;
         }
         else {
+            debug('outDirClient', 'outDirClient');
             return outDirClient;
         }
     }

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

@@ -0,0 +1,7 @@
+export { injectRollupInputs };
+export { normalizeRollupInput };
+import type { ResolvedConfig, Rollup } from 'vite';
+type InputOption = Rollup.InputOption;
+type InputsMap = Record<string, string>;
+declare function injectRollupInputs(inputsNew: InputsMap, config: ResolvedConfig): InputsMap;
+declare function normalizeRollupInput(input?: InputOption): InputsMap;

package/dist/esm/utils/injectRollupInputs.js

@@ -0,0 +1,26 @@
+export { injectRollupInputs };
+export { normalizeRollupInput };
+import { assert } from './assert.js';
+import { isObject } from './isObject.js';
+function injectRollupInputs(inputsNew, config) {
+    const inputsCurrent = normalizeRollupInput(config.build.rollupOptions.input);
+    const input = {
+        ...inputsNew,
+        ...inputsCurrent
+    };
+    return input;
+}
+function normalizeRollupInput(input) {
+    if (!input) {
+        return {};
+    }
+    // Usually `input` is an oject, but the user can set it as a `string` or `string[]`
+    if (typeof input === 'string') {
+        input = [input];
+    }
+    if (Array.isArray(input)) {
+        return Object.fromEntries(input.map((input) => [input, input]));
+    }
+    assert(isObject(input));
+    return input;
+}

package/dist/esm/utils/isPlainObject.js

@@ -8,7 +8,7 @@ function isPlainObject(value) {
         return true;
     }
     return (
-    /* Doesn't work in Cloudlfare Pages workers
+    /* Doesn't work in Cloudflare Pages workers
     value.constructor === Object
     */
     value.constructor.name === 'Object');

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

@@ -1,13 +1,13 @@
 export { projectInfo };
 export type { ProjectTag };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.149";
+declare const PROJECT_VERSION: "0.4.150-commit-d0822a3";
 type PackageName = typeof projectInfo.npmPackageName;
 type ProjectVersion = typeof projectInfo.projectVersion;
 type ProjectTag = `[${PackageName}]` | `[${PackageName}@${ProjectVersion}]`;
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.149";
+    projectVersion: "0.4.150-commit-d0822a3";
     npmPackageName: "vike";
     githubRepository: "https://github.com/vikejs/vike";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
 import { onProjectInfo } from './assertSingleInstance.js';
-const PROJECT_VERSION = '0.4.149';
+const PROJECT_VERSION = '0.4.150-commit-d0822a3';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION,

package/dist/esm/utils/requireResolve.js

@@ -5,7 +5,7 @@ import { assertIsNotProductionRuntime } from './assertIsNotProductionRuntime.js'
 import { assertPosixPath, toPosixPath } from './filesystemPathHandling.js';
 import { scriptFileExtensionList } from './isScriptFile.js';
 import { createRequire } from 'module';
-// @ts-ignore Shimed by dist-cjs-fixup.js for CJS build.
+// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
 assertIsNotBrowser();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.149",
+  "version": "0.4.150-commit-d0822a3",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
@@ -16,7 +16,7 @@
     "@brillout/json-serializer": "^0.5.8",
     "@brillout/picocolors": "^1.0.10",
     "@brillout/require-shim": "^0.1.2",
-    "@brillout/vite-plugin-import-build": "^0.2.20",
+    "@brillout/vite-plugin-import-build": "0.2.22-commit-7f1bb0a",
     "acorn": "^8.8.2",
     "cac": "^6.7.14",
     "es-module-lexer": "^1.3.0",
@@ -105,6 +105,13 @@
       "require": "./dist/cjs/node/runtime/page-files/setup.js",
       "node": "./dist/esm/node/runtime/page-files/setup.js",
       "types": "./dist/esm/node/runtime/page-files/setup.d.ts"
+    },
+    "./__internal/loadImportBuild": {
+      "worker": "./dist/esm/node/runtime/globalContext/loadImportBuild.js",
+      "edge-light": "./dist/esm/node/runtime/globalContext/loadImportBuild.js",
+      "require": "./dist/cjs/node/runtime/globalContext/loadImportBuild.js",
+      "node": "./dist/esm/node/runtime/globalContext/loadImportBuild.js",
+      "types": "./dist/esm/node/runtime/globalContext/loadImportBuild.d.ts"
     }
   },
   "peerDependencies": {
@@ -162,7 +169,7 @@
     "vike": "./node/cli/bin-entry.js"
   },
   "devDependencies": {
-    "@brillout/release-me": "^0.1.10",
+    "@brillout/release-me": "^0.1.11",
     "@types/estree": "^1.0.0",
     "@types/jest": "^27.4.1",
     "@types/node": "^20.1.0",

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

@@ -1,59 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.manifest = void 0;
-const utils_js_1 = require("../utils.js");
-const assertPluginManifest_js_1 = require("../../shared/assertPluginManifest.js");
-const extractExportNamesPlugin_js_1 = require("./extractExportNamesPlugin.js");
-const getConfigVike_js_1 = require("../../shared/getConfigVike.js");
-const path_1 = __importDefault(require("path"));
-const globalContext_js_1 = require("../../runtime/globalContext.js");
-function manifest() {
-    let configVike;
-    let config;
-    return [
-        {
-            name: 'vike:pluginManifest',
-            apply: 'build',
-            async configResolved(config_) {
-                config = config_;
-                configVike = await (0, getConfigVike_js_1.getConfigVike)(config);
-            },
-            generateBundle() {
-                if ((0, utils_js_1.viteIsSSR)(config))
-                    return;
-                const runtimeManifest = (0, globalContext_js_1.getRuntimeManifest)(configVike);
-                const manifest = {
-                    version: utils_js_1.projectInfo.projectVersion,
-                    usesClientRouter: (0, extractExportNamesPlugin_js_1.isUsingClientRouter)(),
-                    manifestKeyMap: getManifestKeyMap(configVike, config),
-                    ...runtimeManifest
-                };
-                (0, assertPluginManifest_js_1.assertPluginManifest)(manifest);
-                this.emitFile({
-                    fileName: `vike.json`,
-                    type: 'asset',
-                    source: JSON.stringify(manifest, null, 2)
-                });
-            }
-        }
-    ];
-}
-exports.manifest = manifest;
-function getManifestKeyMap(configVike, config) {
-    const manifestKeyMap = {};
-    configVike.extensions
-        .map(({ pageConfigsDistFiles }) => pageConfigsDistFiles)
-        .flat()
-        .filter(utils_js_1.isNotNullish)
-        .forEach(({ importPath, filePath }) => {
-        // Recreating https://github.com/vitejs/vite/blob/8158ece72b66307e7b607b98496891610ca70ea2/packages/vite/src/node/plugins/manifest.ts#L38
-        const filePathRelative = path_1.default.posix.relative(config.root, (0, utils_js_1.toPosixPath)(filePath));
-        (0, utils_js_1.assertPosixPath)(filePathRelative);
-        (0, utils_js_1.assertPosixPath)(importPath);
-        manifestKeyMap[importPath] = filePathRelative;
-    });
-    return manifestKeyMap;
-}

package/dist/cjs/node/runtime/renderPage/executeOnBeforeRenderHook.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeOnBeforeRenderHooks = void 0;
-const getHook_js_1 = require("../../../shared/hooks/getHook.js");
-const preparePageContextForUserConsumptionServerSide_js_1 = require("./preparePageContextForUserConsumptionServerSide.js");
-const utils_js_1 = require("../utils.js");
-const assertOnBeforeRenderHookReturn_js_1 = require("../../../shared/assertOnBeforeRenderHookReturn.js");
-async function executeOnBeforeRenderHooks(pageContext) {
-    if (pageContext._pageContextAlreadyProvidedByOnPrerenderHook) {
-        return;
-    }
-    const hook = (0, getHook_js_1.getHook)(pageContext, 'onBeforeRender');
-    if (!hook) {
-        return;
-    }
-    const onBeforeRender = hook.hookFn;
-    (0, preparePageContextForUserConsumptionServerSide_js_1.preparePageContextForUserConsumptionServerSide)(pageContext);
-    const hookResult = await (0, utils_js_1.executeHook)(() => onBeforeRender(pageContext), hook);
-    (0, assertOnBeforeRenderHookReturn_js_1.assertOnBeforeRenderHookReturn)(hookResult, hook.hookFilePath);
-    const pageContextFromHook = hookResult?.pageContext;
-    Object.assign(pageContext, pageContextFromHook);
-}
-exports.executeOnBeforeRenderHooks = executeOnBeforeRenderHooks;

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

@@ -1,3 +0,0 @@
-export { manifest };
-import { Plugin } from 'vite';
-declare function manifest(): Plugin[];

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

@@ -1,53 +0,0 @@
-export { manifest };
-import { projectInfo, viteIsSSR, toPosixPath, assertPosixPath, isNotNullish } from '../utils.js';
-import { assertPluginManifest } from '../../shared/assertPluginManifest.js';
-import { isUsingClientRouter } from './extractExportNamesPlugin.js';
-import { getConfigVike } from '../../shared/getConfigVike.js';
-import path from 'path';
-import { getRuntimeManifest } from '../../runtime/globalContext.js';
-function manifest() {
-    let configVike;
-    let config;
-    return [
-        {
-            name: 'vike:pluginManifest',
-            apply: 'build',
-            async configResolved(config_) {
-                config = config_;
-                configVike = await getConfigVike(config);
-            },
-            generateBundle() {
-                if (viteIsSSR(config))
-                    return;
-                const runtimeManifest = getRuntimeManifest(configVike);
-                const manifest = {
-                    version: projectInfo.projectVersion,
-                    usesClientRouter: isUsingClientRouter(),
-                    manifestKeyMap: getManifestKeyMap(configVike, config),
-                    ...runtimeManifest
-                };
-                assertPluginManifest(manifest);
-                this.emitFile({
-                    fileName: `vike.json`,
-                    type: 'asset',
-                    source: JSON.stringify(manifest, null, 2)
-                });
-            }
-        }
-    ];
-}
-function getManifestKeyMap(configVike, config) {
-    const manifestKeyMap = {};
-    configVike.extensions
-        .map(({ pageConfigsDistFiles }) => pageConfigsDistFiles)
-        .flat()
-        .filter(isNotNullish)
-        .forEach(({ importPath, filePath }) => {
-        // Recreating https://github.com/vitejs/vite/blob/8158ece72b66307e7b607b98496891610ca70ea2/packages/vite/src/node/plugins/manifest.ts#L38
-        const filePathRelative = path.posix.relative(config.root, toPosixPath(filePath));
-        assertPosixPath(filePathRelative);
-        assertPosixPath(importPath);
-        manifestKeyMap[importPath] = filePathRelative;
-    });
-    return manifestKeyMap;
-}

package/dist/esm/node/runtime/renderPage/executeOnBeforeRenderHook.js

@@ -1,20 +0,0 @@
-export { executeOnBeforeRenderHooks };
-import { getHook } from '../../../shared/hooks/getHook.js';
-import { preparePageContextForUserConsumptionServerSide } from './preparePageContextForUserConsumptionServerSide.js';
-import { executeHook } from '../utils.js';
-import { assertOnBeforeRenderHookReturn } from '../../../shared/assertOnBeforeRenderHookReturn.js';
-async function executeOnBeforeRenderHooks(pageContext) {
-    if (pageContext._pageContextAlreadyProvidedByOnPrerenderHook) {
-        return;
-    }
-    const hook = getHook(pageContext, 'onBeforeRender');
-    if (!hook) {
-        return;
-    }
-    const onBeforeRender = hook.hookFn;
-    preparePageContextForUserConsumptionServerSide(pageContext);
-    const hookResult = await executeHook(() => onBeforeRender(pageContext), hook);
-    assertOnBeforeRenderHookReturn(hookResult, hook.hookFilePath);
-    const pageContextFromHook = hookResult?.pageContext;
-    Object.assign(pageContext, pageContextFromHook);
-}