vike 0.4.255 → 0.4.256

package/dist/node/prerender/runPrerender.js

@@ -239,17 +239,6 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, globalContext,
         const result = normalizeOnPrerenderHookResult(prerenderResult, hookFilePath, hookName);
         // Handle result
         await Promise.all(result.map(async ({ url, pageContext }) => {
-            // Assert no duplication
-            {
-                const pageContextFound = prerenderContext.pageContexts.find((pageContext) => isSameUrl(pageContext.urlOriginal, url));
-                if (pageContextFound) {
-                    assert(pageContextFound._providedByHook);
-                    const providedTwice = hookFilePath === pageContextFound._providedByHook.hookFilePath
-                        ? `twice by the ${hookName}() hook (${hookFilePath})`
-                        : `twice: by the ${hookName}() hook (${hookFilePath}) as well as by the hook ${pageContextFound._providedByHook.hookFilePath}() (${pageContextFound._providedByHook.hookName})`;
-                    assertUsage(false, `URL ${pc.cyan(url)} provided ${providedTwice}. Make sure to provide the URL only once instead.`);
-                }
-            }
             // Add result
             const providedByHook = { hookFilePath, hookName };
             const pageContextNew = await createPageContextPrerendering(url, prerenderContext, globalContext, false, undefined, providedByHook);
@@ -260,6 +249,23 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, globalContext,
             }
         }));
     })));
+    // Assert no duplicate URLs
+    // If duplicate URL is found an error will be issued
+    const pageContextsByUrl = {};
+    for (const pageContext of prerenderContext.pageContexts) {
+        assert(pageContext._providedByHook);
+        const urlNormalized = normalizeUrl(pageContext.urlOriginal);
+        const pageContextSameUrl = pageContextsByUrl[urlNormalized];
+        if (pageContextSameUrl) {
+            assert(pageContextSameUrl._providedByHook);
+            const { hookName, hookFilePath } = pageContext._providedByHook;
+            const providedTwice = hookFilePath === pageContextSameUrl._providedByHook.hookFilePath
+                ? `twice by the ${hookName}() hook (${hookFilePath})`
+                : `twice: by the ${hookName}() hook (${hookFilePath}) as well as by the hook ${pageContextSameUrl._providedByHook.hookFilePath}() (${pageContextSameUrl._providedByHook.hookName})`;
+            assertUsage(false, `URL ${pc.cyan(urlNormalized)} provided ${providedTwice}. Make sure to provide the URL only once instead.`);
+        }
+        pageContextsByUrl[urlNormalized] = pageContext;
+    }
 }
 function getUrlListFromPagesWithStaticRoute(globalContext, doNotPrerenderList) {
     const urlList = [];

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

@@ -41,6 +41,8 @@ const filterFunction = (id) => extractAssetsRE.test(id);
 function pluginExtractAssets() {
     let config;
     let vikeConfig;
+    if (handleAssetsManifest_isFixEnabled())
+        return [];
     let isFixEnabled;
     return [
         // This plugin removes all JavaScript from server-side only code, so that only CSS imports remains. (And also static files imports e.g. `import logoURL from './logo.svg.js'`).

package/dist/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js

@@ -301,6 +301,10 @@ const configDefinitionsBuiltIn = {
         global: true,
         vite: true,
     },
+    license: {
+        env: { config: true },
+        global: true,
+    },
 };
 function getConfigEnv(pageConfig, configName) {
     const source = getConfigValueSourceRelevantAnyEnv(configName, pageConfig);

package/dist/server/assertEnvServer.js

@@ -20,7 +20,7 @@ function onLoad() {
     addEcosystemStamp();
 }
 // Used by:
-// - Telefunc (to detect the user's stack https://github.com/brillout/telefunc/blob/8288310e88e06a42b710d39c39fb502364ca6d30/telefunc/utils/isVikeApp.ts#L4)
+// - Telefunc (to detect the user's stack https://github.com/telefunc/telefunc/blob/8288310e88e06a42b710d39c39fb502364ca6d30/telefunc/utils/isVikeApp.ts#L4)
 function addEcosystemStamp() {
     const g = globalThis;
     g._isVikeApp =

package/dist/types/Config.d.ts

@@ -540,6 +540,13 @@ type ConfigBuiltIn = {
      * @experimental
      */
     staticReplace?: StaticReplace[];
+    /**
+     * The license key for larger teams.
+     *
+     * https://vike.dev/license
+     * https://vike.dev/pricing
+     */
+    license?: string;
 };
 type PrerenderSetting = boolean | {
     /**

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.255";
+export declare const PROJECT_VERSION: "0.4.256";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.255';
+export const PROJECT_VERSION = '0.4.256';

package/dist/utils/assertKeys.js

@@ -14,9 +14,9 @@ function assertKeys(obj, keysExpected, errPrefix) {
         assertUsage(false, [
             errPrefix,
             `unknown key${keysUnknown.length === 1 ? '' : 's'}`,
-            joinEnglish(keysUnknown, 'and', pc.cyan) + '.',
+            joinEnglish(keysUnknown, 'and', { color: pc.cyan }) + '.',
             'Only following keys are allowed:',
-            joinEnglish(keysExpected, 'and', pc.cyan) + '.',
+            joinEnglish(keysExpected, 'and', { color: pc.cyan }) + '.',
         ].join(' '));
     }
 }

package/dist/utils/assertNodeVersion.js

@@ -8,5 +8,5 @@ function assertNodeVersion() {
     const version = process.versions.node;
     assertVersion('Node.js', version, 
     // https://gist.github.com/brillout/8e0133716e169b981b6c4e8a938b0134
-    ['20.19.0', '22.12.0', '23.0.0']);
+    ['20.19.0', '22.12.0']);
 }

package/dist/utils/assertVersion.js

@@ -6,7 +6,7 @@ import { assertIsNotBrowser } from './assertIsNotBrowser.js';
 import { joinEnglish } from './joinEnglish.js';
 assertIsNotBrowser();
 function assertVersion(dependencyName, versionActual, versionExpectedList) {
-    assertUsage(isVersionMatch(versionActual, versionExpectedList), `${pc.bold(dependencyName)} ${pc.red(pc.bold(versionActual))} isn't supported, use ${pc.bold(dependencyName)} ${joinEnglish([...versionExpectedList, 'above'].map((v) => pc.green(pc.bold(v))), 'or')}.`);
+    assertUsage(isVersionMatch(versionActual, versionExpectedList), `${pc.bold(dependencyName)} ${pc.red(pc.bold(versionActual))} isn't supported, use ${pc.bold(dependencyName)} ${joinEnglish([...versionExpectedList, 'above'].map((v) => pc.green(pc.bold(v))), 'or', { trailingComma: false })}.`);
 }
 function isVersionMatch(versionActual, versionExpectedList) {
     assert(versionActual);

package/dist/utils/joinEnglish.d.ts

@@ -1,2 +1,5 @@
 export { joinEnglish };
-declare function joinEnglish(arr: string[] | readonly string[], conjunction: 'or' | 'and', colorizer?: (s: string) => string): string;
+declare function joinEnglish(arr: string[] | readonly string[], conjunction: 'or' | 'and', { color, trailingComma }?: {
+    color?: (s: string) => string;
+    trailingComma?: boolean;
+}): string;

package/dist/utils/joinEnglish.js

@@ -1,12 +1,12 @@
 export { joinEnglish };
 import { assert } from './assert.js';
 // https://stackoverflow.com/questions/53879088/join-an-array-by-commas-and-and/53879103#53879103
-function joinEnglish(arr, conjunction, colorizer = (s) => s) {
+function joinEnglish(arr, conjunction, { color = (s) => s, trailingComma = true } = {}) {
     assert(arr.length > 0);
     if (arr.length === 1)
-        return colorizer(arr[0]);
+        return color(arr[0]);
     const firsts = arr.slice(0, arr.length - 1);
     const last = arr[arr.length - 1];
-    const lastComma = arr.length > 2 ? ',' : '';
-    return firsts.map(colorizer).join(', ') + `${lastComma} ${conjunction} ` + colorizer(last);
+    const lastComma = trailingComma && arr.length > 2 ? ',' : '';
+    return firsts.map(color).join(', ') + `${lastComma} ${conjunction} ` + color(last);
 }

package/dist/utils/path.js

@@ -21,7 +21,7 @@ function pathJoin(path1, path2) {
         joined = '/' + joined;
     return joined;
 }
-// https://github.com/brillout/telefunc/blob/0fd44322acbd07857ae29361ba7c998607f17dd5/telefunc/utils/path-shim.ts#L17-L21
+// https://github.com/telefunc/telefunc/blob/0fd44322acbd07857ae29361ba7c998607f17dd5/telefunc/utils/path-shim.ts#L17-L21
 const IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
 function pathIsAbsolute(filePath) {
     return IS_ABSOLUTE_RE.test(filePath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.255",
+  "version": "0.4.256",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -129,9 +129,9 @@
     "esbuild": ">=0.19.0",
     "json5": "^2.0.0",
     "magic-string": "^0.30.17",
-    "picomatch": "^4.0.2",
-    "semver": "^7.0.0",
-    "sirv": "^3.0.1",
+    "picomatch": "^4.0.4",
+    "semver": "^7.7.4",
+    "sirv": "^3.0.2",
     "source-map-support": "^0.5.0",
     "tinyglobby": "^0.2.10",
     "vite": ">=6.3.0"
@@ -244,15 +244,15 @@
     "./universal-middleware.js"
   ],
   "devDependencies": {
-    "@brillout/release-me": "^0.4.12",
+    "@brillout/release-me": "^0.4.13",
     "@types/babel__core": "^7.20.5",
     "@types/estree": "^1.0.5",
     "@types/node": "^20.10.5",
-    "@types/picomatch": "^3.0.2",
-    "@types/semver": "^7.5.8",
+    "@types/picomatch": "^4.0.2",
+    "@types/semver": "^7.7.1",
     "@types/source-map-support": "^0.5.10",
-    "react-streaming": "^0.4.15",
-    "rimraf": "^5.0.5",
+    "react-streaming": "^0.4.17",
+    "rimraf": "^6.1.3",
     "typescript": "^5.9.3",
     "vite": "^7.2.6"
   },