Merge remote-tracking branch 'origin/develop'

Author: hahn-kev

README.md

@@ -1,5 +1,8 @@
 # Language Forge
 
+> [!IMPORTANT]  
+> [Language Forge is no longer developed and is in maintenance mode](https://community.software.sil.org/t/language-forge-in-maintenance-mode/10514). We will continue to support existing Language Forge projects and we encourage all users to try [FieldWorks Lite](https://lexbox.org/fw-lite).
+
 [Language Forge](https://languageforge.org) is an online service to collaborate on building a dictionary. Users should head on over to [languageforge.org](https://languageforge.org)
 
 ### Reporting Problems with the Language Forge Application

backup.mjs

@@ -8,6 +8,7 @@ import net from "net";
 // Expected arguments: first arg is project ID (5dbf805650b51914727e06c4) or URL (http://localhost:8080/app/lexicon/5dbf805650b51914727e06c4)
 // Second arg is "qa" or "staging" to copy from staging, "live" or "prod" or "production" to copy from production
 // NOTE: You must edit the context names below if they don't match the context names you have (see `kubectl config get-contexts` output)
+// A MONGO_PASS env var must be available for the selected environment
 
 // ===== EDIT THIS =====
 
@@ -112,12 +113,18 @@ if (process.argv.length < 3) {
   process.exit(2);
 }
 
+const mongoPass = process.env.MONGO_PASS;
+if (!mongoPass) {
+  console.warn("Please provide a MongoDB password in the MONGO_PASS environment variable");
+  process.exit(2);
+}
+
 let projId;
 const arg = process.argv[2];
 if (URL.canParse(arg)) {
   const url = new URL(arg);
   if (url.pathname.startsWith("/app/lexicon/")) {
-    projId = url.pathname.substring("/app/lexicon/".length);
+    projId = url.pathname.substring("/app/lexicon/".length).split("/")[0];
   } else {
     projId = url.pathname; // Will probably fail, but worth a try
   }
@@ -209,7 +216,7 @@ console.warn("If that doesn't look right, hit Ctrl+C NOW");
 await portForwardingPromise;
 console.warn("Port forwarding is ready. Setting up remote Mongo connection...");
 
-const remoteConnStr = `mongodb://localhost:${remoteMongoPort}`;
+const remoteConnStr = `mongodb://admin:${mongoPass}@localhost:${remoteMongoPort}`;
 remoteConn = await MongoClient.connect(remoteConnStr);
 
 console.warn("Remote Mongo connection established. Fetching project record...");

docker-compose.yml

@@ -107,6 +107,7 @@ services:
       - WAIT_HOSTS=db:27017
       - ENVIRONMENT=development
       - DATABASE=scriptureforge
+      - CHORUS_HG_EXE=chg
       - MONGODB_CONN=mongodb://db:27017
       - MONGODB_AUTHSOURCE=admin
       - LANGUAGE_DEPOT_API_TOKEN=bogus-development-token

docker/app/Dockerfile

@@ -10,6 +10,8 @@ WORKDIR /data
 # Copy in files needed for compilation, located in the repo root
 COPY package.json pnpm-lock.yaml ./
 
+# Install latest corepack version to work around a bug with signatures
+RUN npm install -g corepack@latest
 RUN corepack enable
 RUN pnpm install
 

docker/lfmerge/Dockerfile

@@ -1,2 +1,2 @@
-FROM ghcr.io/sillsdev/lfmerge:2.0.139
+FROM ghcr.io/sillsdev/lfmerge:2.0.141
 # Do not add anything to this Dockerfile, it should stay empty

docker/next-app/Dockerfile.next-app

@@ -7,6 +7,8 @@ COPY tsconfig.json pnpm-lock.yaml package.json postcss.config.cjs svelte.config.
 COPY src /app/src
 COPY static /app/static
 
+# Install latest corepack version to work around a bug with signatures
+RUN npm install -g corepack@latest
 RUN corepack enable
 RUN pnpm install
 RUN pnpm run build

docker/next-app/dev/Dockerfile

@@ -6,6 +6,8 @@ COPY tsconfig.json pnpm-lock.yaml package.json postcss.config.cjs svelte.config.
 COPY src /app/src
 COPY static /app/static
 
+# Install latest corepack version to work around a bug with signatures
+RUN npm install -g corepack@latest
 RUN corepack enable
 RUN pnpm install
 

docker/ui-builder/Dockerfile

@@ -5,6 +5,8 @@ WORKDIR /data
 
 COPY package.json pnpm-lock.yaml ./
 
+# Install latest corepack version to work around a bug with signatures
+RUN npm install -g corepack@latest
 RUN corepack enable
 RUN pnpm install
 

next-app/package.json

@@ -2,7 +2,7 @@
   "name": "next-app",
   "version": "0.0.1",
   "type": "module",
-  "packageManager": "pnpm@9.1.2",
+  "packageManager": "pnpm@9.11.0",
   "engines": {
     "node": ">=18",
     "pnpm": ">=9"

package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "Language Forge",
   "private": true,
-  "packageManager": "pnpm@9.1.2",
+  "packageManager": "pnpm@9.11.0",
   "engines": {
     "node": ">=18",
     "pnpm": ">=9"
@@ -51,7 +51,7 @@
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
-    "@playwright/test": "^1.29",
+    "@playwright/test": "^1.54",
     "@prettier/plugin-php": "^0.20.1",
     "@types/angular": "1.8.1",
     "@types/angular-mocks": "^1.7.0",