mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-02-12 04:18:54 +00:00
ci: fix electron make script on Windows (#4666)
This commit is contained in:
2
.github/workflows/release-desktop-app.yml
vendored
2
.github/workflows/release-desktop-app.yml
vendored
@@ -218,7 +218,7 @@ jobs:
|
|||||||
- name: get all files to be signed
|
- name: get all files to be signed
|
||||||
id: get_files_to_be_signed
|
id: get_files_to_be_signed
|
||||||
run: |
|
run: |
|
||||||
Set-Variable -Name FILES_TO_BE_SIGNED -Value ((Get-ChildItem -Path packages/frontend/electron/out -Recurse -File | Where-Object { $_.Extension -in @(".exe", ".node", ".dll", ".msi") } | ForEach-Object { '"' + $_.FullName.Replace((Get-Location).Path + '\apps\electron\out\', '') + '"' }) -join ' ')
|
Set-Variable -Name FILES_TO_BE_SIGNED -Value ((Get-ChildItem -Path packages/frontend/electron/out -Recurse -File | Where-Object { $_.Extension -in @(".exe", ".node", ".dll", ".msi") } | ForEach-Object { '"' + $_.FullName.Replace((Get-Location).Path + '\packages\frontend\electron\out\', '') + '"' }) -join ' ')
|
||||||
"FILES_TO_BE_SIGNED=$FILES_TO_BE_SIGNED" >> $env:GITHUB_OUTPUT
|
"FILES_TO_BE_SIGNED=$FILES_TO_BE_SIGNED" >> $env:GITHUB_OUTPUT
|
||||||
echo $FILES_TO_BE_SIGNED
|
echo $FILES_TO_BE_SIGNED
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
diff --git a/dist/util/forge-config.js b/dist/util/forge-config.js
|
diff --git a/dist/util/forge-config.js b/dist/util/forge-config.js
|
||||||
index 3466ac1a340c8dfe5ea8997178961e8328457d68..cb83d7e9ee8b67896adda10dbdc0c7dae3a4004b 100644
|
index 3466ac1a340c8dfe5ea8997178961e8328457d68..ceb33770db48df80e4355e6bac12e8c99162d7bc 100644
|
||||||
--- a/dist/util/forge-config.js
|
--- a/dist/util/forge-config.js
|
||||||
+++ b/dist/util/forge-config.js
|
+++ b/dist/util/forge-config.js
|
||||||
@@ -130,7 +130,7 @@ exports.default = async (dir) => {
|
@@ -130,7 +130,7 @@ exports.default = async (dir) => {
|
||||||
@@ -7,7 +7,7 @@ index 3466ac1a340c8dfe5ea8997178961e8328457d68..cb83d7e9ee8b67896adda10dbdc0c7da
|
|||||||
// The loaded "config" could potentially be a static forge config, ESM module or async function
|
// The loaded "config" could potentially be a static forge config, ESM module or async function
|
||||||
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
||||||
- const loaded = require(path_1.default.resolve(dir, forgeConfig));
|
- const loaded = require(path_1.default.resolve(dir, forgeConfig));
|
||||||
+ const loaded = await import(path_1.default.resolve(dir, forgeConfig));
|
+ const loaded = await import(require('node:url').pathToFileURL(path_1.default.join(dir, forgeConfig)))
|
||||||
const maybeForgeConfig = 'default' in loaded ? loaded.default : loaded;
|
const maybeForgeConfig = 'default' in loaded ? loaded.default : loaded;
|
||||||
forgeConfig = typeof maybeForgeConfig === 'function' ? await maybeForgeConfig() : maybeForgeConfig;
|
forgeConfig = typeof maybeForgeConfig === 'function' ? await maybeForgeConfig() : maybeForgeConfig;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,13 +16,10 @@
|
|||||||
"build": "NODE_ENV=production ts-node scripts/build-layers.ts",
|
"build": "NODE_ENV=production ts-node scripts/build-layers.ts",
|
||||||
"build:dev": "NODE_ENV=development ts-node scripts/build-layers.ts",
|
"build:dev": "NODE_ENV=development ts-node scripts/build-layers.ts",
|
||||||
"generate-assets": "ts-node scripts/generate-assets.ts",
|
"generate-assets": "ts-node scripts/generate-assets.ts",
|
||||||
"package": "electron-forge package",
|
"package": "cross-env NODE_OPTIONS=\"--loader ts-node/esm\" electron-forge package",
|
||||||
"make": "NODE_OPTIONS=\"--loader ts-node/esm\" electron-forge make",
|
"make": "cross-env NODE_OPTIONS=\"--loader ts-node/esm\" electron-forge make",
|
||||||
"make-squirrel": "yarn ts-node scripts/make-squirrel.ts"
|
"make-squirrel": "yarn ts-node scripts/make-squirrel.ts"
|
||||||
},
|
},
|
||||||
"config": {
|
|
||||||
"forge": "./forge.config.js"
|
|
||||||
},
|
|
||||||
"main": "./dist/main.js",
|
"main": "./dist/main.js",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@affine-test/kit": "workspace:*",
|
"@affine-test/kit": "workspace:*",
|
||||||
@@ -51,6 +48,7 @@
|
|||||||
"@toeverything/infra": "workspace:*",
|
"@toeverything/infra": "workspace:*",
|
||||||
"@types/uuid": "^9.0.5",
|
"@types/uuid": "^9.0.5",
|
||||||
"builder-util-runtime": "^9.2.1",
|
"builder-util-runtime": "^9.2.1",
|
||||||
|
"cross-env": "^7.0.3",
|
||||||
"electron": "^27.0.0",
|
"electron": "^27.0.0",
|
||||||
"electron-log": "^5.0.0-rc.1",
|
"electron-log": "^5.0.0-rc.1",
|
||||||
"electron-squirrel-startup": "1.0.0",
|
"electron-squirrel-startup": "1.0.0",
|
||||||
|
|||||||
@@ -414,6 +414,7 @@ __metadata:
|
|||||||
"@types/uuid": ^9.0.5
|
"@types/uuid": ^9.0.5
|
||||||
async-call-rpc: ^6.3.1
|
async-call-rpc: ^6.3.1
|
||||||
builder-util-runtime: ^9.2.1
|
builder-util-runtime: ^9.2.1
|
||||||
|
cross-env: ^7.0.3
|
||||||
electron: ^27.0.0
|
electron: ^27.0.0
|
||||||
electron-log: ^5.0.0-rc.1
|
electron-log: ^5.0.0-rc.1
|
||||||
electron-squirrel-startup: 1.0.0
|
electron-squirrel-startup: 1.0.0
|
||||||
@@ -4317,7 +4318,7 @@ __metadata:
|
|||||||
|
|
||||||
"@electron-forge/core@patch:@electron-forge/core@npm%3A6.4.2#./.yarn/patches/@electron-forge-core-npm-6.4.2-ab60c87e75.patch::locator=%40affine%2Fmonorepo%40workspace%3A.":
|
"@electron-forge/core@patch:@electron-forge/core@npm%3A6.4.2#./.yarn/patches/@electron-forge-core-npm-6.4.2-ab60c87e75.patch::locator=%40affine%2Fmonorepo%40workspace%3A.":
|
||||||
version: 6.4.2
|
version: 6.4.2
|
||||||
resolution: "@electron-forge/core@patch:@electron-forge/core@npm%3A6.4.2#./.yarn/patches/@electron-forge-core-npm-6.4.2-ab60c87e75.patch::version=6.4.2&hash=792119&locator=%40affine%2Fmonorepo%40workspace%3A."
|
resolution: "@electron-forge/core@patch:@electron-forge/core@npm%3A6.4.2#./.yarn/patches/@electron-forge-core-npm-6.4.2-ab60c87e75.patch::version=6.4.2&hash=fab642&locator=%40affine%2Fmonorepo%40workspace%3A."
|
||||||
dependencies:
|
dependencies:
|
||||||
"@electron-forge/core-utils": 6.4.2
|
"@electron-forge/core-utils": 6.4.2
|
||||||
"@electron-forge/maker-base": 6.4.2
|
"@electron-forge/maker-base": 6.4.2
|
||||||
@@ -4353,7 +4354,7 @@ __metadata:
|
|||||||
sudo-prompt: ^9.1.1
|
sudo-prompt: ^9.1.1
|
||||||
username: ^5.1.0
|
username: ^5.1.0
|
||||||
yarn-or-npm: ^3.0.1
|
yarn-or-npm: ^3.0.1
|
||||||
checksum: 72a0a74b0f84b848e4aa1423757a8cc5234ce45963dd6aaed92878f29234894e8d97d8270bd21d6ceedba44447409c85394f7fb75d8e239a2abe704f9f0eb214
|
checksum: b7784623340ae8080da890f49ebc3d37f84d7b40c55aed0ed608e25cd77c8ba73e4a42b1784dd6c3f2b4431a3406c1242819166b195b44fbd4f2ee3e7e012ff8
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user