vike 0.4.160 → 0.4.161

package/dist/cjs/node/cli/bin.js

@@ -1,9 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const cac_1 = require("cac");
 const path_1 = require("path");
 const runPrerender_js_1 = require("../prerender/runPrerender.js");
 const utils_js_1 = require("./utils.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const cli = (0, cac_1.cac)(utils_js_1.projectInfo.projectName);
 cli
     .command('prerender', 'Pre-render the HTML of your pages', { allowUnknownOptions: true })
@@ -30,6 +34,7 @@ function assertOptions() {
                 '--outDir',
                 '--configFile'
             ].includes(option), 'Unknown option: ' + option);
+        (0, utils_js_1.assertWarning)(false, `You set ${picocolors_1.default.cyan(option)}, but passing options to ${picocolors_1.default.cyan('$ vike prerender')} is deprecated: use the config file instead. See https://vike.dev/command-prerender.`, { onlyOnce: true });
     });
 }
 // Listen to unknown commands

package/dist/cjs/node/client/router.js

@@ -1,14 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reload = exports.navigate = void 0;
+exports.prefetch = exports.reload = exports.navigate = void 0;
 const assert_js_1 = require("../../utils/assert.js");
 // `never` to ensure package.json#exports["./client/router"].types points to type defined by the client-side code
 const navigate = (() => warnNoEffect('navigate'));
 exports.navigate = navigate;
 const reload = (() => warnNoEffect('reload'));
 exports.reload = reload;
+const prefetch = (() => warnNoEffect('prefetch'));
+exports.prefetch = prefetch;
 function warnNoEffect(caller) {
-    (0, assert_js_1.assertWarning)(false, `Calling ${caller} on the server-side has no effect`, {
+    (0, assert_js_1.assertWarning)(false, `Calling ${caller}() on the server-side has no effect`, {
         showStackTrace: true,
         onlyOnce: false
     });

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

@@ -10,7 +10,7 @@ const runPrerender_js_1 = require("../../prerender/runPrerender.js");
 const getConfigVike_js_1 = require("../../shared/getConfigVike.js");
 const isViteCliCall_js_1 = require("../shared/isViteCliCall.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const logHintForCjsEsmError_js_1 = require("../../runtime/renderPage/logHintForCjsEsmError.js");
+const logErrorHint_js_1 = require("../../runtime/renderPage/logErrorHint.js");
 let forceExit = false;
 function autoFullBuild() {
     let config;
@@ -88,7 +88,7 @@ async function triggerFullBuild(config, configVike, bundle) {
     }
     catch (err) {
         console.error(err);
-        (0, logHintForCjsEsmError_js_1.logHintForCjsEsmError)(err);
+        (0, logErrorHint_js_1.logErrorHint)(err);
         process.exit(1);
     }
     if (configVike.prerender && !configVike.prerender.disableAutoRun) {

package/dist/cjs/node/plugin/plugins/buildConfig/fixServerAssets.js

@@ -0,0 +1,148 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fixServerAssets_isEnabled = exports.fixServerAssets = void 0;
+const promises_1 = __importDefault(require("fs/promises"));
+const path_1 = __importDefault(require("path"));
+const fs_1 = require("fs");
+const utils_js_1 = require("../../utils.js");
+const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
+const buildConfig_js_1 = require("../buildConfig.js");
+/**
+ * true  => use workaround config.build.ssrEmitAssets
+ * false => use workaround extractAssets plugin
+ *
+ * Only used by V1 design.
+ */
+function fixServerAssets_isEnabled() {
+    // We currently apply the workaround iff V1 design.
+    // Shall we allow the user to toggle between the two workarounds? E.g. based on https://vike.dev/includeAssetsImportedByServer.
+    return true;
+}
+exports.fixServerAssets_isEnabled = fixServerAssets_isEnabled;
+/** https://github.com/vikejs/vike/issues/1339 */
+async function fixServerAssets(outDirs) {
+    const clientManifest = await loadManifest(outDirs.outDirClient);
+    const serverManifest = await loadManifest(outDirs.outDirServer);
+    const { clientManifestMod, filesToCopy } = addServerAssets(clientManifest, serverManifest);
+    await copyAssets(filesToCopy, outDirs);
+    return clientManifestMod;
+}
+exports.fixServerAssets = fixServerAssets;
+async function loadManifest(outDir) {
+    const manifestFilePath = path_1.default.posix.join(outDir, buildConfig_js_1.manifestTempFile);
+    const manifestFileContent = await promises_1.default.readFile(manifestFilePath, 'utf-8');
+    (0, utils_js_1.assert)(manifestFileContent);
+    const manifest = JSON.parse(manifestFileContent);
+    (0, utils_js_1.assert)(manifest);
+    return manifest;
+}
+async function copyAssets(filesToCopy, { outDirClient, outDirServer }) {
+    const assetsDirServer = path_1.default.posix.join(outDirServer, 'assets');
+    if (!filesToCopy.length)
+        return;
+    (0, utils_js_1.assert)((0, fs_1.existsSync)(assetsDirServer));
+    const concurrencyLimit = (0, utils_js_1.pLimit)(10);
+    await Promise.all(filesToCopy.map((file) => concurrencyLimit(() => promises_1.default.cp(path_1.default.posix.join(outDirServer, file), path_1.default.posix.join(outDirClient, file), {
+        recursive: true
+    }))));
+    await promises_1.default.rm(assetsDirServer, { recursive: true });
+}
+// Add serverManifest resources to clientManifest
+function addServerAssets(clientManifest, serverManifest) {
+    var _a, _b;
+    const entriesClient = new Map();
+    const entriesServer = new Map();
+    for (const [key, entry] of Object.entries(clientManifest)) {
+        const pageId = getPageId(key);
+        if (!pageId)
+            continue;
+        const resources = collectResources(entry, clientManifest);
+        (0, utils_js_1.assert)(!entriesClient.has(pageId));
+        entriesClient.set(pageId, { key, ...resources });
+    }
+    for (const [key, entry] of Object.entries(serverManifest)) {
+        const pageId = getPageId(key);
+        if (!pageId)
+            continue;
+        const resources = collectResources(entry, serverManifest);
+        (0, utils_js_1.assert)(!entriesServer.has(pageId));
+        entriesServer.set(pageId, resources);
+    }
+    let filesToCopy = [];
+    for (const [pageId, entryClient] of entriesClient.entries()) {
+        const cssToAdd = [];
+        const assetsToAdd = [];
+        const entryServer = entriesServer.get(pageId);
+        if (entryServer) {
+            cssToAdd.push(...entryServer.css
+                .filter((cssServer) => !entryClient.css.some((cssClient) => cssServer.hash === cssClient.hash))
+                .map((css) => css.src));
+            assetsToAdd.push(...entryServer.assets
+                .filter((assertServer) => !entryClient.assets.some((assetClient) => assertServer.hash === assetClient.hash))
+                .map((asset) => asset.src));
+        }
+        const { key } = entryClient;
+        if (cssToAdd.length) {
+            filesToCopy.push(...cssToAdd);
+            (_a = clientManifest[key]).css ?? (_a.css = []);
+            clientManifest[key].css?.push(...cssToAdd);
+        }
+        if (assetsToAdd.length) {
+            filesToCopy.push(...assetsToAdd);
+            (_b = clientManifest[key]).assets ?? (_b.assets = []);
+            clientManifest[key].assets?.push(...assetsToAdd);
+        }
+    }
+    const clientManifestMod = clientManifest;
+    filesToCopy = (0, utils_js_1.unique)(filesToCopy);
+    return { clientManifestMod, filesToCopy };
+}
+function getPageId(key) {
+    // Normalize from:
+    //   ../../virtual:vike:pageConfigValuesAll:client:/pages/index
+    // to:
+    //   virtual:vike:pageConfigValuesAll:client:/pages/index
+    // (This seems to be needed only for vitest tests that use Vite's build() API with an inline config.)
+    key = key.substring(key.indexOf('virtual:vike'));
+    const result = (0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(key);
+    return result && result.pageId;
+}
+function collectResources(entryRoot, manifest) {
+    const css = [];
+    const assets = [];
+    const entries = new Set([entryRoot]);
+    for (const entry of entries) {
+        for (const entryImport of entry.imports ?? []) {
+            entries.add(manifest[entryImport]);
+        }
+        const entryCss = entry.css ?? [];
+        if (entry.file.endsWith('.css'))
+            entryCss.push(entry.file);
+        for (const src of entryCss) {
+            const hash = getHash(src);
+            css.push({ src, hash });
+        }
+        const entryAssets = entry.assets ?? [];
+        for (const src of entryAssets) {
+            const hash = getHash(src);
+            assets.push({ src, hash });
+        }
+    }
+    return { css, assets };
+}
+// Use the hash of resources to determine whether they are equal. We need this, otherwise we get:
+// ```html
+// <head>
+//   <link rel="stylesheet" type="text/css" href="/assets/static/onRenderClient.2j6TxKIB.css">
+//   <link rel="stylesheet" type="text/css" href="/assets/static/onRenderHtml.2j6TxKIB.css">
+// </head>
+// ```
+function getHash(src) {
+    // src is guarenteed to end with `.[hash][extname]`, see distFileNames.ts
+    const hash = src.split('.').at(-2);
+    (0, utils_js_1.assert)(hash);
+    return hash;
+}

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.analyzeClientEntries = exports.assertRollupInput = exports.buildConfig = void 0;
+exports.manifestTempFile = exports.analyzeClientEntries = exports.assertRollupInput = exports.buildConfig = void 0;
 const utils_js_1 = require("../utils.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 const helpers_js_1 = require("../../../shared/page-configs/helpers.js");
@@ -15,12 +15,17 @@ const module_1 = require("module");
 const getClientEntryFilePath_js_1 = require("../../shared/getClientEntryFilePath.js");
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
+const fixServerAssets_js_1 = require("./buildConfig/fixServerAssets.js");
+const index_js_1 = require("./importBuild/index.js");
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
 const manifestTempFile = '_temp_manifest.json';
+exports.manifestTempFile = manifestTempFile;
 function buildConfig() {
-    let generateManifest;
+    let isServerAssetsFixEnabled;
+    let isSsrBuild;
+    let outDirs;
     return {
         name: 'vike:buildConfig',
         apply: 'build',
@@ -28,37 +33,56 @@ function buildConfig() {
         configResolved: {
             order: 'post',
             async handler(config) {
+                assertNodeEnv();
                 assertRollupInput(config);
                 const entries = await getEntries(config);
                 (0, utils_js_1.assert)(Object.keys(entries).length > 0);
                 config.build.rollupOptions.input = (0, utils_js_1.injectRollupInputs)(entries, config);
                 addLogHook();
+                outDirs = (0, utils_js_1.getOutDirs)(config);
+                {
+                    isServerAssetsFixEnabled = (0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && (await (0, getVikeConfig_js_1.isV1Design)(config, false));
+                    if (isServerAssetsFixEnabled) {
+                        // https://github.com/vikejs/vike/issues/1339
+                        config.build.ssrEmitAssets = true;
+                        // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
+                        config.build.cssMinify = 'esbuild';
+                    }
+                }
             }
         },
         config(config) {
-            generateManifest = !(0, utils_js_1.viteIsSSR)(config);
+            assertNodeEnv();
+            isSsrBuild = (0, utils_js_1.viteIsSSR)(config);
             return {
                 build: {
                     outDir: (0, utils_js_1.resolveOutDir)(config),
-                    manifest: generateManifest ? manifestTempFile : false,
-                    copyPublicDir: !(0, utils_js_1.viteIsSSR)(config)
+                    manifest: manifestTempFile,
+                    copyPublicDir: !isSsrBuild
                 }
             };
         },
+        buildStart() {
+            assertNodeEnv();
+        },
         async writeBundle(options, bundle) {
-            const manifestEntry = bundle[manifestTempFile];
-            /* Fails with @vitejs/plugin-legacy because writeBundle() is called twice during the client build (once for normal client assets and a second time for legacy assets), see reproduction at https://github.com/vikejs/vike/issues/1154
-            assert(generateManifest === !!manifestEntry)
-            */
-            if (manifestEntry) {
-                const { dir } = options;
-                (0, utils_js_1.assert)(dir);
-                const manifestFilePathOld = path_1.default.join(dir, manifestEntry.fileName);
+            if (isSsrBuild) {
                 // Ideally we'd move dist/_temp_manifest.json to dist/server/client-assets.json instead of dist/assets.json
                 //  - But we can't because there is no guarentee whether dist/server/ is generated before or after dist/client/ (generating dist/server/ after dist/client/ erases dist/server/client-assets.json)
                 //  - We'll able to do so once we replace `$ vite build` with `$ vike build`
-                const manifestFilePathNew = path_1.default.join(dir, '..', 'assets.json');
-                await promises_1.default.rename(manifestFilePathOld, manifestFilePathNew);
+                const assetsJsonFilePath = path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
+                const clientManifestFilePath = path_1.default.posix.join(outDirs.outDirClient, manifestTempFile);
+                const serverManifestFilePath = path_1.default.posix.join(outDirs.outDirServer, manifestTempFile);
+                if (!isServerAssetsFixEnabled) {
+                    await promises_1.default.copyFile(clientManifestFilePath, assetsJsonFilePath);
+                }
+                else {
+                    const clientManifestMod = await (0, fixServerAssets_js_1.fixServerAssets)(outDirs);
+                    await promises_1.default.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
+                }
+                await promises_1.default.rm(clientManifestFilePath);
+                await promises_1.default.rm(serverManifestFilePath);
+                await (0, index_js_1.set_constant_ASSETS_MAP)(options, bundle);
             }
         }
     };
@@ -230,3 +254,6 @@ function assertRollupInput(config) {
     (0, utils_js_1.assertUsage)(htmlInput === undefined, `The entry ${htmlInput} of config build.rollupOptions.input is an HTML entry which is forbidden when using Vike, instead follow https://vike.dev/add`);
 }
 exports.assertRollupInput = assertRollupInput;
+function assertNodeEnv() {
+    (0, utils_js_1.assertNodeEnvIsNotDev)('building');
+}

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

@@ -31,7 +31,7 @@ function commonConfig() {
                     overrideViteDefaultPort(config);
                     /* TODO: do this after implementing vike.config.js and new setting transformLinkedDependencies (or probably a better name like transpileLinkedDependencies/bundleLinkedDependencies or something else)
                     overrideViteDefaultSsrExternal(config)
-                    */
+                    //*/
                     workaroundCI(config);
                     (0, buildConfig_js_1.assertRollupInput)(config);
                     (0, assertResolveAlias_js_1.assertResolveAlias)(config);
@@ -52,21 +52,13 @@ function overrideViteDefaultPort(config) {
     (_b = config.preview).port ?? (_b.port = 3000);
 }
 /*
+import { version } from 'vite'
 function overrideViteDefaultSsrExternal(config: ResolvedConfig) {
-  if (!isViteVersionWithSsrExternalTrue()) return
+  if (!isVersionOrAbove(version, '5.0.12')) return
   // @ts-ignore Not released yet: https://github.com/vitejs/vite/pull/10939/files#diff-5a3d42620df2c6b17e25f440ffdb67683dee7ef57317674d19f41d5f30502310L5
   config.ssr.external ??= true
 }
-import { version } from 'vite'
-function isViteVersionWithSsrExternalTrue(): boolean {
-  const versionParts = version.split('.').map((s) => parseInt(s, 10)) as [number, number, number]
-  assert(versionParts.length === 3)
-  if (versionParts[0] > 5) return true
-  if (versionParts[1] > 0) return true
-  if (versionParts[2] >= 12) return true
-  return false
-}
-*/
+//*/
 // Workaround GitHub Action failing to access the server
 function workaroundCI(config) {
     var _a, _b;
@@ -76,7 +68,7 @@ function workaroundCI(config) {
     }
 }
 function assertEsm(userViteRoot) {
-    const packageJsonPath = (0, utils_js_1.findUserPackageJsonPath)(userViteRoot);
+    const packageJsonPath = (0, utils_js_1.findFile)('package.json', userViteRoot);
     if (!packageJsonPath)
         return;
     const packageJson = require_(packageJsonPath);

package/dist/cjs/node/plugin/plugins/config/stemUtils.js

@@ -54,7 +54,7 @@ async function getStemPackages(userAppRootDir) {
 }
 exports.getStemPackages = getStemPackages;
 function findUserRootDir(userAppRootDir) {
-    const userPkgJsonPath = (0, utils_js_1.findUserPackageJsonPath)(userAppRootDir);
+    const userPkgJsonPath = (0, utils_js_1.findFile)('package.json', userAppRootDir);
     (0, utils_js_1.assertUsage)(userPkgJsonPath, `Couldn't find package.json in any parent directory starting from ${userAppRootDir}`);
     return (0, utils_js_1.toPosixPath)(path_1.default.dirname(userPkgJsonPath));
 }

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

@@ -24,9 +24,17 @@ function distFileNames() {
                 if (!('chunkFileNames' in rollupOutput)) {
                     rollupOutput.chunkFileNames = (chunkInfo) => getChunkFileName(chunkInfo, config);
                 }
-                if (!('assertUsage' in rollupOutput)) {
+                if (!('assetFileNames' in rollupOutput)) {
                     rollupOutput.assetFileNames = (chunkInfo) => getAssetFileName(chunkInfo, config);
                 }
+                else {
+                    // If a user needs this:
+                    //  - assertUsage() that the naming provided by the user ends with `.[hash][extname]`
+                    //    - It's needed for getHash() of fixServerAssets()
+                    //    - Asset URLs should always contain a hash: it's paramount for caching assets.
+                    //    - If rollupOutput.assetFileNames is a function then use a wrapper function to apply the assertUsage()
+                    (0, utils_js_1.assertUsage)(false, "Setting config.build.rollupOptions.output.assetFileNames is currently forbidden. (It's possible to support, thus contact a maintainer if you need this.)");
+                }
             });
         }
     };

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

@@ -1,6 +1,6 @@
 "use strict";
-// Alternative: use `ssrEmitAssets: true`
-//  - See https://github.com/vitejs/vite/pull/11430
+// Remove this workaround if the other workaround config.build.ssrEmitAssets turns out to be reliable.
+//  - Remove this file then revert this commit: https://github.com/vikejs/vike/commit/805a18974f13420a78fcc30fdd676696e405c3ca
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -13,6 +13,8 @@ const isAsset_js_1 = require("../shared/isAsset.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const removeSourceMap_js_1 = require("../shared/removeSourceMap.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const fixServerAssets_js_1 = require("./buildConfig/fixServerAssets.js");
+const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 exports.extractAssetsRE = extractAssetsRE;
 const rawRE = /(\?|&)raw(?:&|$)/;
@@ -24,6 +26,7 @@ const debugEnabled = (0, utils_js_1.isDebugEnabled)(debugNamespace);
 function extractAssetsPlugin() {
     let config;
     let configVike;
+    let isServerAssetsFixEnabled;
     return [
         // This plugin removes all JavaScript from server-side only code, so that only CSS imports remains. (And also satic files imports e.g. `import logoURL from './logo.svg.js'`).
         {
@@ -35,6 +38,7 @@ function extractAssetsPlugin() {
                 if (!extractAssetsRE.test(id)) {
                     return;
                 }
+                (0, utils_js_1.assert)(!isServerAssetsFixEnabled);
                 (0, utils_js_1.assert)(configVike.includeAssetsImportedByServer);
                 (0, utils_js_1.assert)(!(0, utils_js_1.viteIsSSR_options)(options));
                 const importStatements = await (0, parseEsModule_js_1.getImportStatements)(src);
@@ -132,6 +136,7 @@ function extractAssetsPlugin() {
             async configResolved(config_) {
                 configVike = await (0, getConfigVike_js_1.getConfigVike)(config_);
                 config = config_;
+                isServerAssetsFixEnabled = (0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && (await (0, getVikeConfig_js_1.isV1Design)(config, false));
             },
             load(id) {
                 if (!(0, utils_js_1.isVirtualFileId)(id))

package/dist/cjs/node/plugin/plugins/importBuild/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.importBuild = void 0;
+exports.set_constant_ASSETS_MAP = exports.importBuild = void 0;
 const plugin_js_1 = require("@brillout/vite-plugin-server-entry/plugin.js");
 const utils_js_1 = require("../../utils.js");
 const path_1 = __importDefault(require("path"));
@@ -26,11 +26,6 @@ function importBuild() {
             async configResolved(config_) {
                 config = config_;
                 configVike = await (0, getConfigVike_js_1.getConfigVike)(config);
-            },
-            async writeBundle(options, bundle) {
-                if (!(0, utils_js_1.viteIsSSR)(config))
-                    return;
-                await replace_ASSETS_MAP(options, bundle);
             }
         },
         ...(0, plugin_js_1.serverEntryPlugin)({
@@ -64,7 +59,8 @@ function getEntryCode(config, configVike) {
     ].join('\n');
     return importerCode;
 }
-async function replace_ASSETS_MAP(options, bundle) {
+/** Set the value of the ASSETS_MAP constant inside dist/server/entry.js (or dist/server/index.js) */
+async function set_constant_ASSETS_MAP(options, bundle) {
     const { dir } = options;
     (0, utils_js_1.assert)(dir);
     // This will probably fail with @vitejs/plugin-legacy
@@ -80,6 +76,7 @@ async function replace_ASSETS_MAP(options, bundle) {
     (0, utils_js_1.assert)(serverEntryFileContentPatched !== serverEntryFileContent);
     await promises_1.default.writeFile(serverEntryFilePath, serverEntryFileContentPatched);
 }
+exports.set_constant_ASSETS_MAP = set_constant_ASSETS_MAP;
 function getImportPath(config) {
     // We resolve filePathAbsolute even if we don't use it: we use require.resolve() as an assertion that the relative path is correct
     const filePathAbsolute = (0, utils_js_1.toPosixPath)(

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/crawlPlusFiles.js

@@ -49,11 +49,7 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, isDev) {
         p = (0, utils_js_1.toPosixPath)(p);
         (0, utils_js_1.assert)(!p.startsWith(userRootDir));
         const filePathRelativeToUserRootDir = path_1.default.posix.join('/', p);
-        const filePathAbsoluteFilesystem = path_1.default.posix.join(userRootDir, p);
-        return {
-            filePathRelativeToUserRootDir,
-            filePathAbsoluteFilesystem
-        };
+        return { filePathRelativeToUserRootDir };
     });
     return plusFiles;
 }

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/filesystemRouting.js

@@ -3,34 +3,37 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLogicalPath = exports.applyFilesystemRoutingRootEffect = exports.isGlobalLocation = exports.sortAfterInheritanceOrder = exports.getLocationId = exports.isInherited = exports.getFilesystemRouteDefinedBy = exports.getFilesystemRouteString = void 0;
 const utils_js_1 = require("../../../../utils.js");
 /**
- * getLocationId('/pages/some-page/+Page.js') => '/pages/some-page'
- * getLocationId('/pages/some-page') => '/pages/some-page'
- * getLocationId('/renderer/+config.js') => '/renderer'
+ * `getLocationId('/pages/some-page/+Page.js')` => `'/pages/some-page'`
+ * `getLocationId('/renderer/+config.js')` => `'/renderer'`
+ *
+ * The value `locationId` is always a user-land path, because Filesystem Routing/Inheritance only applies to the user-land (Vike never uses Filesystem Routing/Inheritance for `node_modules/**`).
  */
-function getLocationId(filePathAbsoluteVite) {
-    const locationId = removeFilename(filePathAbsoluteVite, true);
+function getLocationId(
+// We always determine `locationId` from a real user-land file: the `locationId` for Vike extensions is the `locationId` of the the user's `+config.h.js` that extends the Vike extension.
+filePathRelativeToUserRootDir) {
+    (0, utils_js_1.assertPosixPath)(filePathRelativeToUserRootDir);
+    (0, utils_js_1.assert)(filePathRelativeToUserRootDir.startsWith('/'));
+    const locationId = removeFilename(filePathRelativeToUserRootDir);
     assertLocationId(locationId);
     return locationId;
 }
 exports.getLocationId = getLocationId;
-/** Get URL determined by filesystem path */
+/** Filesystem Routing: get the URL */
 function getFilesystemRouteString(locationId) {
     return getLogicalPath(locationId, ['renderer', 'pages', 'src', 'index']);
 }
 exports.getFilesystemRouteString = getFilesystemRouteString;
-/** Get apply root for config inheritance */
-function getInheritanceRoot(someDir) {
-    return getLogicalPath(someDir, ['renderer']);
+/** Filesystem Inheritance: get the apply root */
+function getInheritanceRoot(locationId) {
+    return getLogicalPath(locationId, ['renderer']);
 }
 /**
  * getLogicalPath('/pages/some-page', ['pages']) => '/some-page'
- * getLogicalPath('some-npm-pkg/renderer', ['renderer']) => '/'
  */
-function getLogicalPath(someDir, removeDirs) {
-    someDir = removeNpmPackageName(someDir);
-    someDir = removeDirectories(someDir, removeDirs);
-    assertIsPath(someDir);
-    return someDir;
+function getLogicalPath(locationId, removeDirs) {
+    let logicalPath = removeDirectories(locationId, removeDirs);
+    assertIsPath(logicalPath);
+    return logicalPath;
 }
 exports.getLogicalPath = getLogicalPath;
 /** Whether configs defined in `locationId` apply in every `locationIds` */
@@ -39,6 +42,10 @@ function isGlobalLocation(locationId, locationIds) {
 }
 exports.isGlobalLocation = isGlobalLocation;
 function sortAfterInheritanceOrder(locationId1, locationId2, locationIdPage) {
+    assertLocationId(locationId1);
+    assertLocationId(locationId2);
+    if (locationId1 === locationId2)
+        return 0;
     const inheritanceRoot1 = getInheritanceRoot(locationId1);
     const inheritanceRoot2 = getInheritanceRoot(locationId2);
     const inheritanceRootPage = getInheritanceRoot(locationIdPage);
@@ -54,15 +61,10 @@ function sortAfterInheritanceOrder(locationId1, locationId2, locationIdPage) {
         (0, utils_js_1.assert)(inheritanceRoot1.length !== inheritanceRoot2.length);
         return (0, utils_js_1.higherFirst)((inheritanceRoot) => inheritanceRoot.length)(inheritanceRoot1, inheritanceRoot2);
     }
-    // Should be true since we aggregate interface files by locationId
-    (0, utils_js_1.assert)(locationId1 !== locationId2);
     // locationId1 first, i.e. `indexOf(locationId1) < indexOf(locationId2)`
     const locationId1First = -1;
     // locationId2 first, i.e. `indexOf(locationId2) < indexOf(locationId1)`
     const locationId2First = 1;
-    if (locationIsNpmPackage(locationId1) !== locationIsNpmPackage(locationId2)) {
-        return locationIsNpmPackage(locationId1) ? locationId2First : locationId1First;
-    }
     if (locationIsRendererDir(locationId1) !== locationIsRendererDir(locationId2)) {
         return locationIsRendererDir(locationId1) ? locationId2First : locationId1First;
     }
@@ -74,9 +76,6 @@ function sortAfterInheritanceOrder(locationId1, locationId2, locationIdPage) {
     return locationId1 > locationId2 ? locationId1First : locationId2First;
 }
 exports.sortAfterInheritanceOrder = sortAfterInheritanceOrder;
-function locationIsNpmPackage(locationId) {
-    return !locationId.startsWith('/');
-}
 function locationIsRendererDir(locationId) {
     return locationId.split('/').includes('renderer');
 }
@@ -87,19 +86,6 @@ function isInherited(locationId1, locationId2) {
     return startsWith(inheritanceRoot2, inheritanceRoot1);
 }
 exports.isInherited = isInherited;
-function removeNpmPackageName(somePath) {
-    if (!(0, utils_js_1.isNpmPackageImport)(somePath)) {
-        (0, utils_js_1.assert)(somePath.startsWith('/'));
-        return somePath;
-    }
-    const importPath = (0, utils_js_1.getNpmPackageImportPath)(somePath);
-    if (!importPath)
-        return '/';
-    (0, utils_js_1.assertPosixPath)(importPath);
-    (0, utils_js_1.assert)(!importPath.startsWith('/'));
-    somePath = '/' + importPath;
-    return somePath;
-}
 function removeDirectories(somePath, removeDirs) {
     (0, utils_js_1.assertPosixPath)(somePath);
     somePath = somePath
@@ -110,17 +96,13 @@ function removeDirectories(somePath, removeDirs) {
         somePath = '/';
     return somePath;
 }
-function removeFilename(filePathAbsoluteVite, optional) {
-    (0, utils_js_1.assertPosixPath)(filePathAbsoluteVite);
-    (0, utils_js_1.assert)(filePathAbsoluteVite.startsWith('/') || (0, utils_js_1.isNpmPackageImport)(filePathAbsoluteVite));
+function removeFilename(filePathRelativeToUserRootDir) {
+    const filePathParts = filePathRelativeToUserRootDir.split('/');
     {
-        const filename = filePathAbsoluteVite.split('/').slice(-1)[0];
-        if (!filename.includes('.')) {
-            (0, utils_js_1.assert)(optional);
-            return filePathAbsoluteVite;
-        }
+        const filename = filePathParts.slice(-1)[0];
+        (0, utils_js_1.assert)(filename.includes('.'));
     }
-    let locationId = filePathAbsoluteVite.split('/').slice(0, -1).join('/');
+    let locationId = filePathParts.slice(0, -1).join('/');
     if (locationId === '')
         locationId = '/';
     assertLocationId(locationId);
@@ -144,7 +126,7 @@ function applyFilesystemRoutingRootEffect(routeFilesystem, filesystemRoutingRoot
 }
 exports.applyFilesystemRoutingRootEffect = applyFilesystemRoutingRootEffect;
 function assertLocationId(locationId) {
-    (0, utils_js_1.assert)(locationId.startsWith('/') || (0, utils_js_1.isNpmPackageImport)(locationId));
+    (0, utils_js_1.assert)(locationId.startsWith('/'));
     (0, utils_js_1.assert)(!locationId.endsWith('/') || locationId === '/');
 }
 function assertIsPath(logicalPath) {