diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bd11c0ce0b..a98d78cfad 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -359,7 +359,29 @@ jobs: with: name: ${{ env.ARTIFACT_X64 }} path: artifacts/x64/ -# x32 + + # 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 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 + + - name: bundle arm64 windows + run: | + 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 arm64 artifacts + with: + 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 @@ -471,22 +493,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 f11c15f11a..332919d1ed 100644 --- a/README.md +++ b/README.md @@ -60,3 +60,5 @@ 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.1.0 + 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..bd57ea2e2c 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": "37.1.0-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": "37.1.0-graphite", + "resolved": "https://registry.npmjs.org/electronite/-/electronite-37.1.0-graphite.tgz", + "integrity": "sha512-NmGaJS1YDjNopoqPGILE6knOyFKdJQFOAehROsDhWyYYPQKsrMtFtsyHzMkFLnBt0zZCgHhRLb6B2fZFogsYXA==", "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": { @@ -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": "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", @@ -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 9ca6730bf2..0bb2ed1dc6 100644 --- a/package.json +++ b/package.json @@ -19,9 +19,9 @@ "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", + "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", @@ -88,7 +88,7 @@ "cross-env": "7.0.2", "css-loader": "3.4.2", "electron-devtools-installer": "^3.2.0", - "electronite": "25.3.2-graphite", + "electronite": "37.1.0-graphite", "electronite-packager": "17.1.1-graphite", "enzyme": "3.8.0", "enzyme-adapter-react-16": "1.8.0", @@ -123,7 +123,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/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 }, });