build: change built file location

oracle · Nov 21, 2024 · dfbd3da · dfbd3da
1 parent dc1bcc1
commit dfbd3da
Show file tree

Hide file tree

Showing 8 changed files with 526 additions and 36 deletions.
diff --git a/.github/workflows/development-build-desktop-application.yml b/.github/workflows/development-build-desktop-application.yml
@@ -102,17 +102,17 @@ jobs:
         run: |
           npm run github-action-build-macos-x86
           ls -lashR ./ocd/dist
-          gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/make/ocd-${{ env.OCD_VERSION }}-*.dmg --clobber
+          gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/release/${{ env.OCD_VERSION }}/ocd-${{ env.OCD_VERSION }}-*.dmg --clobber
       - name: Upload Windows Artifact to Release
         if: matrix.os == 'windows-latest' && (failure() || success())
         run: |
           ls -R ./ocd/dist
-          gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/win/ocd-${{ env.OCD_VERSION }}-x64.exe --clobber
+          gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/release/${{ env.OCD_VERSION }}/ocd-${{ env.OCD_VERSION }}-x64.exe --clobber
       - name: Upload Linux Artifact to Release
         if: matrix.os == 'ubuntu-latest' && (failure() || success())
         run: |
           ls -lashR ./ocd/dist
           # gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/linux/ocd-${{ env.OCD_VERSION }}-*.rpm --clobber
           # gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/linux/ocd-${{ env.OCD_VERSION }}-*.deb --clobber
-          gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/linux/ocd-${{ env.OCD_VERSION }}-*.snap --clobber
+          gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/release/${{ env.OCD_VERSION }}/ocd-${{ env.OCD_VERSION }}-*.snap --clobber
           # gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/linux/ocd-${{ env.OCD_VERSION }}-*.AppImage --clobber
diff --git a/ocd/package-lock.json b/ocd/package-lock.json
diff --git a/ocd/packages/electron-desktop/electron-builder.json5 b/ocd/packages/electron-desktop/electron-builder.json5
@@ -1,21 +1,46 @@
 // @see - https://www.electron.build/configuration/configuration
 {
   "$schema": "https://raw.githubusercontent.com/electron-userland/electron-builder/master/packages/app-builder-lib/scheme.json",
-  "appId": "YourAppID",
+  "appId": "com.oracle.okit-ocd",
+  "artifactName": "${productName}-${version}-${arch}.${ext}",
   "asar": true,
-  "productName": "YourAppName",
   "directories": {
-    "output": "release/${version}"
+    "output": "../../dist/release/${version}"
   },
   "files": [
     "dist",
     "dist-electron"
   ],
+  "fileAssociations": [
+    {
+      "ext": "okit",
+      "name": "OCD Design",
+      "role": "Editor"
+    },
+    {
+      "ext": "ocd",
+      "name": "OCD Design",
+      "role": "Editor"
+    }
+  ],
   "mac": {
+    "icon": "public/assets/icon.icns",
+    "category": "public.app-category.developer-tools",
+    "mergeASARs": false,
     "target": [
-      "dmg"
-    ],
-    "artifactName": "${productName}-Mac-${version}-Installer.${ext}"
+      {
+        "target": "dmg",
+        "arch": ["universal"]
+      }
+    ]
+  },
+  "dmg": {
+    "icon": "public/assets/icon.icns",
+    "background": "public/assets/background.png",
+    "window": {
+      "width": 585,
+      "height": 355
+    }
   },
   "win": {
     "target": [

diff --git a/ocd/packages/electron-desktop/package.json b/ocd/packages/electron-desktop/package.json
@@ -23,8 +23,10 @@
   ],
   "license": "UPL-1.0",
   "scripts": {
+    "clean": "rm -rf lib dist dist-electron out",
+    "purge": "npm run clean && rm -rf node_modules",
     "dev": "NODE_OPTIONS=--max-old-space-size=8192 vite",
-    "dev-build": "tsc && NODE_OPTIONS=--max-old-space-size=8192 vite build && electron-builder",
+    "dev-build": "tsc && NODE_OPTIONS=--max-old-space-size=8192 vite build && electron-builder -c.electronVersion=32.2.0",
     "dev-tsc": "tsc",
     "dev-vite-build": "NODE_OPTIONS=--max-old-space-size=8192 vite build",
     "build": "tsc && vite build && electron-builder",
@@ -52,8 +54,8 @@
     "eslint-plugin-react-refresh": "^0.4.5",
     "typescript": "^5.2.2",
     "vite": "^5.1.6",
-    "electron": "^30.0.1",
-    "electron-builder": "^24.13.3",
+    "electron": ">=32.2.0",
+    "electron-builder": "^25.1.8",
     "vite-plugin-electron": "^0.28.6",
     "vite-plugin-electron-renderer": "^0.14.5"
   },

diff --git a/ocd/packages/export/package.json b/ocd/packages/export/package.json
@@ -41,7 +41,7 @@
     "compile": "tsc -p tsconfig.json && tsc -p tsconfig-cjs.json",
     "build": "npm run compile && npm run pack"
   },
-  "dependencies": {
+  "peerDependencies": {
     "@ocd/core": ">=0.2.5",
     "@ocd/model": ">=0.2.5"
   }

diff --git a/ocd/packages/import/package.json b/ocd/packages/import/package.json
@@ -41,7 +41,7 @@
     "compile": "tsc -p tsconfig.json && tsc -p tsconfig-cjs.json",
     "build": "npm run compile && npm run pack"
   },
-  "dependencies": {
+  "peerDependencies": {
     "@ocd/core": ">=0.2.5",
     "@ocd/model": ">=0.2.5"
   }

diff --git a/ocd/packages/model/package.json b/ocd/packages/model/package.json
@@ -41,7 +41,7 @@
     "compile": "tsc -p tsconfig.json && tsc -p tsconfig-cjs.json",
     "build": "npm run compile && npm run pack"
   },
-  "dependencies": {
+  "peerDependencies": {
     "@ocd/core": ">=0.2.5"
   }
 }
diff --git a/ocd/packages/query/package.json b/ocd/packages/query/package.json
@@ -41,7 +41,7 @@
     "compile": "tsc -p tsconfig.json && tsc -p tsconfig-cjs.json",
     "build": "npm run compile && npm run pack"
   },
-  "dependencies": {
+  "peerDependencies": {
     "@ocd/core": ">=0.2.5",
     "@ocd/model": ">=0.2.5",
     "oci-sdk": ">=2.69.0"