Merge branch 'main' into 707-context-menus

# Conflicts: # extensions/package-lock.json # lib/platform-bible-react/dist/index.cjs # lib/platform-bible-react/dist/index.cjs.map # lib/platform-bible-react/dist/index.d.ts # lib/platform-bible-react/dist/index.js # lib/platform-bible-react/dist/index.js.map # lib/platform-bible-react/package-lock.json
paranext · Feb 26, 2024 · ee75b96 · ee75b96
2 parents 9ea642a + f3254e8
commit ee75b96
Show file tree

Hide file tree

Showing 53 changed files with 8,747 additions and 11,147 deletions.
diff --git a/cspell.json b/cspell.json
@@ -49,6 +49,7 @@
     "sillsdev",
     "steenwyk",
     "stringifiable",
+    "stringz",
     "stylelint",
     "Stylesheet",
     "typedefs",

diff --git a/extensions/lib/add-remotes.ts b/extensions/lib/add-remotes.ts
@@ -1,3 +1,4 @@
+import { includes } from 'platform-bible-utils';
 import {
   ERROR_STRINGS,
   MULTI_TEMPLATE_NAME,
@@ -13,7 +14,7 @@ import {
   try {
     await execGitCommand(`git remote add ${MULTI_TEMPLATE_NAME} ${MULTI_TEMPLATE_URL}`);
   } catch (e) {
-    if (e.toString().toLowerCase().includes(ERROR_STRINGS.multiRemoteExists.toLowerCase()))
+    if (includes(e.toString().toLowerCase(), ERROR_STRINGS.multiRemoteExists.toLowerCase()))
       console.log(`Remote ${MULTI_TEMPLATE_NAME} already exists. This is likely not a problem.`);
     else {
       console.error(`Error on adding remote ${MULTI_TEMPLATE_NAME}: ${e}`);
@@ -25,7 +26,7 @@ import {
   try {
     await execGitCommand(`git remote add ${SINGLE_TEMPLATE_NAME} ${SINGLE_TEMPLATE_URL}`);
   } catch (e) {
-    if (e.toString().toLowerCase().includes(ERROR_STRINGS.singleRemoteExists.toLowerCase()))
+    if (includes(e.toString().toLowerCase(), ERROR_STRINGS.singleRemoteExists.toLowerCase()))
       console.log(`Remote ${SINGLE_TEMPLATE_NAME} already exists. This is likely not a problem.`);
     else {
       console.error(`Error on adding remote ${SINGLE_TEMPLATE_NAME}: ${e}`);

diff --git a/extensions/lib/update-from-templates.ts b/extensions/lib/update-from-templates.ts
@@ -1,3 +1,4 @@
+import { includes } from 'platform-bible-utils';
 import {
   ERROR_STRINGS,
   MULTI_TEMPLATE_BRANCH,
@@ -62,12 +63,10 @@ import { ExtensionInfo, getExtensions, subtreeRootFolder } from '../webpack/webp
       extensionsBasedOnTemplate.push(ext);
     } catch (e) {
       if (
-        e
-          .toString()
-          .toLowerCase()
-          .includes(
-            ERROR_STRINGS.subtreeNeverAdded.replace('{0}', ext.dirPathOSIndependent).toLowerCase(),
-          )
+        includes(
+          e.toString().toLowerCase(),
+          ERROR_STRINGS.subtreeNeverAdded.replace('{0}', ext.dirPathOSIndependent).toLowerCase(),
+        )
       )
         // If this folder isn't a subtree, it may be intentionally not based on the template. Continue
         console.warn(