Merge commit '5bab12f0829768748d25dec0a4f8e9ae4b3db090' into release

davidjgraph · davidjgraph · commit 8557fc4431fe · 2024-05-22T14:27:55.000+01:00
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.cjs b/build/fuses.cjs
diff --git a/build/notarize.cjs b/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",

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`"identityName": "draw.io.draw.ioDiagrams",`
`31`	`31`	`"publisher": "CN=9E628CCB-BE04-4557-A5A8-81EC34B09733"`
`32`	`32`	`},`
`33`		`- "afterPack": "build/fuses.js",`
	`33`	`+ "afterPack": "build/fuses.cjs",`
`34`	`34`	`"fileAssociations": [`
`35`	`35`	`{`
`36`	`36`	`"ext": "drawio",`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@`
`34`	`34`	`}`
`35`	`35`	`]`
`36`	`36`	`},`
`37`		`- "afterSign": "build/notarize.js",`
`38`		`- "afterPack": "build/fuses.js",`
	`37`	`+ "afterSign": "build/notarize.cjs",`
	`38`	`+ "afterPack": "build/fuses.cjs",`
`39`	`39`	`"dmg": {`
`40`	`40`	`},`
`41`	`41`	`"linux": {`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`"removable-media"`
`27`	`27`	`]`
`28`	`28`	`},`
`29`		`- "afterPack": "build/fuses.js",`
	`29`	`+ "afterPack": "build/fuses.cjs",`
`30`	`30`	`"fileAssociations": [`
`31`	`31`	`{`
`32`	`32`	`"ext": "drawio",`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`"portable": {`
`49`	`49`	`"artifactName": "${productName}-${version}-windows-no-installer.${ext}"`
`50`	`50`	`},`
`51`		`- "afterPack": "build/fuses.js",`
	`51`	`+ "afterPack": "build/fuses.cjs",`
`52`	`52`	`"fileAssociations": [`
`53`	`53`	`{`
`54`	`54`	`"ext": "drawio",`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`"portable": {`
`40`	`40`	`"artifactName": "${productName}-ia32-${version}-windows-32bit-no-installer.${ext}"`
`41`	`41`	`},`
`42`		`- "afterPack": "build/fuses.js",`
	`42`	`+ "afterPack": "build/fuses.cjs",`
`43`	`43`	`"fileAssociations": [`
`44`	`44`	`{`
`45`	`45`	`"ext": "drawio",`