vike 0.4.161-commit-ba539a4 → 0.4.161-commit-0e9c635

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

@@ -6,7 +6,7 @@ export { getRenderContext };
 import { getErrorPageId } from '../../../shared/error-page.js';
 import { getHtmlString } from '../html/renderHtml.js';
 import { getPageFilesAll } from '../../../shared/getPageFiles.js';
-import { assert, assertUsage, assertWarning, hasProp, isNotNullish, objectAssign, unique } from '../utils.js';
+import { assert, assertUsage, hasProp, objectAssign } from '../utils.js';
 import { serializePageContextClientSide } from '../html/serializePageContextClientSide.js';
 import { addUrlComputedProps } from '../../../shared/addUrlComputedProps.js';
 import { getGlobalContext } from '../globalContext.js';
@@ -20,8 +20,8 @@ import { preparePageContextForUserConsumptionServerSide } from './preparePageCon
 import { executeGuardHook } from '../../../shared/route/executeGuardHook.js';
 import { loadPageRoutes } from '../../../shared/route/loadPageRoutes.js';
 import pc from '@brillout/picocolors';
-import { getConfigValueFilePathToShowToUser } from '../../../shared/page-configs/helpers.js';
 import { isServerSideError } from '../../../shared/misc/isServerSideError.js';
+import { assertV1Design } from '../../shared/assertV1Design.js';
 async function renderPageAlreadyRouted(pageContext) {
     // pageContext._pageId can either be the:
     //  - ID of the page matching the routing, or the
@@ -151,7 +151,7 @@ async function getRenderContext() {
     const globalContext = getGlobalContext();
     const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal } = await getPageFilesAll(false, globalContext.isProduction);
     const { pageRoutes, onBeforeRouteHook } = await loadPageRoutes(pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds);
-    assertV1Design(pageFilesAll, pageConfigs);
+    assertV1Design(pageFilesAll.length > 0, pageConfigs, pageFilesAll);
     const renderContext = {
         pageFilesAll: pageFilesAll,
         pageConfigs,
@@ -162,24 +162,3 @@ async function getRenderContext() {
     };
     return renderContext;
 }
-function assertV1Design(pageFilesAll, pageConfigs) {
-    const isV1Design = pageConfigs.length !== 0;
-    const isDesignOld = pageFilesAll.length !== 0;
-    if (isV1Design && isDesignOld) {
-        const indent = '- ';
-        const v1Files = unique(pageConfigs
-            .map((p) => Object.values(p.configValues)
-            .map(getConfigValueFilePathToShowToUser)
-            .filter(isNotNullish)
-            .map((filePathToShowToUser) => indent + filePathToShowToUser))
-            .flat(2));
-        assertUsage(false, [
-            'Mixing the new V1 design with the old V0.4 design is forbidden.',
-            'V1 files:',
-            ...v1Files,
-            'V0.4 files:',
-            ...pageFilesAll.map((p) => indent + p.filePath)
-        ].join('\n'));
-    }
-    assertWarning(!isDesignOld, "You are using Vike's deprecated design. Update to the new V1 design, see https://vike.dev/migration/v1-design for how to migrate.", { onlyOnce: true });
-}

package/dist/esm/node/shared/assertPluginManifest.d.ts

@@ -6,7 +6,6 @@ type PluginManifest = {
     baseAssets: string | null;
     usesClientRouter: boolean;
     includeAssetsImportedByServer: boolean;
-    manifestKeyMap: Record<string, string>;
     redirects: Record<string, string>;
     trailingSlash: boolean;
     disableUrlNormalization: boolean;

package/dist/esm/node/shared/assertPluginManifest.js

@@ -1,21 +1,18 @@
 export { assertPluginManifest };
 import { assertRuntimeManifest } from './assertRuntimeManifest.js';
-import { assert, assertUsage, isPlainObject, projectInfo, checkType, hasProp, isStringRecord, objectAssign } from './utils.js';
+import { assert, assertUsage, isPlainObject, projectInfo, checkType, hasProp } from './utils.js';
 function assertPluginManifest(pluginManifest) {
     assert(isPlainObject(pluginManifest));
     assertUsage(pluginManifest.version === projectInfo.projectVersion, `Re-build your app (you're using vike@${projectInfo.projectVersion} but your app was built with vike@${pluginManifest.version})`);
     assertRuntimeManifest(pluginManifest);
     assert(hasProp(pluginManifest, 'usesClientRouter', 'boolean'));
     assert(hasProp(pluginManifest, 'version', 'string'));
-    assert(hasProp(pluginManifest, 'manifestKeyMap', 'object'));
-    const { manifestKeyMap } = pluginManifest;
-    assert(isStringRecord(manifestKeyMap));
     // Avoid:
     // ```
     // Uncaught (in promise) TypeError: Cannot set property manifestKeyMap of #<Object> which has only a getter
     // ```
+    // We removed manifestKeyMap, maybe this isn't needed anymore.
     // See https://github.com/vikejs/vike/issues/596
     const pluginManifestClone = { ...pluginManifest };
-    objectAssign(pluginManifestClone, { manifestKeyMap });
     checkType(pluginManifestClone);
 }

package/dist/esm/node/shared/assertV1Design.d.ts

@@ -0,0 +1,4 @@
+export { assertV1Design };
+import { PageFile } from '../../shared/getPageFiles.js';
+import type { PageConfigBuildTime, PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
+declare function assertV1Design(isOldDesign: boolean, pageConfigs: (PageConfigRuntime | PageConfigBuildTime)[], pageFilesAll?: PageFile[]): void;

package/dist/esm/node/shared/assertV1Design.js

@@ -0,0 +1,23 @@
+export { assertV1Design };
+import { getConfigValueFilePathToShowToUser } from '../../shared/page-configs/helpers.js';
+import { assert, assertUsage, assertWarning, isNotNullish, unique } from './utils.js';
+function assertV1Design(isOldDesign, pageConfigs, pageFilesAll) {
+    const isV1Design = pageConfigs.length > 0;
+    if (isV1Design && isOldDesign) {
+        const lines = ['Mixing the new V1 design with the old V0.4 design is forbidden.'];
+        if (pageFilesAll) {
+            assert(pageFilesAll.length > 0);
+            const indent = '- ';
+            const filesV1 = unique(pageConfigs
+                .map((p) => Object.values(p.configValues)
+                .map(getConfigValueFilePathToShowToUser)
+                .filter(isNotNullish)
+                .map((filePathToShowToUser) => indent + filePathToShowToUser))
+                .flat(2));
+            const filesOld = pageFilesAll.map((p) => indent + p.filePath);
+            lines.push(...['V1 design files:', ...filesV1, 'Old design files:', ...filesOld]);
+        }
+        assertUsage(false, lines.join('\n'));
+    }
+    assertWarning(!isOldDesign, "You are using Vike's deprecated design. Update to the new V1 design, see https://vike.dev/migration/v1-design for how to migrate.", { onlyOnce: true });
+}

package/dist/esm/node/shared/utils.d.ts

@@ -13,3 +13,5 @@ export * from '../../utils/parseUrl-extras.js';
 export * from '../../utils/isObject.js';
 export * from '../../utils/virtual-files.js';
 export * from '../../utils/assertIsNotBrowser.js';
+export * from '../../utils/isNotNullish.js';
+export * from '../../utils/unique.js';

package/dist/esm/node/shared/utils.js

@@ -15,3 +15,5 @@ export * from '../../utils/parseUrl-extras.js';
 export * from '../../utils/isObject.js';
 export * from '../../utils/virtual-files.js';
 export * from '../../utils/assertIsNotBrowser.js';
+export * from '../../utils/isNotNullish.js';
+export * from '../../utils/unique.js';

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

@@ -25,11 +25,10 @@ type PageConfigBase = {
         routeString: string;
         definedBy: string;
     };
+    configValues: ConfigValues;
 };
 /** Page config data structure available at runtime */
 type PageConfigRuntime = PageConfigBase & {
-    /** All loaded config values */
-    configValues: ConfigValues;
     /** Load config values that are lazily loaded such as config.Page */
     loadConfigValuesAll: () => Promise<{
         configValuesImported: ConfigValueImported[];
@@ -43,7 +42,6 @@ type PageConfigRuntimeLoaded = PageConfigRuntime & {
 };
 /** Page config data structure available at build-time */
 type PageConfigBuildTime = PageConfigBase & {
-    configValues: ConfigValues;
     configValueSources: ConfigValueSources;
     configValuesComputed: ConfigValuesComputed;
 };

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.161-commit-ba539a4";
+declare const PROJECT_VERSION: "0.4.161-commit-0e9c635";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.161-commit-ba539a4";
+    projectVersion: "0.4.161-commit-0e9c635";
 };

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.161-commit-ba539a4';
+const PROJECT_VERSION = '0.4.161-commit-0e9c635';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.161-commit-ba539a4",
+  "version": "0.4.161-commit-0e9c635",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",

package/dist/cjs/node/plugin/shared/removeSourceMap.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeSourceMap = void 0;
-function removeSourceMap(code) {
-    return {
-        code,
-        // Remove Source Map to save KBs
-        //  - https://rollupjs.org/guide/en/#source-code-transformations
-        map: { mappings: '' }
-    };
-}
-exports.removeSourceMap = removeSourceMap;

package/dist/esm/node/plugin/shared/removeSourceMap.d.ts

@@ -1,7 +0,0 @@
-export { removeSourceMap };
-declare function removeSourceMap(code: string): {
-    code: string;
-    map: {
-        mappings: "";
-    };
-};

package/dist/esm/node/plugin/shared/removeSourceMap.js

@@ -1,9 +0,0 @@
-export { removeSourceMap };
-function removeSourceMap(code) {
-    return {
-        code,
-        // Remove Source Map to save KBs
-        //  - https://rollupjs.org/guide/en/#source-code-transformations
-        map: { mappings: '' }
-    };
-}