From 91e5b761aaf79a05f741a1ed131e2e6325228e22 Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Thu, 29 May 2025 08:59:56 -0400 Subject: [PATCH 01/17] Testing new electronite version --- package-lock.json | 28 ++++++++++++++-------------- package.json | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3c4594bc39..85aa2081ce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "GPL-2.0", "dependencies": { "@craco/craco": "5.6.4", - "@electron/remote": "2.0.7", + "@electron/remote": "2.1.2", "@material-ui/core": "4.12.3", "@material-ui/icons": "4.11.2", "@neutrinog/electron-dl": "1.11.1", @@ -101,7 +101,7 @@ "cross-env": "7.0.2", "css-loader": "3.4.2", "electron-devtools-installer": "^3.2.0", - "electronite": "25.3.2-graphite", + "electronite": "file:../../Misc/electronite-cli/electronite-36.2.1-graphite-beta.tgz", "electronite-packager": "17.1.1-graphite", "enzyme": "3.8.0", "enzyme-adapter-react-16": "1.8.0", @@ -2279,9 +2279,9 @@ } }, "node_modules/@electron/remote": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.0.7.tgz", - "integrity": "sha512-IjtMlSrkSmWNSnsvM0l2PQ3a50xFjco4M+arRi6BiziimgctNF8w8LB5NcRTs43OQZG91U/KGTWd89G1Fw7muA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.2.tgz", + "integrity": "sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==", "peerDependencies": { "electron": ">= 13.0.0" } @@ -9131,11 +9131,12 @@ "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" }, "node_modules/electronite": { - "version": "25.3.2-graphite", - "resolved": "https://registry.npmjs.org/electronite/-/electronite-25.3.2-graphite.tgz", - "integrity": "sha512-1ehbaTydQQ6xaAhwF7rkgcDNUx0xb10swjuMmTBeSr6a0xs+9KTyPJQWKSjfRLv6iHWL85s+1GDpk7XmoNsd5Q==", + "version": "36.2.1-graphite-beta", + "resolved": "file:../../Misc/electronite-cli/electronite-36.2.1-graphite-beta.tgz", + "integrity": "sha512-EGJoOv7ynmGJ5/zrco6J0XKEbZa83p18mw5UNJy9lxy26Ey66HUy2ueeP4ldA6FRLQ3a/cO95YU201hl8UqZJQ==", "dev": true, "hasInstallScript": true, + "license": "MIT", "dependencies": { "@electron/get": "^1.0.1", "@types/node": "^14.6.2", @@ -30086,9 +30087,9 @@ } }, "@electron/remote": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.0.7.tgz", - "integrity": "sha512-IjtMlSrkSmWNSnsvM0l2PQ3a50xFjco4M+arRi6BiziimgctNF8w8LB5NcRTs43OQZG91U/KGTWd89G1Fw7muA==" + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.2.tgz", + "integrity": "sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==" }, "@electron/universal": { "version": "1.3.4", @@ -35595,9 +35596,8 @@ "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" }, "electronite": { - "version": "25.3.2-graphite", - "resolved": "https://registry.npmjs.org/electronite/-/electronite-25.3.2-graphite.tgz", - "integrity": "sha512-1ehbaTydQQ6xaAhwF7rkgcDNUx0xb10swjuMmTBeSr6a0xs+9KTyPJQWKSjfRLv6iHWL85s+1GDpk7XmoNsd5Q==", + "version": "file:../../Misc/electronite-cli/electronite-36.2.1-graphite-beta.tgz", + "integrity": "sha512-EGJoOv7ynmGJ5/zrco6J0XKEbZa83p18mw5UNJy9lxy26Ey66HUy2ueeP4ldA6FRLQ3a/cO95YU201hl8UqZJQ==", "dev": true, "requires": { "@electron/get": "^1.0.1", diff --git a/package.json b/package.json index 703e6e1d43..15be3f1c68 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "cross-env": "7.0.2", "css-loader": "3.4.2", "electron-devtools-installer": "^3.2.0", - "electronite": "25.3.2-graphite", + "electronite": "file:../../Misc/electronite-cli/electronite-36.2.1-graphite-beta.tgz", "electronite-packager": "17.1.1-graphite", "enzyme": "3.8.0", "enzyme-adapter-react-16": "1.8.0", @@ -122,7 +122,7 @@ }, "dependencies": { "@craco/craco": "5.6.4", - "@electron/remote": "2.0.7", + "@electron/remote": "2.1.2", "@material-ui/core": "4.12.3", "@material-ui/icons": "4.11.2", "@neutrinog/electron-dl": "1.11.1", From 29664ab1e45f94b1e8bf699e40507aaeaf6f1665 Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Thu, 29 May 2025 09:22:19 -0400 Subject: [PATCH 02/17] Testing new electronite version --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 85aa2081ce..39588fffd4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -101,7 +101,7 @@ "cross-env": "7.0.2", "css-loader": "3.4.2", "electron-devtools-installer": "^3.2.0", - "electronite": "file:../../Misc/electronite-cli/electronite-36.2.1-graphite-beta.tgz", + "electronite": "36.2.1-graphite-beta", "electronite-packager": "17.1.1-graphite", "enzyme": "3.8.0", "enzyme-adapter-react-16": "1.8.0", @@ -9132,11 +9132,10 @@ }, "node_modules/electronite": { "version": "36.2.1-graphite-beta", - "resolved": "file:../../Misc/electronite-cli/electronite-36.2.1-graphite-beta.tgz", + "resolved": "https://registry.npmjs.org/electronite/-/electronite-36.2.1-graphite-beta.tgz", "integrity": "sha512-EGJoOv7ynmGJ5/zrco6J0XKEbZa83p18mw5UNJy9lxy26Ey66HUy2ueeP4ldA6FRLQ3a/cO95YU201hl8UqZJQ==", "dev": true, "hasInstallScript": true, - "license": "MIT", "dependencies": { "@electron/get": "^1.0.1", "@types/node": "^14.6.2", @@ -35596,7 +35595,8 @@ "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" }, "electronite": { - "version": "file:../../Misc/electronite-cli/electronite-36.2.1-graphite-beta.tgz", + "version": "36.2.1-graphite-beta", + "resolved": "https://registry.npmjs.org/electronite/-/electronite-36.2.1-graphite-beta.tgz", "integrity": "sha512-EGJoOv7ynmGJ5/zrco6J0XKEbZa83p18mw5UNJy9lxy26Ey66HUy2ueeP4ldA6FRLQ3a/cO95YU201hl8UqZJQ==", "dev": true, "requires": { diff --git a/package.json b/package.json index 15be3f1c68..8d626794db 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "cross-env": "7.0.2", "css-loader": "3.4.2", "electron-devtools-installer": "^3.2.0", - "electronite": "file:../../Misc/electronite-cli/electronite-36.2.1-graphite-beta.tgz", + "electronite": "36.2.1-graphite-beta", "electronite-packager": "17.1.1-graphite", "enzyme": "3.8.0", "enzyme-adapter-react-16": "1.8.0", From aed8f12a7b609c2d199c4231dd22dc5973a07d25 Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Thu, 29 May 2025 09:40:50 -0400 Subject: [PATCH 03/17] Testing new electronite version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8d626794db..207f3d721d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "translationCore", "productName": "translationCore", - "version": "3.6.10", + "version": "3.6.11", "minCompatibleVersion": "3.6.6", "manifestVersion": "8", "description": "A bridge between TS and TM", From 2ae18f44e58da87d2487278115f2b83282c0665e Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Mon, 2 Jun 2025 07:05:44 -0400 Subject: [PATCH 04/17] Removed linux arm64 build --- .github/workflows/main.yml | 30 +++++++++++++++--------------- package.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 84be9cd108..9545dc79c4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -214,21 +214,21 @@ jobs: npm run build-linux # arm64 - - name: Set arm64 MAX artifact name - run: echo "ARTIFACT_ARM64=$(echo "$APP_NAME-linux-arm64-$APP_VERSION-MAX-$HASH.deb")" >> $GITHUB_ENV - - - name: Set arm64 LITE artifact name - if: ${{ env.TRIM == '1' }} - run: echo "ARTIFACT_ARM64=$(echo "$APP_NAME-linux-arm64-$APP_VERSION-LITE-$HASH.deb")" >> $GITHUB_ENV - - - name: bundle arm64 linux - run: ./node_modules/.bin/gulp release-linux-deb-arm64 --out=artifacts/arm64/$ARTIFACT_ARM64 - - - uses: actions/upload-artifact@v4 - name: Upload arm64 artifacts - with: - name: ${{ env.ARTIFACT_ARM64 }} - path: artifacts/arm64/ +# - name: Set arm64 MAX artifact name +# run: echo "ARTIFACT_ARM64=$(echo "$APP_NAME-linux-arm64-$APP_VERSION-MAX-$HASH.deb")" >> $GITHUB_ENV +# +# - name: Set arm64 LITE artifact name +# if: ${{ env.TRIM == '1' }} +# run: echo "ARTIFACT_ARM64=$(echo "$APP_NAME-linux-arm64-$APP_VERSION-LITE-$HASH.deb")" >> $GITHUB_ENV +# +# - name: bundle arm64 linux +# run: ./node_modules/.bin/gulp release-linux-deb-arm64 --out=artifacts/arm64/$ARTIFACT_ARM64 +# +# - uses: actions/upload-artifact@v4 +# name: Upload arm64 artifacts +# with: +# name: ${{ env.ARTIFACT_ARM64 }} +# path: artifacts/arm64/ # x64 - name: Set x64 MAX artifact name diff --git a/package.json b/package.json index 207f3d721d..d12f017659 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "electronite-start-logging": "electronite . --enable-logging", "electronite-build": "electronite-packager ./build --out=dist --icon=src/images/icon.icns", "electronite-build-macos": "electronite-packager ./build --out=dist --arch=universal,x64 --icon=src/images/icon.icns", - "electronite-build-linux": "electronite-packager ./build --out=dist --arch=x64,arm64 --icon=src/images/icon.icns", + "electronite-build-linux": "electronite-packager ./build --out=dist --arch=x64 --icon=src/images/icon.icns", "electronite-build-win": "electronite-packager ./build --out=dist --arch=ia32,x64 --icon=src/images/icon.ico", "react-start": "craco start", "react-build": "craco build", From 1e8296e17684835a8c670caceceac27b69090f62 Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Mon, 2 Jun 2025 07:39:42 -0400 Subject: [PATCH 05/17] Using new electronite version --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 39588fffd4..8148d5b362 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "translationCore", - "version": "3.6.10", + "version": "3.6.11", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "translationCore", - "version": "3.6.10", + "version": "3.6.11", "license": "GPL-2.0", "dependencies": { "@craco/craco": "5.6.4", @@ -101,7 +101,7 @@ "cross-env": "7.0.2", "css-loader": "3.4.2", "electron-devtools-installer": "^3.2.0", - "electronite": "36.2.1-graphite-beta", + "electronite": "36.2.1-graphite", "electronite-packager": "17.1.1-graphite", "enzyme": "3.8.0", "enzyme-adapter-react-16": "1.8.0", @@ -9131,9 +9131,9 @@ "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" }, "node_modules/electronite": { - "version": "36.2.1-graphite-beta", - "resolved": "https://registry.npmjs.org/electronite/-/electronite-36.2.1-graphite-beta.tgz", - "integrity": "sha512-EGJoOv7ynmGJ5/zrco6J0XKEbZa83p18mw5UNJy9lxy26Ey66HUy2ueeP4ldA6FRLQ3a/cO95YU201hl8UqZJQ==", + "version": "36.2.1-graphite", + "resolved": "https://registry.npmjs.org/electronite/-/electronite-36.2.1-graphite.tgz", + "integrity": "sha512-wCL3DdzpnKWsxZDT8jPZS8VgkYsADFc04Dgue9STTSbEzjCcHOfQIRr1qcGNhW4jyWYbX6OrxmyfzT4hjXQLVw==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -35595,9 +35595,9 @@ "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" }, "electronite": { - "version": "36.2.1-graphite-beta", - "resolved": "https://registry.npmjs.org/electronite/-/electronite-36.2.1-graphite-beta.tgz", - "integrity": "sha512-EGJoOv7ynmGJ5/zrco6J0XKEbZa83p18mw5UNJy9lxy26Ey66HUy2ueeP4ldA6FRLQ3a/cO95YU201hl8UqZJQ==", + "version": "36.2.1-graphite", + "resolved": "https://registry.npmjs.org/electronite/-/electronite-36.2.1-graphite.tgz", + "integrity": "sha512-wCL3DdzpnKWsxZDT8jPZS8VgkYsADFc04Dgue9STTSbEzjCcHOfQIRr1qcGNhW4jyWYbX6OrxmyfzT4hjXQLVw==", "dev": true, "requires": { "@electron/get": "^1.0.1", diff --git a/package.json b/package.json index d12f017659..e532c4cae3 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "cross-env": "7.0.2", "css-loader": "3.4.2", "electron-devtools-installer": "^3.2.0", - "electronite": "36.2.1-graphite-beta", + "electronite": "36.2.1-graphite", "electronite-packager": "17.1.1-graphite", "enzyme": "3.8.0", "enzyme-adapter-react-16": "1.8.0", From 85e892bcd0148c4bec117676b8b3fdf92b41e51a Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Wed, 4 Jun 2025 19:01:52 -0400 Subject: [PATCH 06/17] restored linux arm64 build and removed intel x64 build --- .github/workflows/main.yml | 62 +++++++++++++++++++------------------- package.json | 4 +-- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9545dc79c4..2e1c212eee 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -214,21 +214,21 @@ jobs: npm run build-linux # arm64 -# - name: Set arm64 MAX artifact name -# run: echo "ARTIFACT_ARM64=$(echo "$APP_NAME-linux-arm64-$APP_VERSION-MAX-$HASH.deb")" >> $GITHUB_ENV -# -# - name: Set arm64 LITE artifact name -# if: ${{ env.TRIM == '1' }} -# run: echo "ARTIFACT_ARM64=$(echo "$APP_NAME-linux-arm64-$APP_VERSION-LITE-$HASH.deb")" >> $GITHUB_ENV -# -# - name: bundle arm64 linux -# run: ./node_modules/.bin/gulp release-linux-deb-arm64 --out=artifacts/arm64/$ARTIFACT_ARM64 -# -# - uses: actions/upload-artifact@v4 -# name: Upload arm64 artifacts -# with: -# name: ${{ env.ARTIFACT_ARM64 }} -# path: artifacts/arm64/ + - name: Set arm64 MAX artifact name + run: echo "ARTIFACT_ARM64=$(echo "$APP_NAME-linux-arm64-$APP_VERSION-MAX-$HASH.deb")" >> $GITHUB_ENV + + - name: Set arm64 LITE artifact name + if: ${{ env.TRIM == '1' }} + run: echo "ARTIFACT_ARM64=$(echo "$APP_NAME-linux-arm64-$APP_VERSION-LITE-$HASH.deb")" >> $GITHUB_ENV + + - name: bundle arm64 linux + run: ./node_modules/.bin/gulp release-linux-deb-arm64 --out=artifacts/arm64/$ARTIFACT_ARM64 + + - uses: actions/upload-artifact@v4 + name: Upload arm64 artifacts + with: + name: ${{ env.ARTIFACT_ARM64 }} + path: artifacts/arm64/ # x64 - name: Set x64 MAX artifact name @@ -470,22 +470,22 @@ jobs: echo "Building $APP_VERSION-$HASH" npm run build-macos - # x64 - - name: Set x64 MAX artifact name - run: echo "ARTIFACT_X64=$(echo "$APP_NAME-macos-x64-$APP_VERSION-MAX-$HASH.dmg")" >> $GITHUB_ENV - - - name: Set x64 LITE artifact name - if: ${{ env.TRIM == '1' }} - run: echo "ARTIFACT_X64=$(echo "$APP_NAME-macos-x64-$APP_VERSION-LITE-$HASH.dmg")" >> $GITHUB_ENV - - - name: bundle x64 macOS - run: ./node_modules/.bin/gulp release-macos --out=artifacts/x64/$ARTIFACT_X64 - - - uses: actions/upload-artifact@v4 - name: Upload x64 artifacts - with: - name: ${{ env.ARTIFACT_X64 }} - path: artifacts/x64/ +# # x64 +# - name: Set x64 MAX artifact name +# run: echo "ARTIFACT_X64=$(echo "$APP_NAME-macos-x64-$APP_VERSION-MAX-$HASH.dmg")" >> $GITHUB_ENV +# +# - name: Set x64 LITE artifact name +# if: ${{ env.TRIM == '1' }} +# run: echo "ARTIFACT_X64=$(echo "$APP_NAME-macos-x64-$APP_VERSION-LITE-$HASH.dmg")" >> $GITHUB_ENV +# +# - name: bundle x64 macOS +# run: ./node_modules/.bin/gulp release-macos --out=artifacts/x64/$ARTIFACT_X64 +# +# - uses: actions/upload-artifact@v4 +# name: Upload x64 artifacts +# with: +# name: ${{ env.ARTIFACT_X64 }} +# path: artifacts/x64/ # universal build - name: Set universal MAX artifact name diff --git a/package.json b/package.json index e532c4cae3..527e4e2c44 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,8 @@ "electronite-start": "electronite . ", "electronite-start-logging": "electronite . --enable-logging", "electronite-build": "electronite-packager ./build --out=dist --icon=src/images/icon.icns", - "electronite-build-macos": "electronite-packager ./build --out=dist --arch=universal,x64 --icon=src/images/icon.icns", - "electronite-build-linux": "electronite-packager ./build --out=dist --arch=x64 --icon=src/images/icon.icns", + "electronite-build-macos": "electronite-packager ./build --out=dist --arch=universal --icon=src/images/icon.icns", + "electronite-build-linux": "electronite-packager ./build --out=dist --arch=x64,arm64 --icon=src/images/icon.icns", "electronite-build-win": "electronite-packager ./build --out=dist --arch=ia32,x64 --icon=src/images/icon.ico", "react-start": "craco start", "react-build": "craco build", From 2c106aec40056761f446a6f7519a6acfe0f61b8b Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Thu, 5 Jun 2025 11:16:41 -0400 Subject: [PATCH 07/17] on Linux, adding the --no-sandbox option --- .../opt/translationcore/unfoldingword-translationcore.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/deb/opt/translationcore/unfoldingword-translationcore.desktop b/scripts/deb/opt/translationcore/unfoldingword-translationcore.desktop index 6e028f3eb2..c409aa7097 100644 --- a/scripts/deb/opt/translationcore/unfoldingword-translationcore.desktop +++ b/scripts/deb/opt/translationcore/unfoldingword-translationcore.desktop @@ -4,7 +4,7 @@ Name=translationCore Comment=Platform for checking and managing Bible translation projects Type=Application TryExec=/opt/translationcore/translationCore -Exec=/opt/translationcore/translationCore +Exec=/opt/translationcore/translationCore --no-sandbox Icon=unfoldingword-translationcore Terminal=false Categories=Office; From a1154a23686015d8ae2d3a3bbf401d48fdfb3cc9 Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Thu, 5 Jun 2025 12:06:42 -0400 Subject: [PATCH 08/17] on Linux, removing the --no-sandbox option. turning off sandbox for the browser windows in app --- electronite/index.js | 2 ++ .../opt/translationcore/unfoldingword-translationcore.desktop | 2 +- src/js/helpers/PrintPreviewHelpers.js | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/electronite/index.js b/electronite/index.js index e89138fdc9..07053398de 100644 --- a/electronite/index.js +++ b/electronite/index.js @@ -99,6 +99,7 @@ function createMainWindow(qaMode = '') { contextIsolation: false, enableRemoteModule: true, additionalArguments, + sandbox: false, }, }; @@ -160,6 +161,7 @@ function createSplashWindow() { contextIsolation: true, enableRemoteModule: true, preload: path.join(__dirname, 'preloadSplash.js'), + sandbox: false, }, frame: false, show: true, diff --git a/scripts/deb/opt/translationcore/unfoldingword-translationcore.desktop b/scripts/deb/opt/translationcore/unfoldingword-translationcore.desktop index c409aa7097..6e028f3eb2 100644 --- a/scripts/deb/opt/translationcore/unfoldingword-translationcore.desktop +++ b/scripts/deb/opt/translationcore/unfoldingword-translationcore.desktop @@ -4,7 +4,7 @@ Name=translationCore Comment=Platform for checking and managing Bible translation projects Type=Application TryExec=/opt/translationcore/translationCore -Exec=/opt/translationcore/translationCore --no-sandbox +Exec=/opt/translationcore/translationCore Icon=unfoldingword-translationcore Terminal=false Categories=Office; diff --git a/src/js/helpers/PrintPreviewHelpers.js b/src/js/helpers/PrintPreviewHelpers.js index 2eb4776650..9deb449a66 100644 --- a/src/js/helpers/PrintPreviewHelpers.js +++ b/src/js/helpers/PrintPreviewHelpers.js @@ -131,6 +131,7 @@ function createPreviewWindow(html) { width: 850, height: 900, webPreferences: { + sandbox: false, webSecurity: false, // have to do this to load local files }, }); From 120b6337610cd6b304e347698ba4fd987bf110ba Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Thu, 5 Jun 2025 14:57:23 -0400 Subject: [PATCH 09/17] on Linux, fix permissions on chrome-sandbox --- scripts/deb/DEBIAN/postinst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/deb/DEBIAN/postinst b/scripts/deb/DEBIAN/postinst index f51d9f36f8..ee580ad078 100755 --- a/scripts/deb/DEBIAN/postinst +++ b/scripts/deb/DEBIAN/postinst @@ -1,5 +1,8 @@ #!/bin/bash +# set sandbox protections +chmod 4755 /opt/translationcore/chrome-sandbox + # install desktop launcher xdg-desktop-menu install /opt/translationcore/unfoldingword-translationcore.desktop From 1bd6b18b663dd6410fa3e24688795bc9cebc3919 Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Mon, 30 Jun 2025 15:22:45 -0400 Subject: [PATCH 10/17] Testing v37.1.0 electronite --- package-lock.json | 26 +++++++++++++------------- package.json | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8148d5b362..e9ed3bb5b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -101,7 +101,7 @@ "cross-env": "7.0.2", "css-loader": "3.4.2", "electron-devtools-installer": "^3.2.0", - "electronite": "36.2.1-graphite", + "electronite": "37.1.0-graphite-beta", "electronite-packager": "17.1.1-graphite", "enzyme": "3.8.0", "enzyme-adapter-react-16": "1.8.0", @@ -9131,9 +9131,9 @@ "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" }, "node_modules/electronite": { - "version": "36.2.1-graphite", - "resolved": "https://registry.npmjs.org/electronite/-/electronite-36.2.1-graphite.tgz", - "integrity": "sha512-wCL3DdzpnKWsxZDT8jPZS8VgkYsADFc04Dgue9STTSbEzjCcHOfQIRr1qcGNhW4jyWYbX6OrxmyfzT4hjXQLVw==", + "version": "37.1.0-graphite-beta", + "resolved": "https://registry.npmjs.org/electronite/-/electronite-37.1.0-graphite-beta.tgz", + "integrity": "sha512-Gg9J9rJcX/kSzc9/SLS3HYetW1itPjcy3AKnrIFx9MJt7w48WCwSNZFVK/x7cIcAgB1Lz8Kh7rzajcKzebElBQ==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -9492,9 +9492,9 @@ } }, "node_modules/electronite/node_modules/@types/node": { - "version": "14.18.54", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.54.tgz", - "integrity": "sha512-uq7O52wvo2Lggsx1x21tKZgqkJpvwCseBBPtX/nKQfpVlEsLOb11zZ1CRsWUKvJF0+lzuA9jwvA7Pr2Wt7i3xw==", + "version": "14.18.63", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz", + "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==", "dev": true }, "node_modules/element-resize-detector": { @@ -35595,9 +35595,9 @@ "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" }, "electronite": { - "version": "36.2.1-graphite", - "resolved": "https://registry.npmjs.org/electronite/-/electronite-36.2.1-graphite.tgz", - "integrity": "sha512-wCL3DdzpnKWsxZDT8jPZS8VgkYsADFc04Dgue9STTSbEzjCcHOfQIRr1qcGNhW4jyWYbX6OrxmyfzT4hjXQLVw==", + "version": "37.1.0-graphite-beta", + "resolved": "https://registry.npmjs.org/electronite/-/electronite-37.1.0-graphite-beta.tgz", + "integrity": "sha512-Gg9J9rJcX/kSzc9/SLS3HYetW1itPjcy3AKnrIFx9MJt7w48WCwSNZFVK/x7cIcAgB1Lz8Kh7rzajcKzebElBQ==", "dev": true, "requires": { "@electron/get": "^1.0.1", @@ -35606,9 +35606,9 @@ }, "dependencies": { "@types/node": { - "version": "14.18.54", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.54.tgz", - "integrity": "sha512-uq7O52wvo2Lggsx1x21tKZgqkJpvwCseBBPtX/nKQfpVlEsLOb11zZ1CRsWUKvJF0+lzuA9jwvA7Pr2Wt7i3xw==", + "version": "14.18.63", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz", + "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==", "dev": true } } diff --git a/package.json b/package.json index 527e4e2c44..348921f698 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "cross-env": "7.0.2", "css-loader": "3.4.2", "electron-devtools-installer": "^3.2.0", - "electronite": "36.2.1-graphite", + "electronite": "37.1.0-graphite-beta", "electronite-packager": "17.1.1-graphite", "enzyme": "3.8.0", "enzyme-adapter-react-16": "1.8.0", From 3d02bd2fec36667e945a58d556810b6cabb76338 Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Tue, 1 Jul 2025 13:29:27 -0400 Subject: [PATCH 11/17] update github actions runner to use windows-2022 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2e1c212eee..1ef3dbdfcc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -253,7 +253,7 @@ jobs: matrix: trim: [ 0, 1 ] needs: test - runs-on: windows-2019 + runs-on: windows-2022 env: TC_HELP_DESK_TOKEN: ${{ secrets.TC_HELP_DESK_TOKEN }} TC_HELP_DESK_EMAIL: ${{ secrets.TC_HELP_DESK_EMAIL }} From 448ca89ca3d58af7da93d35b21877ac50e950937 Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Tue, 1 Jul 2025 13:57:34 -0400 Subject: [PATCH 12/17] changing to build arm64 for windows --- .github/workflows/main.yml | 23 ++++++++++++----------- package.json | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1ef3dbdfcc..08bd825385 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -358,26 +358,27 @@ jobs: with: name: ${{ env.ARTIFACT_X64 }} path: artifacts/x64/ -# x32 - - name: Set x32 MAX artifact name - run: echo "ARTIFACT_X32=$(echo "${{ env.APP_NAME }}-win-x32-${{ env.APP_VERSION }}-MAX-${{ env.HASH }}.exe")" >> $GITHUB_ENV + +# arm64 + - name: Set arm64 MAX artifact name + run: echo "ARTIFACT_ARM64=$(echo "${{ env.APP_NAME }}-win-arm64-${{ env.APP_VERSION }}-MAX-${{ env.HASH }}.exe")" >> $GITHUB_ENV shell: bash - - name: Set x32 LITE artifact name + - name: Set arm64 LITE artifact name if: ${{ env.TRIM == '1' }} - run: echo "ARTIFACT_X32=$(echo "${{ env.APP_NAME }}-win-x32-${{ env.APP_VERSION }}-LITE-${{ env.HASH }}.exe")" >> $GITHUB_ENV + run: echo "ARTIFACT_ARM64=$(echo "${{ env.APP_NAME }}-win-arm64-${{ env.APP_VERSION }}-LITE-${{ env.HASH }}.exe")" >> $GITHUB_ENV shell: bash - - name: bundle x32 windows + - name: bundle arm64 windows run: | - echo "Generating executable artifacts/x32/${{ env.ARTIFACT_X32 }}" - ./node_modules/.bin/gulp release-win32 --out=artifacts/x32/${{ env.ARTIFACT_X32 }} + echo "Generating executable artifacts/arm64/${{ env.ARTIFACT_ARM64 }}" + ./node_modules/.bin/gulp release-win32 --out=artifacts/arm64/${{ env.ARTIFACT_ARM64 }} - uses: actions/upload-artifact@v4 - name: Upload x32 artifacts + name: Upload arm64 artifacts with: - name: ${{ env.ARTIFACT_X32 }} - path: artifacts/x32/ + name: ${{ env.ARTIFACT_ARM64 }} + path: artifacts/arm64/ build-macos: name: Build macOS diff --git a/package.json b/package.json index 348921f698..27280c70b9 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "electronite-build": "electronite-packager ./build --out=dist --icon=src/images/icon.icns", "electronite-build-macos": "electronite-packager ./build --out=dist --arch=universal --icon=src/images/icon.icns", "electronite-build-linux": "electronite-packager ./build --out=dist --arch=x64,arm64 --icon=src/images/icon.icns", - "electronite-build-win": "electronite-packager ./build --out=dist --arch=ia32,x64 --icon=src/images/icon.ico", + "electronite-build-win": "electronite-packager ./build --out=dist --arch=x64,arm64 --icon=src/images/icon.ico", "react-start": "craco start", "react-build": "craco build", "build-main": "webpack --config electronite/webpack.config.js", From b122f17bae8f5eabaeb4315769dbb7751daaf5dc Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Thu, 3 Jul 2025 12:13:07 -0400 Subject: [PATCH 13/17] changing back to build x86 for windows --- .github/workflows/main.yml | 9 ++++----- package.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 08bd825385..a45fafb299 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -358,13 +358,12 @@ jobs: with: name: ${{ env.ARTIFACT_X64 }} path: artifacts/x64/ - -# arm64 - - name: Set arm64 MAX artifact name - run: echo "ARTIFACT_ARM64=$(echo "${{ env.APP_NAME }}-win-arm64-${{ env.APP_VERSION }}-MAX-${{ env.HASH }}.exe")" >> $GITHUB_ENV +# x32 + - name: Set x32 MAX artifact name + run: echo "ARTIFACT_X32=$(echo "${{ env.APP_NAME }}-win-x32-${{ env.APP_VERSION }}-MAX-${{ env.HASH }}.exe")" >> $GITHUB_ENV shell: bash - - name: Set arm64 LITE artifact name + - name: Set x32 LITE artifact name if: ${{ env.TRIM == '1' }} run: echo "ARTIFACT_ARM64=$(echo "${{ env.APP_NAME }}-win-arm64-${{ env.APP_VERSION }}-LITE-${{ env.HASH }}.exe")" >> $GITHUB_ENV shell: bash diff --git a/package.json b/package.json index 27280c70b9..348921f698 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "electronite-build": "electronite-packager ./build --out=dist --icon=src/images/icon.icns", "electronite-build-macos": "electronite-packager ./build --out=dist --arch=universal --icon=src/images/icon.icns", "electronite-build-linux": "electronite-packager ./build --out=dist --arch=x64,arm64 --icon=src/images/icon.icns", - "electronite-build-win": "electronite-packager ./build --out=dist --arch=x64,arm64 --icon=src/images/icon.ico", + "electronite-build-win": "electronite-packager ./build --out=dist --arch=ia32,x64 --icon=src/images/icon.ico", "react-start": "craco start", "react-build": "craco build", "build-main": "webpack --config electronite/webpack.config.js", From f876d473f3bd2091b3089996e0a6cdf85038cf89 Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Sat, 5 Jul 2025 09:47:31 -0400 Subject: [PATCH 14/17] adding back to build arm64 for windows --- .github/workflows/main.yml | 31 +++++++++++++++++++++++++++---- package.json | 2 +- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a45fafb299..a98d78cfad 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -332,6 +332,7 @@ jobs: run: | echo "Building $APP_VERSION-$HASH" npm run build-win + # x64 - name: Set x64 MAX artifact name run: echo "ARTIFACT_X64=$(echo "${{ env.APP_NAME }}-win-x64-${{ env.APP_VERSION }}-MAX-${{ env.HASH }}.exe")" >> $GITHUB_ENV @@ -358,12 +359,13 @@ jobs: with: name: ${{ env.ARTIFACT_X64 }} path: artifacts/x64/ -# x32 - - name: Set x32 MAX artifact name - run: echo "ARTIFACT_X32=$(echo "${{ env.APP_NAME }}-win-x32-${{ env.APP_VERSION }}-MAX-${{ env.HASH }}.exe")" >> $GITHUB_ENV + + # arm64 + - name: Set arm64 MAX artifact name + run: echo "ARTIFACT_ARM64=$(echo "${{ env.APP_NAME }}-win-arm64-${{ env.APP_VERSION }}-MAX-${{ env.HASH }}.exe")" >> $GITHUB_ENV shell: bash - - name: Set x32 LITE artifact name + - name: Set arm64 LITE artifact name if: ${{ env.TRIM == '1' }} run: echo "ARTIFACT_ARM64=$(echo "${{ env.APP_NAME }}-win-arm64-${{ env.APP_VERSION }}-LITE-${{ env.HASH }}.exe")" >> $GITHUB_ENV shell: bash @@ -379,6 +381,27 @@ jobs: name: ${{ env.ARTIFACT_ARM64 }} path: artifacts/arm64/ + # x32 + - name: Set x32 MAX artifact name + run: echo "ARTIFACT_X32=$(echo "${{ env.APP_NAME }}-win-x32-${{ env.APP_VERSION }}-MAX-${{ env.HASH }}.exe")" >> $GITHUB_ENV + shell: bash + + - name: Set x32 LITE artifact name + if: ${{ env.TRIM == '1' }} + run: echo "ARTIFACT_X32=$(echo "${{ env.APP_NAME }}-win-x32-${{ env.APP_VERSION }}-LITE-${{ env.HASH }}.exe")" >> $GITHUB_ENV + shell: bash + + - name: bundle x32 windows + run: | + echo "Generating executable artifacts/x32/${{ env.ARTIFACT_X32 }}" + ./node_modules/.bin/gulp release-win32 --out=artifacts/x32/${{ env.ARTIFACT_X32 }} + + - uses: actions/upload-artifact@v4 + name: Upload x32 artifacts + with: + name: ${{ env.ARTIFACT_X32 }} + path: artifacts/x32/ + build-macos: name: Build macOS strategy: diff --git a/package.json b/package.json index 348921f698..0f2e07fd41 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "electronite-build": "electronite-packager ./build --out=dist --icon=src/images/icon.icns", "electronite-build-macos": "electronite-packager ./build --out=dist --arch=universal --icon=src/images/icon.icns", "electronite-build-linux": "electronite-packager ./build --out=dist --arch=x64,arm64 --icon=src/images/icon.icns", - "electronite-build-win": "electronite-packager ./build --out=dist --arch=ia32,x64 --icon=src/images/icon.ico", + "electronite-build-win": "electronite-packager ./build --out=dist --arch=ia32,x64,arm64 --icon=src/images/icon.ico", "react-start": "craco start", "react-build": "craco build", "build-main": "webpack --config electronite/webpack.config.js", From e56197e0b0f30f18eba2fa8b25cb3c3d064eb6bc Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Mon, 7 Jul 2025 08:47:01 -0400 Subject: [PATCH 15/17] update to use released v37.1.0 electronite --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index e9ed3bb5b4..bd57ea2e2c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -101,7 +101,7 @@ "cross-env": "7.0.2", "css-loader": "3.4.2", "electron-devtools-installer": "^3.2.0", - "electronite": "37.1.0-graphite-beta", + "electronite": "37.1.0-graphite", "electronite-packager": "17.1.1-graphite", "enzyme": "3.8.0", "enzyme-adapter-react-16": "1.8.0", @@ -9131,9 +9131,9 @@ "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" }, "node_modules/electronite": { - "version": "37.1.0-graphite-beta", - "resolved": "https://registry.npmjs.org/electronite/-/electronite-37.1.0-graphite-beta.tgz", - "integrity": "sha512-Gg9J9rJcX/kSzc9/SLS3HYetW1itPjcy3AKnrIFx9MJt7w48WCwSNZFVK/x7cIcAgB1Lz8Kh7rzajcKzebElBQ==", + "version": "37.1.0-graphite", + "resolved": "https://registry.npmjs.org/electronite/-/electronite-37.1.0-graphite.tgz", + "integrity": "sha512-NmGaJS1YDjNopoqPGILE6knOyFKdJQFOAehROsDhWyYYPQKsrMtFtsyHzMkFLnBt0zZCgHhRLb6B2fZFogsYXA==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -35595,9 +35595,9 @@ "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" }, "electronite": { - "version": "37.1.0-graphite-beta", - "resolved": "https://registry.npmjs.org/electronite/-/electronite-37.1.0-graphite-beta.tgz", - "integrity": "sha512-Gg9J9rJcX/kSzc9/SLS3HYetW1itPjcy3AKnrIFx9MJt7w48WCwSNZFVK/x7cIcAgB1Lz8Kh7rzajcKzebElBQ==", + "version": "37.1.0-graphite", + "resolved": "https://registry.npmjs.org/electronite/-/electronite-37.1.0-graphite.tgz", + "integrity": "sha512-NmGaJS1YDjNopoqPGILE6knOyFKdJQFOAehROsDhWyYYPQKsrMtFtsyHzMkFLnBt0zZCgHhRLb6B2fZFogsYXA==", "dev": true, "requires": { "@electron/get": "^1.0.1", diff --git a/package.json b/package.json index 0f2e07fd41..58b4d99bfb 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "cross-env": "7.0.2", "css-loader": "3.4.2", "electron-devtools-installer": "^3.2.0", - "electronite": "37.1.0-graphite-beta", + "electronite": "37.1.0-graphite", "electronite-packager": "17.1.1-graphite", "enzyme": "3.8.0", "enzyme-adapter-react-16": "1.8.0", From 123e3c506478d7cf7000f88b68ba28f6639cbbdd Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Wed, 20 Aug 2025 08:39:48 -0400 Subject: [PATCH 16/17] fix for ubuntu install --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 1a9b984f0e..0db65ec2af 100644 --- a/README.md +++ b/README.md @@ -59,3 +59,5 @@ You can view progress or help translate at [Crowdin](https://crowdin.com/project - example to build the app for mac: `npm i --legacy-peer-deps && npm run build-macos` - or do `build-win` or `build-linux` - then to create installer for MacOS: `./node_modules/.bin/gulp release-macos-universal --out=artifacts/universal/tCore-macos-universal.dmg` + +Note: updating to Electronite v37 From 5201554addb960751f85489c14226196b58acf81 Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Wed, 20 Aug 2025 08:55:54 -0400 Subject: [PATCH 17/17] bump --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0db65ec2af..33325d8039 100644 --- a/README.md +++ b/README.md @@ -60,4 +60,4 @@ You can view progress or help translate at [Crowdin](https://crowdin.com/project - or do `build-win` or `build-linux` - then to create installer for MacOS: `./node_modules/.bin/gulp release-macos-universal --out=artifacts/universal/tCore-macos-universal.dmg` -Note: updating to Electronite v37 +Note: updating to Electronite v37.1.0