electron-mksnapshot 23.0.0 → 25.0.0

package/.circleci/config.yml

@@ -6,10 +6,14 @@ orbs:
 
 commands:
   install:
+    parameters:
+      node-version:
+        description: Node.js version to install
+        type: string
     steps:
       - node/install:
-          node-version: "16.19.0"
-      - run: nvm use 16.19.0
+          node-version: << parameters.node-version >>
+      - run: nvm use << parameters.node-version >>
       - checkout
       - restore_cache:
           keys:
@@ -43,21 +47,36 @@ jobs:
   test-linux:
     docker:
       - image: cimg/base:stable
+    parameters:
+      node-version:
+        description: Node.js version to install
+        type: string
     steps:
-      - install
+      - install:
+          node-version: << parameters.node-version >>
       - test
   test-mac:
     macos:
       xcode: "13.3.0"
+    parameters:
+      node-version:
+        description: Node.js version to install
+        type: string
     steps:
-      - install
+      - install:
+          node-version: << parameters.node-version >>
       - test
   test-windows:
     executor:
       name: win/default
       shell: bash.exe
+    parameters:
+      node-version:
+        description: Node.js version to install
+        type: string
     steps:
-      - install
+      - install:
+          node-version: << parameters.node-version >>
       - test
   release:
     docker:
@@ -90,22 +109,46 @@ workflows:
   test_and_release:
     jobs:
       - test-linux:
+          matrix:
+            parameters:
+              node-version:
+                - 18.14.0
+                - 16.19.0
+                - 14.19.0
           filters:
             tags:
               only: /.*/
       - test-mac:
+          matrix:
+            parameters:
+              node-version:
+                - 18.14.0
+                - 16.19.0
+                - 14.19.0
           filters:
             tags:
               only: /.*/
       - test-windows:
+          matrix:
+            parameters:
+              node-version:
+                - 18.14.0
+                - 16.19.0
+                - 14.19.0
           filters:
             tags:
               only: /.*/
       - release:
           requires:
-            - test-linux
-            - test-mac
-            - test-windows
+            - test-linux-18.14.0
+            - test-linux-16.19.0
+            - test-linux-14.19.0
+            - test-mac-18.14.0
+            - test-mac-16.19.0
+            - test-mac-14.19.0
+            - test-windows-18.14.0
+            - test-windows-16.19.0
+            - test-windows-14.19.0
           filters:
             tags:
               only: /^v.*/

package/.github/workflows/release.yml

@@ -35,7 +35,6 @@ jobs:
         run: |
           git tag ${{ github.event.inputs.version }}
           git push origin ${{ github.event.inputs.version }}
-      # TODO - This creates a draft release at the moment
       - name: Create Release
         run: |
-          gh release create ${{ github.event.inputs.version }} -t ${{ github.event.inputs.version }} -d
+          gh release create ${{ github.event.inputs.version }} -t ${{ github.event.inputs.version }}

package/download-mksnapshot.js

@@ -5,33 +5,6 @@ const extractZip = require('extract-zip')
 const versionToDownload = require('./package').version
 let archToDownload = process.env.npm_config_arch
 
-// Refs https://github.com/electron/fiddle-core/blob/1ee2d2737f23fd1012917a249a9444b6db89f1d8/src/versions.ts#L47-L57
-function compareVersions (a, b) {
-  const l = a.compareMain(b)
-  if (l) return l
-  // Electron's approach is nightly -> other prerelease tags -> stable,
-  // so force `nightly` to sort before other prerelease tags.
-  const [prea] = a.prerelease
-  const [preb] = b.prerelease
-  if (prea === 'nightly' && preb !== 'nightly') return -1
-  if (prea !== 'nightly' && preb === 'nightly') return 1
-  return a.comparePre(b)
-}
-
-// Refs https://github.com/electron/fiddle-core/blob/1ee2d2737f23fd1012917a249a9444b6db89f1d8/src/versions.ts#L152-L160
-function getLatestStable (releases) {
-  const { parse: semverParse } = require('semver')
-  const semvers = releases.map(({ version }) => semverParse(version)).filter((sem) => Boolean(sem))
-  semvers.sort((a, b) => compareVersions(a, b))
-  let stable
-  for (const ver of semvers.values()) {
-    if (ver.prerelease.length === 0) {
-      stable = ver
-    }
-  }
-  return stable
-}
-
 function download (version) {
   return downloadArtifact({
     version: version,
@@ -51,9 +24,9 @@ async function attemptDownload (version) {
       process.exit(1)
     }
 
-    const fetch = require('node-fetch')
-    const releases = await fetch('https://releases.electronjs.org/releases.json').then(response => response.json())
-    version = getLatestStable(releases).version
+    const { ElectronVersions } = require('@electron/fiddle-core')
+    const versions = await ElectronVersions.create(undefined, { ignoreCache: true })
+    version = versions.latestStable.version
   }
 
   if (process.arch.indexOf('arm') === 0 && process.platform !== 'darwin') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-mksnapshot",
-  "version": "23.0.0",
+  "version": "25.0.0",
   "description": "Electron version of the mksnapshot binary",
   "repository": "https://github.com/electron/mksnapshot",
   "bin": {
@@ -20,8 +20,8 @@
   },
   "devDependencies": {
     "@continuous-auth/client": "^2.2.2",
+    "@electron/fiddle-core": "^1.3.0",
     "mocha": "^10.1.0",
-    "node-fetch": "^2.6.9",
     "semver": "^7.3.8",
     "standard": "^14.3.1"
   },

package/script/publish.js

@@ -3,8 +3,7 @@ const { getOtp } = require('@continuous-auth/client')
 const { spawnSync } = require('child_process')
 
 async function publish () {
-  const { status, stdout } = spawnSync('npm', ['publish', '--otp', await getOtp()])
-  if (status !== 0) console.log(stdout)
+  const { status } = spawnSync('npm', ['publish', '--otp', await getOtp()])
   process.exit(status)
 }