Merge pull request #388 from viktor44/feature/wayland_flag

Add support for wayland #381

.github/workflows/release.yml

@@ -75,9 +75,6 @@ jobs:
           npm install -g npm@8  
           npm install -g node-gyp@latest
           npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"}
-          npm config set registry "http://registry.npmjs.org"
-          yarn config set registry "http://registry.npmjs.org"
-          yarn config set network-timeout 300000
       - name: Install dependencies
         run: yarn install --immutable
       - name: Build and Release

package.json

@@ -2,7 +2,7 @@
   "name": "station-project",
   "private": true,
   "productName": "Station",
-  "version": "2.8.0-b1",
+  "version": "3.1.0-b1",
   "description": "Station",
   "homepage": "https://getstation.com",
   "author": {

packages/app/electron-builder.yml

@@ -8,7 +8,7 @@ asarUnpack:
   - 'node_modules/**/*.{node,dll}'
 
 afterPack: '../../scripts/after-pack.js'
-afterSign: '../../scripts/notarize.js'
+# afterSign: '../../scripts/notarize.js'
 
 directories:
   output: '../../release'
@@ -31,9 +31,9 @@ dmg:
 
 mac:
   target:
-    - target: dmg
-      arch:
-        - universal
+#    - target: dmg
+#      arch:
+#        - universal
     - target: zip
       arch:
         - universal

packages/app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "station-desktop-app",
   "productName": "Station",
-  "version": "3.0.0-b2",
+  "version": "3.1.0-b1",
   "description": "Station",
   "homepage": "https://getstation.com",
   "author": {
@@ -199,7 +199,7 @@
     "@babel/plugin-transform-runtime": "^7.4.3",
     "@babel/preset-env": "^7.7.1",
     "@babel/preset-react": "^7.7.0",
-    "@electron/notarize": "^2.0.0",
+    "@electron/notarize": "^2.3.2",
     "@getstation/appstore": "workspace:*",
     "@graphql-codegen/cli": "1.3.1",
     "@graphql-codegen/typescript": "1.3.1",

scripts/after-pack.js

@@ -16,10 +16,15 @@ exports.default = async function(context) {
   fs.moveSync('station-desktop-app', 'station-desktop-app.bin');
 
   const wrapperScript = 
-    `#!/bin/sh 
-    nohup "$(dirname "$(readlink -f "$0")")/station-desktop-app.bin" --no-sandbox "$@" >/dev/null 2>&1 &
-    `;
-  fs.writeFileSync('station-desktop-app', wrapperScript);
+  `#!/bin/sh
+if [ -z \${WAYLAND_DISPLAY+x} ]; then 
+  WAYLAND_PARAMS=""
+else 
+  WAYLAND_PARAMS="--enable-features=UseOzonePlatform --ozone-platform=wayland"
+fi
+nohup "$(dirname "$(readlink -f "$0")")/station-desktop-app.bin" \$WAYLAND_PARAMS --no-sandbox "$@" >/dev/null 2>&1 &
+      `;
+    fs.writeFileSync('station-desktop-app', wrapperScript);
   fs.chmodSync('station-desktop-app', '755');
 
   process.chdir(originalDir);

yarn.lock

@@ -2315,14 +2315,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@electron/notarize@npm:^2.0.0":
-  version: 2.3.0
-  resolution: "@electron/notarize@npm:2.3.0"
+"@electron/notarize@npm:^2.3.2":
+  version: 2.3.2
+  resolution: "@electron/notarize@npm:2.3.2"
   dependencies:
     debug: "npm:^4.1.1"
     fs-extra: "npm:^9.0.1"
     promise-retry: "npm:^2.0.1"
-  checksum: 10c0/833fc60c2f2b980abfb7be3f8ff5fecf5f2ea3edca711239b0963c7691cd3fe673a59705a1bf6970348a16fcd765f5bdc5827fc1f944850382e7e7e505d1ab7c
+  checksum: 10c0/539ed5cd264c3885fd3ca9c0b243144e3e2856d767de3999da1e3f94f0d79db57cbb08862b640270dfad0292bc5345cd7177db096da2061e28e15a6b85946b32
   languageName: node
   linkType: hard
 
@@ -28743,7 +28743,7 @@ __metadata:
     "@babel/preset-env": "npm:^7.7.1"
     "@babel/preset-react": "npm:^7.7.0"
     "@babel/runtime": "npm:^7.4.3"
-    "@electron/notarize": "npm:^2.0.0"
+    "@electron/notarize": "npm:^2.3.2"
     "@electron/remote": "npm:^2.0.9"
     "@getstation/apollo-link-reactive-schema": "npm:^1.0.0"
     "@getstation/appstore": "workspace:*"