Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

2 changes: 2 additions & 0 deletions electronite/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ function createMainWindow(qaMode = '') {
contextIsolation: false,
enableRemoteModule: true,
additionalArguments,
sandbox: false,
},
};

Expand Down Expand Up @@ -160,6 +161,7 @@ function createSplashWindow() {
contextIsolation: true,
enableRemoteModule: true,
preload: path.join(__dirname, 'preloadSplash.js'),
sandbox: false,
},
frame: false,
show: true,
Expand Down
32 changes: 16 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions scripts/deb/DEBIAN/postinst
Original file line number Diff line number Diff line change
@@ -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

Expand Down
1 change: 1 addition & 0 deletions src/js/helpers/PrintPreviewHelpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ function createPreviewWindow(html) {
width: 850,
height: 900,
webPreferences: {
sandbox: false,
webSecurity: false, // have to do this to load local files
},
});
Expand Down
Loading