From 0c87f0bd267df06618c83de16918e3f0c8013ec3 Mon Sep 17 00:00:00 2001 From: sevenc-nanashi Date: Tue, 18 Jun 2024 20:59:59 +0900 Subject: [PATCH] =?UTF-8?q?Fix:=20=E3=83=93=E3=83=AB=E3=83=89=E5=91=A8?= =?UTF-8?q?=E3=82=8A=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-production.yml | 4 +- electron-builder.config.js | 1 - package.json | 15 +------- pnpm-lock.yaml | 52 ++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-production.yml b/.github/workflows/build-production.yml index 4a5ae63..8139073 100644 --- a/.github/workflows/build-production.yml +++ b/.github/workflows/build-production.yml @@ -126,7 +126,9 @@ jobs: - name: Build electron run: | - pnpm build:electron ${{ matrix.build-args }} + # TODO: https://github.com/electron-userland/electron-builder/issues/6933 が直ったら修正 + # pnpm build:electron ${{ matrix.build-args }} + npm run build:electron ${{ matrix.build-args }} - name: Change extension if: matrix.ext != '' diff --git a/electron-builder.config.js b/electron-builder.config.js index 6e985da..f8cd08d 100644 --- a/electron-builder.config.js +++ b/electron-builder.config.js @@ -6,7 +6,6 @@ module.exports = { productName: "Kiite Cafe Desktop", copyright: "2022 © Nanashi. <@sevenc-nanashi>", icon: "build/icon.png", - nodeGypRebuild: false, directories: { output: "dist-electron", }, diff --git a/package.json b/package.json index b1be32b..3d1e44f 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "npm-run-all": "^4.1.5", "prettier": "^3.3.2", "rimraf": "^5.0.7", + "tar": "^7.2.0", "typescript": "^5.4.5", "vite": "^5.3.1", "vite-plugin-checker": "^0.6.4", @@ -60,17 +61,5 @@ "overrides": { "register-scheme": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.2.1.tgz" } - }, - "trustedDependencies": [ - "@fortawesome/fontawesome-common-types", - "@fortawesome/fontawesome-svg-core", - "@fortawesome/free-brands-svg-icons", - "@fortawesome/free-regular-svg-icons", - "@fortawesome/free-solid-svg-icons", - "bufferutil", - "electron", - "esbuild", - "register-scheme", - "utf-8-validate" - ] + } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 42b8090..457afc9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -117,6 +117,9 @@ importers: rimraf: specifier: ^5.0.7 version: 5.0.7 + tar: + specifier: ^7.2.0 + version: 7.2.0 typescript: specifier: ^5.4.5 version: 5.4.5 @@ -399,6 +402,10 @@ packages: resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} engines: {node: '>=12'} + '@isaacs/fs-minipass@4.0.1': + resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==} + engines: {node: '>=18.0.0'} + '@jridgewell/sourcemap-codec@1.4.15': resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} @@ -1028,6 +1035,10 @@ packages: resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} engines: {node: '>=10'} + chownr@3.0.0: + resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==} + engines: {node: '>=18'} + chromium-pickle-js@0.2.0: resolution: {integrity: sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==} @@ -2059,6 +2070,10 @@ packages: resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} engines: {node: '>= 8'} + minizlib@3.0.1: + resolution: {integrity: sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==} + engines: {node: '>= 18'} + mkdirp@0.5.6: resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==} hasBin: true @@ -2068,6 +2083,11 @@ packages: engines: {node: '>=10'} hasBin: true + mkdirp@3.0.1: + resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==} + engines: {node: '>=10'} + hasBin: true + ms@2.1.2: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} @@ -2607,6 +2627,10 @@ packages: resolution: {integrity: sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw==} engines: {node: '>=10'} + tar@7.2.0: + resolution: {integrity: sha512-hctwP0Nb4AB60bj8WQgRYaMOuJYRAPMGiQUAotms5igN8ppfQM+IvjQ5HcKu1MaZh2Wy2KWVTe563Yj8dfc14w==} + engines: {node: '>=18'} + temp-file@3.4.0: resolution: {integrity: sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg==} @@ -2951,6 +2975,10 @@ packages: yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} + yallist@5.0.0: + resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==} + engines: {node: '>=18'} + yargs-parser@21.1.1: resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} engines: {node: '>=12'} @@ -3195,6 +3223,10 @@ snapshots: wrap-ansi: 8.1.0 wrap-ansi-cjs: wrap-ansi@7.0.0 + '@isaacs/fs-minipass@4.0.1': + dependencies: + minipass: 7.1.2 + '@jridgewell/sourcemap-codec@1.4.15': {} '@malept/cross-spawn-promise@1.1.1': @@ -3973,6 +4005,8 @@ snapshots: chownr@2.0.0: {} + chownr@3.0.0: {} + chromium-pickle-js@0.2.0: {} ci-info@3.5.0: {} @@ -5212,12 +5246,19 @@ snapshots: minipass: 3.3.4 yallist: 4.0.0 + minizlib@3.0.1: + dependencies: + minipass: 7.1.2 + rimraf: 5.0.7 + mkdirp@0.5.6: dependencies: minimist: 1.2.7 mkdirp@1.0.4: {} + mkdirp@3.0.1: {} + ms@2.1.2: {} muggle-string@0.3.1: {} @@ -5798,6 +5839,15 @@ snapshots: mkdirp: 1.0.4 yallist: 4.0.0 + tar@7.2.0: + dependencies: + '@isaacs/fs-minipass': 4.0.1 + chownr: 3.0.0 + minipass: 7.1.2 + minizlib: 3.0.1 + mkdirp: 3.0.1 + yallist: 5.0.0 + temp-file@3.4.0: dependencies: async-exit-hook: 2.0.1 @@ -6120,6 +6170,8 @@ snapshots: yallist@4.0.0: {} + yallist@5.0.0: {} + yargs-parser@21.1.1: {} yargs@17.6.2: