Fix MAS build shows blank white screen (#113)

webcatalog · Dec 18, 2019 · e7bd568 · e7bd568
1 parent b85a6a4
commit e7bd568
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 3 deletions.
diff --git a/build-resources/embedded-development.provisionprofile b/build-resources/embedded-development.provisionprofile
diff --git a/build-resources/entitlements.mac.plist b/build-resources/entitlements.mac.plist
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.network.client</key>
+    <true/>
+    <key>com.apple.security.files.user-selected.read-only</key>
+    <true/>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+    <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+  </dict>
+</plist>
diff --git a/build-resources/entitlements.mas.plist b/build-resources/entitlements.mas.plist
@@ -14,5 +14,7 @@
     <true/>
     <key>com.apple.security.cs.allow-dyld-environment-variables</key>
     <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
   </dict>
 </plist>
diff --git a/packager.js b/packager.js
@@ -71,6 +71,10 @@ const opts = {
     },
     mac: {
       darkModeSupport: true,
+      hardenedRuntime: true,
+      gatekeeperAssess: false,
+      entitlements: 'build-resources/entitlements.mac.plist',
+      entitlementsInherit: 'build-resources/entitlements.mac.plist',
     },
     mas: {
       category: 'public.app-category.productivity',

diff --git a/src/helpers/get-locale.js b/src/helpers/get-locale.js
@@ -1,9 +1,8 @@
 import { getLocales } from '../senders';
 
-let locales;
+const locales = getLocales();
 
 const getLocale = (id) => {
-  if (locales == null) locales = getLocales();
   if (!locales[id]) {
     console.log('Missing locale id', id); // eslint-disable-line no-console
     return id;

diff --git a/src/senders/index.js b/src/senders/index.js
@@ -13,4 +13,4 @@ export const requestShowRequireRestartDialog = () => ipcRenderer.send('request-s
 
 // Locale
 export const getLocale = (id) => ipcRenderer.sendSync('get-locale', id);
-export const getLocales = () => ipcRenderer.sendSync('get-locales');
+export const getLocales = () => ipcRenderer.sendSync('get-locales');