From 2d68cb4dce68ed65f64725ec74bb7c46009e0dc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E4=B8=80=E4=BA=8C?= Date: Sun, 3 Apr 2022 16:27:28 +0800 Subject: [PATCH] chore: add maker-wix --- .github/workflows/release.yml | 2 +- forge.config.js | 12 ++ package-lock.json | 204 ++++++++++++++++++++++++++++++++++ package.json | 1 + 4 files changed, 218 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ecda0ca4..2895974b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,7 @@ jobs: submodules: 'true' - name: Install native dependencies - run: sudo apt-get install -y flatpak-builder eu-strip + run: sudo apt-get install -y flatpak-builder elfutils - name: Install Snapcraft uses: samuelmeuli/action-snapcraft@v1 with: diff --git a/forge.config.js b/forge.config.js index 443a7508..1e331994 100644 --- a/forge.config.js +++ b/forge.config.js @@ -42,6 +42,18 @@ const config = { }; }, }, + { + name: '@electron-forge/maker-wix', + config: { + language: 1033, + manufacturer: 'tiddlywiki.org', + name: 'TidGi', + ui: { + chooseDirectory: true, + }, + version, + }, + }, { name: '@electron-forge/maker-zip', platforms: ['darwin'], diff --git a/package-lock.json b/package-lock.json index 3d58d1b3..f73af464 100644 --- a/package-lock.json +++ b/package-lock.json @@ -60,6 +60,7 @@ "@electron-forge/maker-rpm": "6.0.0-beta.63", "@electron-forge/maker-snap": "^6.0.0-beta.63", "@electron-forge/maker-squirrel": "6.0.0-beta.63", + "@electron-forge/maker-wix": "^6.0.0-beta.63", "@electron-forge/maker-zip": "6.0.0-beta.63", "@electron-forge/plugin-auto-unpack-natives": "6.0.0-beta.63", "@electron-forge/plugin-webpack": "6.0.0-beta.63", @@ -1971,6 +1972,14 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, + "node_modules/@bitdisaster/exe-icon-extractor": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/@bitdisaster/exe-icon-extractor/-/exe-icon-extractor-1.0.10.tgz", + "integrity": "sha512-iTZ8cVGZ5dglNRyFdSj8U60mHIrC8XNIuOHN/NkM5/dQP4nsmpyqeQTAADLLQgoFCNJD+DiwQCv8dR2cCeWP4g==", + "dev": true, + "hasInstallScript": true, + "optional": true + }, "node_modules/@colors/colors": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", @@ -2646,6 +2655,23 @@ "electron-winstaller": "^5.0.0" } }, + "node_modules/@electron-forge/maker-wix": { + "version": "6.0.0-beta.63", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-wix/-/maker-wix-6.0.0-beta.63.tgz", + "integrity": "sha512-XA00Tye4vbwjEbomgsfexa6hGgipyvJPNTwv4HW2Pas1lQx3ScXsa9TgqPVkZnvhN/d9URNDZUw3auaHhkINlg==", + "dev": true, + "dependencies": { + "@electron-forge/maker-base": "6.0.0-beta.63", + "@electron-forge/shared-types": "6.0.0-beta.63", + "chalk": "^4.0.0", + "electron-wix-msi": "^3.0.6", + "log-symbols": "^4.0.0", + "parse-author": "^2.0.0" + }, + "engines": { + "node": ">= 12.13.0" + } + }, "node_modules/@electron-forge/maker-zip": { "version": "6.0.0-beta.63", "resolved": "https://registry.npmjs.org/@electron-forge/maker-zip/-/maker-zip-6.0.0-beta.63.tgz", @@ -10027,6 +10053,79 @@ "node": ">= 4.0.0" } }, + "node_modules/electron-wix-msi": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/electron-wix-msi/-/electron-wix-msi-3.2.0.tgz", + "integrity": "sha512-qNlRP3S3sxnf68bW89butEICaWGELNHwzerXr1M2Iu3TuPIdMMJyMfXuaQTPoLgouri2E/SQPpYzk3GS+6BHNQ==", + "dev": true, + "dependencies": { + "debug": "^4.1.1", + "fs-extra": "^8.1.0", + "klaw": "^3.0.0", + "lodash": "^4.17.15", + "rcedit": "^2.1.0", + "rcinfo": "^0.1.3", + "semver": "^6.3.0", + "uuid": "^3.3.3" + }, + "engines": { + "node": ">=6.0.0" + }, + "optionalDependencies": { + "@bitdisaster/exe-icon-extractor": "^1.0.10" + } + }, + "node_modules/electron-wix-msi/node_modules/fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + }, + "engines": { + "node": ">=6 <7 || >=8" + } + }, + "node_modules/electron-wix-msi/node_modules/rcedit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-2.3.0.tgz", + "integrity": "sha512-h1gNEl9Oai1oijwyJ1WYqYSXTStHnOcv1KYljg/8WM4NAg3H1KBK3azIaKkQ1WQl+d7PoJpcBMscPfLXVKgCLQ==", + "dev": true, + "engines": { + "node": ">= 8.0.0" + } + }, + "node_modules/electron-wix-msi/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/electron-wix-msi/node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/electron-wix-msi/node_modules/uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", + "dev": true, + "bin": { + "uuid": "bin/uuid" + } + }, "node_modules/electron/node_modules/@types/node": { "version": "16.11.26", "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.26.tgz", @@ -14807,6 +14906,15 @@ "node": ">=0.10.0" } }, + "node_modules/klaw": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz", + "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.1.9" + } + }, "node_modules/knuth-shuffle-seeded": { "version": "1.0.6", "resolved": "https://registry.npm.taobao.org/knuth-shuffle-seeded/download/knuth-shuffle-seeded-1.0.6.tgz", @@ -18086,6 +18194,12 @@ "node": ">= 10.0.0" } }, + "node_modules/rcinfo": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/rcinfo/-/rcinfo-0.1.3.tgz", + "integrity": "sha1-rDaDLR8eWXDGN55XFIDqWCZRH8Y=", + "dev": true + }, "node_modules/react": { "version": "18.0.0", "resolved": "https://registry.npmjs.org/react/-/react-18.0.0.tgz", @@ -25195,6 +25309,13 @@ } } }, + "@bitdisaster/exe-icon-extractor": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/@bitdisaster/exe-icon-extractor/-/exe-icon-extractor-1.0.10.tgz", + "integrity": "sha512-iTZ8cVGZ5dglNRyFdSj8U60mHIrC8XNIuOHN/NkM5/dQP4nsmpyqeQTAADLLQgoFCNJD+DiwQCv8dR2cCeWP4g==", + "dev": true, + "optional": true + }, "@colors/colors": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", @@ -25710,6 +25831,20 @@ "fs-extra": "^10.0.0" } }, + "@electron-forge/maker-wix": { + "version": "6.0.0-beta.63", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-wix/-/maker-wix-6.0.0-beta.63.tgz", + "integrity": "sha512-XA00Tye4vbwjEbomgsfexa6hGgipyvJPNTwv4HW2Pas1lQx3ScXsa9TgqPVkZnvhN/d9URNDZUw3auaHhkINlg==", + "dev": true, + "requires": { + "@electron-forge/maker-base": "6.0.0-beta.63", + "@electron-forge/shared-types": "6.0.0-beta.63", + "chalk": "^4.0.0", + "electron-wix-msi": "^3.0.6", + "log-symbols": "^4.0.0", + "parse-author": "^2.0.0" + } + }, "@electron-forge/maker-zip": { "version": "6.0.0-beta.63", "resolved": "https://registry.npmjs.org/@electron-forge/maker-zip/-/maker-zip-6.0.0-beta.63.tgz", @@ -31366,6 +31501,60 @@ } } }, + "electron-wix-msi": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/electron-wix-msi/-/electron-wix-msi-3.2.0.tgz", + "integrity": "sha512-qNlRP3S3sxnf68bW89butEICaWGELNHwzerXr1M2Iu3TuPIdMMJyMfXuaQTPoLgouri2E/SQPpYzk3GS+6BHNQ==", + "dev": true, + "requires": { + "@bitdisaster/exe-icon-extractor": "^1.0.10", + "debug": "^4.1.1", + "fs-extra": "^8.1.0", + "klaw": "^3.0.0", + "lodash": "^4.17.15", + "rcedit": "^2.1.0", + "rcinfo": "^0.1.3", + "semver": "^6.3.0", + "uuid": "^3.3.3" + }, + "dependencies": { + "fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dev": true, + "requires": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "rcedit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-2.3.0.tgz", + "integrity": "sha512-h1gNEl9Oai1oijwyJ1WYqYSXTStHnOcv1KYljg/8WM4NAg3H1KBK3azIaKkQ1WQl+d7PoJpcBMscPfLXVKgCLQ==", + "dev": true + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true + } + } + }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmmirror.com/emoji-regex/download/emoji-regex-8.0.0.tgz", @@ -35011,6 +35200,15 @@ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0=", "dev": true }, + "klaw": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz", + "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.9" + } + }, "knuth-shuffle-seeded": { "version": "1.0.6", "resolved": "https://registry.npm.taobao.org/knuth-shuffle-seeded/download/knuth-shuffle-seeded-1.0.6.tgz", @@ -37541,6 +37739,12 @@ "cross-spawn-windows-exe": "^1.1.0" } }, + "rcinfo": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/rcinfo/-/rcinfo-0.1.3.tgz", + "integrity": "sha1-rDaDLR8eWXDGN55XFIDqWCZRH8Y=", + "dev": true + }, "react": { "version": "18.0.0", "resolved": "https://registry.npmjs.org/react/-/react-18.0.0.tgz", diff --git a/package.json b/package.json index b02d40e8..763cfb02 100755 --- a/package.json +++ b/package.json @@ -78,6 +78,7 @@ "@electron-forge/maker-rpm": "6.0.0-beta.63", "@electron-forge/maker-snap": "^6.0.0-beta.63", "@electron-forge/maker-squirrel": "6.0.0-beta.63", + "@electron-forge/maker-wix": "^6.0.0-beta.63", "@electron-forge/maker-zip": "6.0.0-beta.63", "@electron-forge/plugin-auto-unpack-natives": "6.0.0-beta.63", "@electron-forge/plugin-webpack": "6.0.0-beta.63",