Merge branch 'master' of https://github.com/TurboWarp/packager

Unsandboxed · Mar 3, 2025 · d16fc95 · d16fc95
2 parents c8defeb + e97ce43
commit d16fc95
Show file tree

Hide file tree

Showing 17 changed files with 204 additions and 197 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,11 +10,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      with:
+        persist-credentials: false
     - name: Install Node.js
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
       with:
-        node-version: 20.x
+        node-version: 22
         cache: 'npm'
     - name: Install dependencies
       run: npm ci
@@ -25,7 +27,7 @@ jobs:
     - name: Build standalone
       run: npm run build-standalone-prod
     - name: Upload standalone artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
       with:
         name: standalone
         path: dist/standalone.html
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -5,11 +5,6 @@ on:
   push:
     branches: [master]
 
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
 concurrency:
   group: "deploy"
   cancel-in-progress: true
@@ -19,14 +14,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      with:
+        persist-credentials: false
     - name: Setup GitHub Pages
       id: pages
-      uses: actions/configure-pages@v4
+      uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b
     - name: Install Node.js
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
       with:
-        node-version: 20.x
+        node-version: 22
         cache: 'npm'
     - name: Install dependencies
       run: npm ci
@@ -44,17 +41,20 @@ jobs:
         npm run build-standalone-prod
         cp dist/standalone.html web
     - name: Upload artifact
-      uses: actions/upload-pages-artifact@v3
+      uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa
       with:
         path: ./web/
 
   deploy:
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
+    permissions:
+      pages: write
+      id-token: write
     runs-on: ubuntu-latest
     needs: build
     steps:
     - name: Deploy to GitHub Pages
       id: deployment
-      uses: actions/deploy-pages@v4
+      uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e
diff --git a/.github/workflows/generate-electron-binaries.yml b/.github/workflows/generate-electron-binaries.yml
@@ -15,10 +15,12 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       with:
-        node-version: 20.x
+        persist-credentials: false
+    - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
+      with:
+        node-version: 22
     - name: Install dependencies
       run: |
         cd electron-bin
@@ -31,7 +33,7 @@ jobs:
         node generate-macos.js
     - name: Upload macOS
       if: runner.os == 'macOS'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
       with:
         name: electron-macos
         path: electron-bin/temp/macos/*.zip
@@ -46,13 +48,13 @@ jobs:
         node generate-windows.js
     - name: Upload Windows
       if: runner.os == 'Windows'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
       with:
         name: electron-windows
         path: electron-bin/temp/windows/*.zip
     - name: Upload Windows Crossbuild
       if: runner.os == 'Linux'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
       with:
         name: electron-windows-crossbuild
         path: electron-bin/temp/windows/*.zip
diff --git a/.github/workflows/wkwebview-build.yml b/.github/workflows/wkwebview-build.yml
@@ -11,7 +11,9 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      with:
+        persist-credentials: false
     - name: Build
       run: |
         cd wkwebview

diff --git a/electron-bin/package-lock.json b/electron-bin/package-lock.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -34,17 +34,17 @@
   "funding": "https://github.com/sponsors/GarboMuffin",
   "license": "MPL-2.0",
   "dependencies": {
-    "@fiahfy/icns": "0.0.7",
+    "@fiahfy/icns": "^0.0.7",
     "@turbowarp/json": "^0.1.1",
     "@turbowarp/jszip": "^3.11.0",
-    "@turbowarp/sbdl": "^4.0.1",
-    "cross-fetch": "^4.0.0",
+    "@turbowarp/sbdl": "^5.0.1",
+    "cross-fetch": "^4.1.0",
     "sha.js": "^2.4.11"
   },
   "devDependencies": {
     "@babel/core": "^7.16.5",
     "@babel/preset-env": "^7.16.5",
-    "@turbowarp/scratch-storage": "^0.0.202403251715",
+    "@turbowarp/scratch-storage": "^0.0.202502192258",
     "@turbowarp/scratch-svg-renderer": "^1.0.0-202401111326-62c0f26",
     "babel-jest": "^27.4.5",
     "babel-loader": "^8.2.3",