From ba8a441f95481e294d414a0c89e2513f82f45a7a Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Tue, 10 Jan 2023 20:28:22 -0400
Subject: compute subdirectoryPrefix internally

---
 src/write/build-modes/live-dev-server.js |  6 +-----
 src/write/build-modes/static-build.js    | 11 ++---------
 2 files changed, 3 insertions(+), 14 deletions(-)

(limited to 'src/write/build-modes')

diff --git a/src/write/build-modes/live-dev-server.js b/src/write/build-modes/live-dev-server.js
index ec9689bd..a4c4c871 100644
--- a/src/write/build-modes/live-dev-server.js
+++ b/src/write/build-modes/live-dev-server.js
@@ -15,7 +15,6 @@ import {logInfo, logWarn, progressCallAll} from '../../util/cli.js';
 import {
   getPagePathname,
   getPagePathnameAcrossLanguages,
-  getPageSubdirectoryPrefix,
   getURLsFrom,
   getURLsFromRoot,
 } from '../../util/urls.js';
@@ -245,12 +244,9 @@ export async function go({
     } = urlToPageMap[pathnameKey];
 
     const to = getURLsFrom({
-      urls,
       baseDirectory,
       pagePath: servePath,
-      subdirectoryPrefix: getPageSubdirectoryPrefix({
-        pagePath: servePath,
-      }),
+      urls,
     });
 
     const absoluteTo = getURLsFromRoot({
diff --git a/src/write/build-modes/static-build.js b/src/write/build-modes/static-build.js
index 5141891c..23c6470a 100644
--- a/src/write/build-modes/static-build.js
+++ b/src/write/build-modes/static-build.js
@@ -28,7 +28,6 @@ import {
 import {
   getPagePathname,
   getPagePathnameAcrossLanguages,
-  getPageSubdirectoryPrefix,
   getURLsFrom,
   getURLsFromRoot,
 } from '../../util/urls.js';
@@ -281,12 +280,9 @@ export async function go({
         });
 
         const to = getURLsFrom({
-          urls,
           baseDirectory,
           pagePath,
-          subdirectoryPrefix: getPageSubdirectoryPrefix({
-            pagePath,
-          }),
+          urls,
         });
 
         const absoluteTo = getURLsFromRoot({
@@ -351,12 +347,9 @@ export async function go({
         });
 
         const to = getURLsFrom({
-          urls,
           baseDirectory,
           pagePath: fromPath,
-          subdirectoryPrefix: getPageSubdirectoryPrefix({
-            pagePath: fromPath,
-          }),
+          urls,
         });
 
         const target = to('localized.' + toPath[0], ...toPath.slice(1));
-- 
cgit 1.3.0-6-gf8a5