vike 0.4.247-commit-e331796 → 0.4.247-commit-87e5f2f

package/dist/node/api/dev.d.ts

@@ -1,4 +1,5 @@
 export { dev };
+export { startupLog };
 import { type ResolvedConfig, type ViteDevServer } from 'vite';
 import type { ApiOptions } from './types.js';
 /**
@@ -13,3 +14,8 @@ declare function dev(options?: ApiOptions & {
     viteConfig: ResolvedConfig;
     viteVersion: string;
 }>;
+declare function startupLog(resolvedUrls: ResolvedServerUrls, viteServer: ViteDevServer): Promise<void>;
+interface ResolvedServerUrls {
+    local: string[];
+    network: string[];
+}

package/dist/node/api/dev.js

@@ -1,8 +1,9 @@
 export { dev };
+// TO-DO/eventually: remove if it doesn't end up being used
+export { startupLog };
 import { prepareViteApiCall } from './prepareViteApiCall.js';
-import { createServer, version as viteVersionVike } from 'vite';
-import { viteVersionUser } from '../vite/plugins/pluginCommon.js';
-import { colorVike, colorVite, PROJECT_VERSION } from './utils.js';
+import { createServer } from 'vite';
+import { assert, colorVike, colorVite, PROJECT_VERSION } from './utils.js';
 import pc from '@brillout/picocolors';
 import { processStartupLog } from '../vite/shared/loggerVite.js';
 /**
@@ -11,23 +12,35 @@ import { processStartupLog } from '../vite/shared/loggerVite.js';
  * https://vike.dev/api#dev
  */
 async function dev(options = {}) {
-    const startTime = performance.now();
     const { viteConfigFromUserResolved } = await prepareViteApiCall(options, 'dev');
     const server = await createServer(viteConfigFromUserResolved);
-    const viteVersion = viteVersionUser ?? viteVersionVike;
     const viteServer = server;
     const viteConfig = server.config;
+    const viteVersion = viteConfig._viteVersionResolved;
+    assert(viteVersion);
     if (viteServer.httpServer)
         await viteServer.listen();
-    if (options.startupLog)
-        printStartupLog(viteServer, viteConfig, viteVersion, startTime);
+    if (options.startupLog) {
+        if (viteServer.resolvedUrls) {
+            startupLog(viteServer.resolvedUrls, viteServer);
+        }
+        else {
+            // TO-DO/eventually: remove if it doesn't end up being used
+            ;
+            viteConfig.server.startupLog = (resolvedUrls) => startupLog(resolvedUrls, viteServer);
+        }
+    }
     return {
         viteServer,
         viteConfig,
         viteVersion,
     };
 }
-async function printStartupLog(viteServer, viteConfig, viteVersion, startTime) {
+const startTime = performance.now();
+async function startupLog(resolvedUrls, viteServer) {
+    const viteConfig = viteServer.config;
+    const viteVersion = viteConfig._viteVersionResolved;
+    assert(viteVersion);
     const startupDurationString = pc.dim(`ready in ${pc.reset(pc.bold(String(Math.ceil(performance.now() - startTime))))} ms`);
     const sep = pc.dim('·');
     const firstLine = `\n  ${colorVike('Vike')} ${pc.yellow(`v${PROJECT_VERSION}`)} ${sep} ${colorVite('Vite')} ${pc.cyan(`v${viteVersion}`)} ${sep} ${startupDurationString}\n`;
@@ -36,7 +49,7 @@ async function printStartupLog(viteServer, viteConfig, viteVersion, startTime) {
     const { isCompact } = ret;
     // We don't call viteServer.printUrls() because Vite throws an error if `resolvedUrls` is missing:
     // https://github.com/vitejs/vite/blob/df5a30d2690a2ebc4824a79becdcef30538dc602/packages/vite/src/node/server/index.ts#L745
-    printServerUrls(viteServer.resolvedUrls || { local: ['http://localhost:3000'], network: [] }, viteConfig.server.host);
+    printServerUrls(resolvedUrls, viteConfig.server.host);
     viteServer.bindCLIShortcuts({ print: true });
     if (!isCompact)
         console.log();

package/dist/node/vite/plugins/build/pluginModuleBanner.js

@@ -1,8 +1,12 @@
 export { pluginModuleBanner };
 import { assert, removeVirtualFileIdPrefix } from '../../utils.js';
 import { getMagicString } from '../../shared/getMagicString.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).
+// Misusing legal comments so that esbuild doesn't remove them.
+// - Legal comments: https://esbuild.github.io/api/#legal-comments
+// - Terser removes legal comments, but I guess users use terser to minify JavaScript so I guess it's a good thing that comment is removed.
+// - 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).
+// - Potential alternative: https://github.com/vitejs/vite/issues/21228#issuecomment-3627899741
 function pluginModuleBanner() {
     let config;
     let isEnabled = false;
@@ -39,9 +43,6 @@ function pluginModuleBanner() {
                         id = id.slice(config.root.length + 1);
                     id = id.replaceAll('*/', '*\\/'); // https://github.com/vikejs/vike/issues/2377
                     const { magicString, getMagicStringResult } = getMagicString(code, id);
-                    // Use legal comment so that esbuild doesn't remove it.
-                    // - Terser still removes the comment, but I guess users use terser to minify JavaScript so I guess it's a good thing that comment is removed.
-                    // - https://esbuild.github.io/api/#legal-comments
                     magicString.prepend(`/*! ${id} [vike:pluginModuleBanner] */\n`);
                     return getMagicStringResult();
                 },

package/dist/node/vite/plugins/pluginCommon.d.ts

@@ -1,5 +1,4 @@
 export { pluginCommon };
-export declare let viteVersionUser: string | null | undefined;
 import { type InlineConfig, type Plugin } from 'vite';
 import type { VitePluginServerEntryOptions } from '@brillout/vite-plugin-server-entry/plugin';
 declare module 'vite' {
@@ -9,6 +8,7 @@ declare module 'vite' {
         _rootResolvedEarly?: string;
         _baseViteOriginal?: string;
         _viteConfigFromUserResolved?: InlineConfig;
+        _viteVersionResolved?: string;
     }
 }
 declare global {

package/dist/node/vite/plugins/pluginCommon.js

@@ -1,5 +1,4 @@
 export { pluginCommon };
-export let viteVersionUser = null;
 import { assert, assertUsage, assertWarning, hasProp, isDevCheck, isDocker, isExactlyOneTruthy, isObject, isVitest, } from '../utils.js';
 import { assertRollupInput } from './build/pluginBuildConfig.js';
 import { installRequireShim_setUserRootDir } from '@brillout/require-shim';
@@ -10,6 +9,7 @@ import { isVikeCliOrApi } from '../../../shared-server-node/api-context.js';
 import { getVikeConfigInternal, setVikeConfigContext } from '../shared/resolveVikeConfigInternal.js';
 import { assertViteRoot, getViteRoot, normalizeViteRoot } from '../../api/resolveViteConfigFromUser.js';
 import { temp_disablePrerenderAutoRun } from '../../prerender/context.js';
+import { version as viteVersionVike } from 'vite';
 const pluginName = 'vike:pluginCommon';
 globalThis.__VIKE__IS_PROCESS_SHARED_WITH_VITE = true;
 function pluginCommon(vikeVitePluginOptions) {
@@ -20,7 +20,7 @@ function pluginCommon(vikeVitePluginOptions) {
             config: {
                 order: 'pre',
                 async handler(configFromUser, env) {
-                    viteVersionUser = this?.meta?.viteVersion; // is `undefined` on old Vite versions
+                    const viteVersionUser = this?.meta?.viteVersion; // is `undefined` on old Vite versions
                     const isDev = isDevCheck(env);
                     const isBuild = env.command === 'build';
                     const isPreview = env.isPreview;
@@ -34,6 +34,7 @@ function pluginCommon(vikeVitePluginOptions) {
                     const vikeConfig = await getVikeConfigInternal();
                     return {
                         _isDev: isDev,
+                        _viteVersionResolved: viteVersionUser || viteVersionVike,
                         _rootResolvedEarly: rootResolvedEarly,
                         // TO-DO/next-major-release: remove https://github.com/vikejs/vike/issues/2122
                         configVikePromise: Promise.resolve({

package/dist/server/__internal/vite.d.ts

@@ -0,0 +1 @@
+export { startupLog } from '../../node/api/dev.js';

package/dist/server/__internal/vite.js

@@ -0,0 +1 @@
+export { startupLog } from '../../node/api/dev.js';

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.247-commit-e331796";
+export declare const PROJECT_VERSION: "0.4.247-commit-87e5f2f";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.247-commit-e331796';
+export const PROJECT_VERSION = '0.4.247-commit-87e5f2f';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.247-commit-e331796",
+  "version": "0.4.247-commit-87e5f2f",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -104,6 +104,10 @@
       "types": "./dist/server/runtime/page-files/setup.d.ts",
       "default": "./dist/server/runtime/page-files/setup.js"
     },
+    "./__internal/vite": {
+      "types": "./dist/server/__internal/vite.d.ts",
+      "default": "./dist/server/__internal/vite.js"
+    },
     ".": {
       "worker": "./dist/server/runtime/index.js",
       "workerd": "./dist/server/runtime/index.js",