vike 0.4.162 → 0.4.163-commit-2305d5b

package/dist/esm/node/runtime/renderPage/getPageAssets/retrieveAssetsProd.js

@@ -2,9 +2,9 @@ export { retrieveAssetsProd };
 import { assert, isNpmPackageImport } from '../../utils.js';
 import { getManifestEntry } from './getManifestEntry.js';
 import { extractAssetsAddQuery } from '../../../shared/extractAssetsQuery.js';
-function retrieveAssetsProd(clientDependencies, clientManifest, includeAssetsImportedByServer) {
+function retrieveAssetsProd(clientDependencies, assetsManifest, includeAssetsImportedByServer) {
     let assetUrls = new Set();
-    assert(clientManifest);
+    assert(assetsManifest);
     const visistedAssets = new Set();
     clientDependencies.forEach(({ id, onlyAssets, eagerlyImported }) => {
         if (eagerlyImported)
@@ -19,17 +19,17 @@ function retrieveAssetsProd(clientDependencies, clientManifest, includeAssetsImp
                 id = extractAssetsAddQuery(id);
             }
         }
-        const { manifestKey } = getManifestEntry(id, clientManifest);
-        collectAssets(manifestKey, assetUrls, visistedAssets, clientManifest, onlyAssets);
+        const { manifestKey } = getManifestEntry(id, assetsManifest);
+        collectAssets(manifestKey, assetUrls, visistedAssets, assetsManifest, onlyAssets);
     });
-    collectSingleStyle(assetUrls, clientManifest);
+    collectSingleStyle(assetUrls, assetsManifest);
     return Array.from(assetUrls);
 }
-function collectAssets(manifestKey, assetUrls, visistedAssets, manifest, onlyCollectStaticAssets) {
+function collectAssets(manifestKey, assetUrls, visistedAssets, assetsManifest, onlyCollectStaticAssets) {
     if (visistedAssets.has(manifestKey))
         return;
     visistedAssets.add(manifestKey);
-    const manifestEntry = manifest[manifestKey];
+    const manifestEntry = assetsManifest[manifestKey];
     assert(manifestEntry, { manifestKey });
     const { file } = manifestEntry;
     if (!onlyCollectStaticAssets) {
@@ -37,9 +37,9 @@ function collectAssets(manifestKey, assetUrls, visistedAssets, manifest, onlyCol
     }
     const { imports = [], assets = [], css = [] } = manifestEntry;
     for (const manifestKey of imports) {
-        const importManifestEntry = manifest[manifestKey];
+        const importManifestEntry = assetsManifest[manifestKey];
         assert(importManifestEntry);
-        collectAssets(manifestKey, assetUrls, visistedAssets, manifest, onlyCollectStaticAssets);
+        collectAssets(manifestKey, assetUrls, visistedAssets, assetsManifest, onlyCollectStaticAssets);
     }
     for (const cssAsset of css) {
         assetUrls.add(`/${cssAsset}`);
@@ -49,9 +49,9 @@ function collectAssets(manifestKey, assetUrls, visistedAssets, manifest, onlyCol
     }
 }
 // Support `config.build.cssCodeSplit: false`, see https://github.com/vikejs/vike/issues/644
-function collectSingleStyle(assetUrls, manifest) {
-    const style = manifest['style.css'];
-    if (style && Object.values(manifest).filter((asset) => asset.file.endsWith('.css')).length === 1) {
+function collectSingleStyle(assetUrls, assetsManifest) {
+    const style = assetsManifest['style.css'];
+    if (style && Object.values(assetsManifest).filter((asset) => asset.file.endsWith('.css')).length === 1) {
         assetUrls.add(`/${style.file}`);
     }
 }

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

@@ -19,9 +19,9 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
         assetUrls = await retrieveAssetsDev(clientDependencies, viteDevServer);
     }
     else {
-        const { clientManifest } = globalContext;
-        clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, clientManifest));
-        assetUrls = retrieveAssetsProd(clientDependencies, clientManifest, pageContext._includeAssetsImportedByServer);
+        const { assetsManifest } = globalContext;
+        clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, assetsManifest));
+        assetUrls = retrieveAssetsProd(clientDependencies, assetsManifest, pageContext._includeAssetsImportedByServer);
     }
     let pageAssets = [];
     unique([...clientEntriesSrc, ...assetUrls]).forEach((src) => {
@@ -116,8 +116,8 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer) {
     assertPosixPath(filePath);
     return filePath;
 }
-function resolveClientEntriesProd(clientEntry, clientManifest) {
-    const { manifestEntry } = getManifestEntry(clientEntry, clientManifest);
+function resolveClientEntriesProd(clientEntry, assetsManifest) {
+    const { manifestEntry } = getManifestEntry(clientEntry, assetsManifest);
     assert(manifestEntry.isEntry || manifestEntry.isDynamicEntry || clientEntry.endsWith('.css'), { clientEntry });
     let { file } = manifestEntry;
     assert(!file.startsWith('/'));

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

@@ -3,8 +3,7 @@ export { logErrorHint };
 export { isCjsEsmError };
 export { isKnownError };
 export { getHint };
-import pc from '@brillout/picocolors';
-import { assert, formatHintLog, isNotNullish, isObject, unique, joinEnglish } from '../utils.js';
+import { assert, formatHintLog, isNotNullish, isObject, unique } from '../utils.js';
 const knownErrors = [
     {
         errMsg: 'jsxDEV is not a function',
@@ -13,6 +12,13 @@ const knownErrors = [
     {
         errMsg: 'Element type is invalid: expected a string (for built-in components) or a class/function (for composite components)',
         link: 'https://vike.dev/broken-npm-package#react-invalid-component'
+    },
+    {
+        // ```
+        // Error [RollupError]: Could not resolve "../dist/client/assets.json" from "renderer/+onRenderHtml.tsx"
+        // ```
+        errMsg: 'assets.json',
+        link: 'https://vike.dev/getGlobalContext'
     }
 ];
 function logErrorHint(error) {
@@ -31,15 +37,7 @@ function getHint(error) {
     }
     const res = isCjsEsmError(error);
     if (res) {
-        const packageNames = res === true ? null : res;
-        const hint = [
-            'Error could be a CJS/ESM issue, consider ',
-            !packageNames || packageNames.length === 0
-                ? 'using'
-                : `adding ${joinEnglish(packageNames.map((p) => pc.cyan(p)), 'or')} to`,
-            ` ${pc.cyan('ssr.noExternal')}`,
-            ', see https://vike.dev/broken-npm-package'
-        ].join('');
+        const hint = 'The error seems to be a CJS/ESM issue, see https://vike.dev/broken-npm-package';
         return hint;
     }
     return null;
@@ -70,6 +68,7 @@ function isCjsEsmError(error) {
     packageNames.forEach((packageName) => {
         assert(!['vite', 'vike'].includes(packageName));
     });
+    // We don't use this anymore: we could return `true` instead. Shall we remove returning a list of npm packages?
     return packageNames;
 }
 function normalizeRes(res) {

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

@@ -321,6 +321,9 @@ function normalizeUrl(pageContextInit, httpRequestId) {
     if (disableUrlNormalization)
         return null;
     const { urlOriginal } = pageContextInit;
+    const { isPageContextRequest } = handlePageContextRequestUrl(urlOriginal);
+    if (isPageContextRequest)
+        return null;
     const urlNormalized = normalizeUrlPathname(urlOriginal, trailingSlash, baseServer);
     if (!urlNormalized)
         return null;

package/dist/esm/shared/page-configs/PageConfig.d.ts

@@ -75,6 +75,7 @@ type ConfigValueSource = {
     valueIsImportedAtRuntime: boolean;
     /** Whether the config value is a file path, for example config.client */
     valueIsFilePath?: true;
+    valueIsDefinedByValueFile: boolean;
 };
 type DefinedAtFileFullInfo = DefinedAtFile & FilePath & {
     fileExportName?: string;

package/dist/esm/shared/page-configs/serialize/serializeConfigValue.js

@@ -6,8 +6,7 @@ export { serializeConfigValueImported };
 // Both parsePageConfigs() parseConfigValuesImported() and are loaded on the client-side and server-side
 import { assertIsNotProductionRuntime } from '../../../utils/assertIsNotProductionRuntime.js';
 assertIsNotProductionRuntime();
-import path from 'path';
-import { assert, assertPosixPath } from '../../utils.js';
+import { assert } from '../../utils.js';
 import { generateEagerImport } from '../../../node/plugin/plugins/importUserCode/generateEagerImport.js';
 function serializeConfigValue(lines, configName, configValueSerialized) {
     let whitespace = '      ';
@@ -23,13 +22,10 @@ function serializeConfigValue(lines, configName, configValueSerialized) {
 function serializeConfigValueImported(configValueSource, configName, whitespace, varCounterContainer, importStatements) {
     assert(!configValueSource.valueIsFilePath);
     assert(whitespace.replaceAll(' ', '').length === 0);
-    const { valueIsImportedAtRuntime, definedAt } = configValueSource;
+    const { valueIsImportedAtRuntime, valueIsDefinedByValueFile, definedAt } = configValueSource;
     assert(valueIsImportedAtRuntime);
     const { filePathAbsoluteVite, fileExportName } = definedAt;
-    assertPosixPath(filePathAbsoluteVite);
-    const fileName = path.posix.basename(filePathAbsoluteVite);
-    const isValueFile = fileName.startsWith('+');
-    if (isValueFile)
+    if (valueIsDefinedByValueFile)
         assert(fileExportName === undefined);
     const { importName, importStatement } = generateEagerImport(filePathAbsoluteVite, varCounterContainer.varCounter++, fileExportName);
     importStatements.push(importStatement);
@@ -37,8 +33,8 @@ function serializeConfigValueImported(configValueSource, configName, whitespace,
     lines.push(`  {`);
     lines.push(`    configName: '${configName}',`);
     lines.push(`    importPath: '${filePathAbsoluteVite}',`);
-    lines.push(`    isValueFile: ${JSON.stringify(isValueFile)},`);
-    if (isValueFile) {
+    lines.push(`    isValueFile: ${JSON.stringify(valueIsDefinedByValueFile)},`);
+    if (valueIsDefinedByValueFile) {
         lines.push(`    exportValues: ${importName},`);
     }
     else {

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.162";
+declare const PROJECT_VERSION: "0.4.163-commit-2305d5b";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.162";
+    projectVersion: "0.4.163-commit-2305d5b";
 };

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.162';
+const PROJECT_VERSION = '0.4.163-commit-2305d5b';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.162",
+  "version": "0.4.163-commit-2305d5b",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
@@ -169,6 +169,7 @@
     "vike": "./node/cli/bin-entry.js"
   },
   "devDependencies": {
+    "@biomejs/biome": "^1.5.3",
     "@brillout/import": "^0.2.3",
     "@brillout/json-serializer": "^0.5.8",
     "@brillout/picocolors": "^1.0.10",