diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 84be9cd108..2e1c212eee 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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/README.md b/README.md index 1a9b984f0e..f11c15f11a 100644 --- a/README.md +++ b/README.md @@ -59,3 +59,4 @@ 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` + 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/package-lock.json b/package-lock.json index 3c4594bc39..8148d5b362 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,16 +1,16 @@ { "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", - "@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": "36.2.1-graphite", "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,9 +9131,9 @@ "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", + "resolved": "https://registry.npmjs.org/electronite/-/electronite-36.2.1-graphite.tgz", + "integrity": "sha512-wCL3DdzpnKWsxZDT8jPZS8VgkYsADFc04Dgue9STTSbEzjCcHOfQIRr1qcGNhW4jyWYbX6OrxmyfzT4hjXQLVw==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -30086,9 +30086,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 +35595,9 @@ "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": "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 703e6e1d43..527e4e2c44 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", @@ -19,7 +19,7 @@ "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-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", @@ -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": "36.2.1-graphite", "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", 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 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 }, });