Merge commit '5bab12f0829768748d25dec0a4f8e9ae4b3db090' into release

jgraph · May 22, 2024 · 8557fc4 · 8557fc4 · davidjgraph · May 22, 2024
2 parents 6fac434 + 5bab12f
commit 8557fc4
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/electron-builder-win.yml b/.github/workflows/electron-builder-win.yml
@@ -44,7 +44,7 @@ jobs:
         md diagramly
         Move-Item "DesktopLibrary.js","ElectronApp.js"  -Destination "diagramly"
     - name: Installing Node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: 20
     - name: Prepare for Windows Build

diff --git a/.github/workflows/electron-builder.yml b/.github/workflows/electron-builder.yml
@@ -57,7 +57,7 @@ jobs:
         mkdir diagramly
         mv DesktopLibrary.js ElectronApp.js diagramly
     - name: Installing Node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: 20
     - name: Build for ${{ matrix.os}}

diff --git a/build/fuses.js → build/fuses.cjs b/build/fuses.js → build/fuses.cjs
diff --git a/build/notarize.js → build/notarize.cjs b/build/notarize.js → build/notarize.cjs
diff --git a/electron-builder-appx.json b/electron-builder-appx.json
@@ -30,7 +30,7 @@
     "identityName": "draw.io.draw.ioDiagrams",
     "publisher": "CN=9E628CCB-BE04-4557-A5A8-81EC34B09733"
   },
-  "afterPack": "build/fuses.js",
+  "afterPack": "build/fuses.cjs",
   "fileAssociations": [
 	  {
 	  	"ext": "drawio",

diff --git a/electron-builder-linux-mac.json b/electron-builder-linux-mac.json
@@ -34,8 +34,8 @@
       }
     ]
   },
-  "afterSign": "build/notarize.js",
-  "afterPack": "build/fuses.js",
+  "afterSign": "build/notarize.cjs",
+  "afterPack": "build/fuses.cjs",
   "dmg": {
   },
   "linux": {

diff --git a/electron-builder-snap.json b/electron-builder-snap.json
@@ -26,7 +26,7 @@
       "removable-media"
     ]
   },
-  "afterPack": "build/fuses.js",
+  "afterPack": "build/fuses.cjs",
   "fileAssociations": [
 	  {
 	  	"ext": "drawio",

diff --git a/electron-builder-win.json b/electron-builder-win.json
@@ -48,7 +48,7 @@
   "portable": {
     "artifactName": "${productName}-${version}-windows-no-installer.${ext}"
   },
-  "afterPack": "build/fuses.js",
+  "afterPack": "build/fuses.cjs",
   "fileAssociations": [
 	  {
 	  	"ext": "drawio",

diff --git a/electron-builder-win32.json b/electron-builder-win32.json
@@ -39,7 +39,7 @@
   "portable": {
     "artifactName": "${productName}-ia32-${version}-windows-32bit-no-installer.${ext}"
   },
-  "afterPack": "build/fuses.js",
+  "afterPack": "build/fuses.cjs",
   "fileAssociations": [
 	  {
 	  	"ext": "drawio",