final tweaks

lumeland · Jul 18, 2024 · 73d0e9d · 73d0e9d
1 parent fff3f72
commit 73d0e9d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ Go to the `v1` branch to see the changelog of Lume 1.
 - New middleware `redirect_as2` [#632].
 
 ### Fixed
+- `page.sourcePath` wrongly returns the remote url instead of the path for remote files.
 - Reload remote files [#633].
 - Vento components must be sync.
 - Updated dependencies: `std`, `terser`, `sass`, `xml`, `liquid`, `highlight.js`, `unocss`, `decap_cms`, `tailwindcss`, `vento`, `preact-render-to-string`.

diff --git a/core/file.ts b/core/file.ts
@@ -82,10 +82,6 @@ export class Page<D extends Data = Data> {
 
   /** Returns the source path of this page */
   get sourcePath(): string {
-    if (this.src.entry?.flags.has("remote")) {
-      return this.src.entry.src;
-    }
-
     if (!this.src.path) {
       return "(generated)";
     }

diff --git a/plugins/source_maps.ts b/plugins/source_maps.ts
@@ -112,7 +112,7 @@ export function prepareAsset(site: Site, page: Page): PrepareResult {
     ? page.data.sourceMap as SourceMap | undefined
     : undefined;
   const filename = page.src.path
-    ? site.src(page.src.path + page.src.ext) // Don't use page.sourcePath because it can be remote
+    ? site.src(page.sourcePath)
     : site.src(page.outputPath);
   return { content, sourceMap, filename, enableSourceMap };
 }

diff --git a/tests/utils.ts b/tests/utils.ts
@@ -179,7 +179,7 @@ export async function assertSiteSnapshot(
         path: page.src.path,
         ext: page.src.ext,
         remote: page.src.entry?.flags.has("remote")
-          ? page.sourcePath.replace(cwUrl, "")
+          ? page.src.entry.src.replace(cwUrl, "")
           : undefined,
         asset: page.asset,
       },