Commit graph

232 commits

Author SHA1 Message Date
Christopher Willis-Ford
c36c5c90f4 use 32-bit Electron for NSIS installer
Use 'nsis:ia32' instead of just 'nsis' for the Windows direct-download
build. This means we explicitly request a 32-bit build rather than
allowing electron-builder to default; the default is currently to make a
64-bit build.
resolves #114
2020-06-03 16:33:49 -07:00
Chris Willis-Ford
6d9ab116bb
Merge pull request #120 from cwillisf/electron-8
Electron 8 & fix App Store submission
2020-06-03 16:09:03 -07:00
Christopher Willis-Ford
8f23ef1f64 3.10.4 2020-05-22 16:25:59 -07:00
Christopher Willis-Ford
7192ffe878 fix MAS build (!!!)
apparently the `com.apple.security.app-sandbox` entitlement and the
`hardenedRuntime: true` setting are mututally exclusive with
`electron-builder`, so the hardened runtime is now only used by non-MAS
builds ('mac' but not 'mas' or 'mas-dev')
2020-05-22 16:19:05 -07:00
Christopher Willis-Ford
1bc9f570cd allow non-notarized mac build for testing
Skipping notarization isn't strictly wrong, but needs a big warning
since the build probably won't run on Catalina.
2020-05-22 16:16:56 -07:00
Christopher Willis-Ford
73a2d3e015 allow reusing render process / fix deprecation warning 2020-05-22 16:16:22 -07:00
Christopher Willis-Ford
3cdcb199bd add settings for mas-dev build 2020-05-22 15:19:28 -07:00
Christopher Willis-Ford
229c42469d use minilog for logging, like scratch-gui 2020-05-20 17:05:00 -07:00
Christopher Willis-Ford
5abc787f1b 3.10.3 2020-05-13 17:32:47 -07:00
Christopher Willis-Ford
53f7c5f577 swap MAS and DMG build order 2020-05-13 17:32:47 -07:00
Christopher Willis-Ford
89193bc6af add entitlements suggested by Electron
Hopefully these will help solve the crash that Mac App Store reviewers
are encountering...
2020-05-13 17:15:07 -07:00
Christopher Willis-Ford
5a1526c1e5 update all dependencies, resolve npm audit alerts
minor code changes required for uuid, eslint-config-scratch, and
uglifyjs-webpack-plugin
2020-05-13 14:12:14 -07:00
Christopher Willis-Ford
cd805d1cd4 update to electron@^8.2.5 2020-05-11 13:14:56 -07:00
Christopher Willis-Ford
0404f9ac7e 3.10.2 2020-04-28 15:53:23 -07:00
Christopher Willis-Ford
8a62c4adf1 use scratch-gui#scratch-desktop@v3.10.2 2020-04-28 15:33:45 -07:00
Christopher Willis-Ford
8245ffb1de 3.10.1 2020-03-30 18:18:31 -07:00
Christopher Willis-Ford
7a813c8779 bring back entitlements.mas.inherit.plist
This seems to be necessary to work around an issue:
https://github.com/electron/electron-osx-sign/issues/192
2020-03-30 18:09:59 -07:00
Christopher Willis-Ford
fdd7a8463f fix makeFullUrl for file:// on Windows 2020-03-30 18:09:03 -07:00
Christopher Willis-Ford
33a17879b2 3.10.0 2020-03-26 18:10:11 -07:00
Christopher Willis-Ford
dd6f9eb91c update scratch-gui to scratch-desktop-v3.10.0 2020-03-26 18:10:07 -07:00
Chris Willis-Ford
a67499c33e
Merge pull request #111 from cwillisf/fix-macos-camera-and-mic
macOS: request camera & microphone permissions on demand
2020-03-18 11:10:48 -07:00
Christopher Willis-Ford
7ee12dcdd8 don't return await 2020-03-17 18:59:07 -07:00
Christopher Willis-Ford
6e1bfc33f3 only call systemPreferences.askForMediaAccess if it exists 2020-03-17 18:55:40 -07:00
Christopher Willis-Ford
74968704c8 improve user experience around mic/camera permission
- ask for permission when trying to use a feature, not on startup
- if permission is denied, explain the consequence and provide a hint
  for fixing it
2020-03-17 18:55:40 -07:00
Christopher Willis-Ford
b26c0b6bd3 fix npm run dist:dir 2020-03-17 18:55:40 -07:00
Christopher Willis-Ford
af73790306 macOS: request camera and microphone access
Note `audio-input` and `camera` were already in `entitlements.plist`

Supporting changes:
- Add `allow-jit` entitlement since documentation says it's needed.
- Only use sandbox for MAS build, not for non-MAS macOS build.
  NOTE: both still use the hardened runtime, as required on Catalina.
- Remove `entitlements.inherit.plist` since it matches default settings.
- Add to `electron-builder.yaml` English descriptions for why the app
  requests access to the microphone and camera. I'm not yet sure if
  there's a way to localize these.
- Minor tweaks in `electron-builder.yaml`.
2020-03-17 18:55:40 -07:00
Christopher Willis-Ford
8222b715a7 fix lint from TitledHOC changes 2020-03-17 18:54:56 -07:00
Christopher Willis-Ford
b72aab359b 3.9.0 2020-02-28 12:00:02 -08:00
Chris Willis-Ford
85ce509434
Merge pull request #98 from cwillisf/dark-dev-dont-hang
work around startup hang in dev on Win10 dark mode
2020-02-05 12:57:18 -08:00
Chris Willis-Ford
998132876e
Merge pull request #101 from cwillisf/fix-telemetry-modal
Fix telemetry modal
2020-02-05 09:08:45 -08:00
Christopher Willis-Ford
af029b6937 fix telemetry modal 2020-01-31 16:45:56 -08:00
Christopher Willis-Ford
d1c47e8bd0 work around startup hang in dev on Win10 dark mode
Also, add a few improvements to the way DevTools extensions get
installed.
2020-01-27 14:51:50 -08:00
Chris Willis-Ford
88b1da1533
Merge pull request #96 from cwillisf/notarize-mac-build
Notarize macOS build
2020-01-24 11:19:28 -08:00
Christopher Willis-Ford
5f5f24e722 fix unwanted menu bar on Windows 2020-01-16 18:05:53 -08:00
Christopher Willis-Ford
0b6652cde3 fix save & quit dialogs for Electron 6 API changes 2020-01-16 16:28:46 -08:00
Christopher Willis-Ford
5c2303a9b5 bubble errors out from electron-builder-wrapper 2020-01-16 12:40:20 -08:00
Christopher Willis-Ford
ccaca91bea fix code signing step for non-Store macOS build 2020-01-16 12:36:38 -08:00
Christopher Willis-Ford
9c9d7c6979 notarize non-MAS macOS build (required for 10.15) 2020-01-16 12:36:13 -08:00
Christopher Willis-Ford
6a33d411c1 enable hardened runtime for macOS builds 2020-01-16 12:36:03 -08:00
Christopher Willis-Ford
9b224115a5 fix infinite load screen introduced with Electron 6 changes 2020-01-16 08:16:23 -08:00
Chris Willis-Ford
99040d1771
Merge pull request #95 from cwillisf/fix-mas-electron-6
Fix mas electron 6
2020-01-15 15:38:07 -08:00
Christopher Willis-Ford
6aa3e013ec fix MAS build: add inherited entitlements 2020-01-15 15:15:30 -08:00
Christopher Willis-Ford
434781e89b fix MAS build: update to electron-builder@^22
We switched to Electron 6 for the MAS private API patch, but
electron-builder 20.x doesn't correctly support building Electron 6 for
MAS. A fix was introduced in version 22.0.0 of electron-builder.
See also:  electron-userland/electron-builder/pull/4154
2020-01-15 15:00:13 -08:00
Christopher Willis-Ford
075262823b 3.8.0 2020-01-15 14:10:02 -08:00
Christopher Willis-Ford
c6bdd43455 3.8.0-rc.1 2020-01-15 11:33:31 -08:00
Chris Willis-Ford
1f9001b158
Merge pull request #94 from cwillisf/electron-6
upgrade to electron@^6.1.7 with MAS patch
2020-01-15 11:28:25 -08:00
Christopher Willis-Ford
4f28d86e70 upgrade to electron@^6.1.7 with MAS patch
This version of Electron includes a patch which:
- removes the use of some private APIs which were causing Electron apps
to be rejected by the Mac App Store, but
- might cause degraded performance on Mac.
2020-01-15 11:27:06 -08:00
Chris Willis-Ford
0c23c3899e
Merge pull request #84 from LLK/dependabot/npm_and_yarn/react-dom-16.2.1
Bump react-dom from 16.2.0 to 16.2.1
2020-01-15 10:50:43 -08:00
Chris Willis-Ford
d3b269e4b2
Merge pull request #93 from LLK/paulkaplan-patch-2
Support 3.0 library syntax when fetching assets
2020-01-15 10:46:24 -08:00
Chris Willis-Ford
56f8a27848
Merge pull request #83 from LLK/paulkaplan-patch-1
Use dist path for library JSON files of GUI
2020-01-15 10:44:11 -08:00