Merge pull request #1896 from RedisInsight/release/2.22.1

Release/2.22.1

Author: vlad-dargel

.circleci/config.yml

@@ -598,17 +598,18 @@ jobs:
 
             if [ << parameters.env >> == 'prod' ]; then
               yarn package:prod
+              yarn package:mas
               rm -rf release/mac
               exit 0;
             fi
 
             if [ << parameters.env >> == 'stage' ]; then
-              UPGRADES_LINK=$UPGRADES_LINK_STAGE SEGMENT_WRITE_KEY=$SEGMENT_WRITE_KEY_STAGE yarn package:stage
+              UPGRADES_LINK=$UPGRADES_LINK_STAGE SEGMENT_WRITE_KEY=$SEGMENT_WRITE_KEY_STAGE yarn package:stage && yarn package:mas
               rm -rf release/mac
               exit 0;
             fi
 
-            UPGRADES_LINK='' SEGMENT_WRITE_KEY='' yarn package:stage
+            UPGRADES_LINK='' SEGMENT_WRITE_KEY='' yarn package:stage && yarn package:mas
             rm -rf release/mac
           no_output_timeout: 60m
 

dev.provisionprofile

@@ -0,0 +1,9 @@
+const electronBuilder = require('./electron-builder.json');
+
+const config = {
+  ...electronBuilder,
+  appId: 'com.redis.RedisInsight',
+  productName: 'RedisInsight',
+};
+
+module.exports = config;

electron-builder-mas.js

@@ -28,16 +28,12 @@
       {
         "target": "zip",
         "arch": ["x64", "arm64"]
-      },
-      {
-        "target": "mas",
-        "arch": ["universal"]
       }
     ],
     "type": "distribution",
     "hardenedRuntime": true,
     "darkModeSupport": true,
-    "bundleVersion": "1",
+    "bundleVersion": "3",
     "icon": "resources/icon.icns",
     "artifactName": "${productName}-${os}-${arch}.${ext}",
     "entitlements": "resources/entitlements.mac.plist",

electron-builder.json

@@ -26,8 +26,8 @@
     "package": "yarn package:dev",
     "package:prod": "yarn build:prod && electron-builder build -p never",
     "package:stage": "yarn build:stage && electron-builder build -p never",
-    "build:mas": "electron-builder build -p never -m mas:universal",
-    "build:mas:dev": "electron-builder build -p never -m mas-dev:universal",
+    "package:mas": "electron-builder build -p never -m mas:universal -c ./electron-builder-mas.js",
+    "package:mas:dev": "electron-builder build -p never -m mas-dev:universal -c ./electron-builder-mas.js",
     "package:dev": "yarn build && cross-env DEBUG=electron-builder electron-builder build -p never",
     "package:win": "yarn build:prod && electron-builder build --win --x64 -p never",
     "package:mac": "yarn build:prod && electron-builder build --mac -p never",

embedded.provisionprofile

@@ -22,10 +22,10 @@
     <true/>
     <key>com.apple.security.application-groups</key>
     <array>
-    <string>UUK47G4BAZ.org.RedisLabs.RedisInsight-V2</string>
+    <string>UUK47G4BAZ.com.redis.RedisInsight</string>
     </array>
     <key>com.apple.application-identifier</key>
-    <string>UUK47G4BAZ.org.RedisLabs.RedisInsight-V2</string>
+    <string>UUK47G4BAZ.com.redis.RedisInsight</string>
     <key>com.apple.developer.team-identifier</key>
     <string>UUK47G4BAZ</string>
     <key>com.apple.security.temporary-exception.files.home-relative-path.read-write</key>

package.json

@@ -11495,7 +11495,7 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
+minimist@^1.2.0, minimist@^1.2.6:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==