merge 0.3.0

dolthub · Oct 17, 2024 · cee4a13 · cee4a13
1 parent 1784532
commit cee4a13
Show file tree

Hide file tree

Showing 4 changed files with 169 additions and 64 deletions.
diff --git a/main/background.ts b/main/background.ts
@@ -69,7 +69,6 @@ async function isGraphQLServerReady(url: string): Promise<boolean> {
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({ query: "{ __typename }" }),
     });
-    console.log(url, response);
     return response.ok;
   } catch (error) {
     console.error("Error pinging GraphQL server:", error);

diff --git a/package-mas.json → package-dmg.json b/package-mas.json → package-dmg.json
@@ -2,7 +2,7 @@
   "private": true,
   "name": "dolt-workbench",
   "description": "SQL workbench for MySQL and PostgreSQL databases",
-  "version": "0.2.14",
+  "version": "0.3.0",
   "main": "app/background.js",
   "workspaces": {
     "packages": [
@@ -25,7 +25,7 @@
   "build": {
     "appId": "com.dolthub.dolt-workbench",
     "productName": "Dolt Workbench",
-    "buildVersion": "0.2.13",
+    "buildVersion": "0.3.0",
     "copyright": "Copyright © 2024 <DoltHub Inc>",
     "files": [
       "app",
@@ -50,28 +50,16 @@
       "icon": "build/mac/AppIcon.icns",
       "extendInfo": {
         "CFBundleIconName": "AppIcon",
-        "CFBundleIconFile": "AppIcon"
+        "CFBundleIconFile": "AppIcon",
+        "CFBundleDisplayName": "Dolt Workbench"
       },
       "artifactName": "${productName}-mac-${arch}.${ext}",
-      "target": [
-        {
-          "target": "mas",
-          "arch": "universal"
-        }
-      ],
-      "notarize": {
-        "teamId": "FK9YU86WZ5"
-      },
-      "x64ArchFiles": "*",
-      "type": "distribution",
-      "hardenedRuntime": false,
+      "target": "dmg",
+      "hardenedRuntime": true,
       "gatekeeperAssess": false,
-      "asarUnpack": [
-        "**/*.node"
-      ],
-      "provisioningProfile": "build/mac/MacAppStore.provisionprofile",
-      "entitlements": "build/mac/entitlements.mas.plist",
-      "entitlementsInherit": "build/mac/entitlements.mas.inherit.plist"
+      "provisioningProfile": "build/mac/AppleDevelopment.provisionprofile",
+      "entitlements": "build/mac/entitlements.plist",
+      "entitlementsInherit": "build/mac/entitlements.inherit.plist"
     }
   },
   "dependencies": {
@@ -94,4 +82,4 @@
     "rimraf": "^6.0.1",
     "typescript": "^5.4.5"
   }
-}
+}
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "private": true,
   "name": "dolt-workbench",
   "description": "SQL workbench for MySQL and PostgreSQL databases",
-  "version": "0.2.13",
+  "version": "0.3.0",
   "main": "app/background.js",
   "workspaces": {
     "packages": [
@@ -25,7 +25,7 @@
   "build": {
     "appId": "com.dolthub.dolt-workbench",
     "productName": "Dolt Workbench",
-    "buildVersion": "0.2.13",
+    "buildVersion": "0.3.0",
     "copyright": "Copyright © 2024 <DoltHub Inc>",
     "files": [
       "app",
@@ -50,16 +50,28 @@
       "icon": "build/mac/AppIcon.icns",
       "extendInfo": {
         "CFBundleIconName": "AppIcon",
-        "CFBundleIconFile": "AppIcon",
-        "CFBundleDisplayName": "Dolt Workbench"
+        "CFBundleIconFile": "AppIcon"
       },
       "artifactName": "${productName}-mac-${arch}.${ext}",
-      "target": "dmg",
-      "hardenedRuntime": true,
+      "target": [
+        {
+          "target": "mas",
+          "arch": "universal"
+        }
+      ],
+      "notarize": {
+        "teamId": "FK9YU86WZ5"
+      },
+      "x64ArchFiles": "*",
+      "type": "distribution",
+      "hardenedRuntime": false,
       "gatekeeperAssess": false,
-      "provisioningProfile": "build/mac/AppleDevelopment.provisionprofile",
-      "entitlements": "build/mac/entitlements.plist",
-      "entitlementsInherit": "build/mac/entitlements.inherit.plist"
+      "asarUnpack": [
+        "**/*.node"
+      ],
+      "provisioningProfile": "build/mac/MacAppStore.provisionprofile",
+      "entitlements": "build/mac/entitlements.mas.plist",
+      "entitlementsInherit": "build/mac/entitlements.mas.inherit.plist"
     }
   },
   "dependencies": {