From 1d991bb4bc877363532971a74f70e55939c637bb Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Thu, 9 Nov 2023 20:16:30 -0400
Subject: upd8, data, test: export internal strings path cleanly, fix tests

---
 src/upd8.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/upd8.js')

diff --git a/src/upd8.js b/src/upd8.js
index 24d0b92b..db73c412 100755
--- a/src/upd8.js
+++ b/src/upd8.js
@@ -39,7 +39,8 @@ import {fileURLToPath} from 'node:url';
 import wrap from 'word-wrap';
 
 import {displayCompositeCacheAnalysis} from '#composite';
-import {processLanguageFile, watchLanguageFile} from '#language';
+import {processLanguageFile, watchLanguageFile, internalDefaultStringsFile}
+  from '#language';
 import {isMain, traverse} from '#node-utils';
 import bootRepl from '#repl';
 import {empty, showAggregate, withEntries} from '#sugar';
@@ -93,8 +94,6 @@ try {
 
 const BUILD_TIME = new Date();
 
-export const DEFAULT_STRINGS_FILE = 'strings-default.yaml';
-
 const STATUS_NOT_STARTED       = `not started`;
 const STATUS_NOT_APPLICABLE    = `not applicable`;
 const STATUS_STARTED_NOT_DONE  = `started but not yet done`;
@@ -1104,8 +1103,6 @@ async function main() {
   let internalDefaultLanguage;
   let internalDefaultLanguageWatcher;
 
-  const internalDefaultStringsFile = path.join(__dirname, DEFAULT_STRINGS_FILE);
-
   let errorLoadingInternalDefaultLanguage = false;
 
   if (noLanguageReloading) {
-- 
cgit 1.3.0-6-gf8a5


From 61c8aa5c17ee6fd96f2e72f8d8a47eb0878ffa7e Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Sun, 12 Nov 2023 15:25:54 -0400
Subject: upd8: load custom languages from yaml as well as json

---
 src/upd8.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/upd8.js')

diff --git a/src/upd8.js b/src/upd8.js
index db73c412..ff7d7c5c 100755
--- a/src/upd8.js
+++ b/src/upd8.js
@@ -1179,7 +1179,9 @@ async function main() {
     });
 
     const languageDataFiles = await traverse(langPath, {
-      filterFile: name => path.extname(name) === '.json',
+      filterFile: name =>
+        path.extname(name) === '.json' ||
+        path.extname(name) === '.yaml',
       pathStyle: 'device',
     });
 
-- 
cgit 1.3.0-6-gf8a5


From b053fa14052aaa24883e73a3f899016f963b5d43 Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Tue, 14 Nov 2023 21:45:08 -0400
Subject: data: expose CacheableObject directly via #cacheable-object import

---
 src/upd8.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/upd8.js')

diff --git a/src/upd8.js b/src/upd8.js
index 408ad884..3d7da800 100755
--- a/src/upd8.js
+++ b/src/upd8.js
@@ -38,12 +38,12 @@ import {fileURLToPath} from 'node:url';
 
 import wrap from 'word-wrap';
 
+import CacheableObject from '#cacheable-object';
 import {displayCompositeCacheAnalysis} from '#composite';
 import {processLanguageFile} from '#language';
 import {isMain, traverse} from '#node-utils';
 import bootRepl from '#repl';
 import {empty, showAggregate, withEntries} from '#sugar';
-import {CacheableObject} from '#things';
 import {generateURLs, urlSpec} from '#urls';
 import {sortByName} from '#wiki-data';
 
-- 
cgit 1.3.0-6-gf8a5