diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1d084f7..9afe3a8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,10 +42,10 @@ jobs: strategy: fail-fast: false matrix: - # os: [macos-13, macos-14, ubuntu-22.04, windows-2022] - os: [ macos-14, ubuntu-22.04] - electron: [32.1.2] - # electron: [29.4.6, 30.5.1, 31.6.0, 32.1.2] + os: [macos-13, macos-14, ubuntu-22.04, windows-2022] + # os: [ macos-14, ubuntu-22.04] + # electron: [32.1.2] + electron: [29.4.6, 30.5.1, 31.6.0, 32.1.2] # electron: [31.6.0, 32.1.0] name: test-${{ matrix.os }}-v${{ matrix.electron }} diff --git a/README.md b/README.md index 2cb335e..0cd5c9b 100644 --- a/README.md +++ b/README.md @@ -10,15 +10,13 @@ | Electron | Node.Js | x86/x64 | arm64 | | --------------- | ---------------- | ------------------ | ------------------ | -| Electron 23.x | v18.12.1 | :heavy_check_mark: | :x: | -| Electron 24.x | v18.14.0 | :heavy_check_mark: | :x: | -| Electron 25.x | v18.15.0 | :heavy_check_mark: | :x: | | Electron 26.x | v18.16.1 | :heavy_check_mark: | :x: | | Electron 27.x | v18.17.1 | :heavy_check_mark: | :x: | | Electron 28.x | v18.18.2 | :heavy_check_mark: | :x: | | Electron 29.x | v20.9.0 | :heavy_check_mark: | :heavy_check_mark: | | Electron 30.x | v20.x | :heavy_check_mark: | :heavy_check_mark: | | Electron 31.x | v20.x | :heavy_check_mark: | :heavy_check_mark: | +| Electron 32.x | v20.x | :heavy_check_mark: | :heavy_check_mark: | - You do not need to use the same version of Node.js in your project as Electron Node.js version - On Linux and macOS `npm install` will compile binaries with correct Node.Js headers for a given Electron version. diff --git a/lib/native/win32/arm64/32.0.0/edge_coreclr.node b/lib/native/win32/arm64/32.0.0/edge_coreclr.node new file mode 100644 index 0000000..0f7164d Binary files /dev/null and b/lib/native/win32/arm64/32.0.0/edge_coreclr.node differ diff --git a/lib/native/win32/arm64/32.0.0/edge_nativeclr.node b/lib/native/win32/arm64/32.0.0/edge_nativeclr.node new file mode 100644 index 0000000..89d4802 Binary files /dev/null and b/lib/native/win32/arm64/32.0.0/edge_nativeclr.node differ diff --git a/lib/native/win32/ia32/23.0.0/edge_coreclr.node b/lib/native/win32/ia32/23.0.0/edge_coreclr.node deleted file mode 100644 index 0f4d433..0000000 Binary files a/lib/native/win32/ia32/23.0.0/edge_coreclr.node and /dev/null differ diff --git a/lib/native/win32/ia32/23.0.0/edge_nativeclr.node b/lib/native/win32/ia32/23.0.0/edge_nativeclr.node deleted file mode 100644 index 2736687..0000000 Binary files a/lib/native/win32/ia32/23.0.0/edge_nativeclr.node and /dev/null differ diff --git a/lib/native/win32/ia32/24.0.0/edge_coreclr.node b/lib/native/win32/ia32/24.0.0/edge_coreclr.node deleted file mode 100644 index ba85f7d..0000000 Binary files a/lib/native/win32/ia32/24.0.0/edge_coreclr.node and /dev/null differ diff --git a/lib/native/win32/ia32/24.0.0/edge_nativeclr.node b/lib/native/win32/ia32/24.0.0/edge_nativeclr.node deleted file mode 100644 index 9189794..0000000 Binary files a/lib/native/win32/ia32/24.0.0/edge_nativeclr.node and /dev/null differ diff --git a/lib/native/win32/ia32/25.0.0/edge_coreclr.node b/lib/native/win32/ia32/25.0.0/edge_coreclr.node deleted file mode 100644 index 7da4ec9..0000000 Binary files a/lib/native/win32/ia32/25.0.0/edge_coreclr.node and /dev/null differ diff --git a/lib/native/win32/ia32/25.0.0/edge_nativeclr.node b/lib/native/win32/ia32/25.0.0/edge_nativeclr.node deleted file mode 100644 index 864a127..0000000 Binary files a/lib/native/win32/ia32/25.0.0/edge_nativeclr.node and /dev/null differ diff --git a/lib/native/win32/ia32/32.0.0/edge_coreclr.node b/lib/native/win32/ia32/32.0.0/edge_coreclr.node new file mode 100644 index 0000000..9d6ebcc Binary files /dev/null and b/lib/native/win32/ia32/32.0.0/edge_coreclr.node differ diff --git a/lib/native/win32/ia32/32.0.0/edge_nativeclr.node b/lib/native/win32/ia32/32.0.0/edge_nativeclr.node new file mode 100644 index 0000000..5fe8391 Binary files /dev/null and b/lib/native/win32/ia32/32.0.0/edge_nativeclr.node differ diff --git a/lib/native/win32/x64/23.0.0/edge_coreclr.node b/lib/native/win32/x64/23.0.0/edge_coreclr.node deleted file mode 100644 index 1b0ef75..0000000 Binary files a/lib/native/win32/x64/23.0.0/edge_coreclr.node and /dev/null differ diff --git a/lib/native/win32/x64/23.0.0/edge_nativeclr.node b/lib/native/win32/x64/23.0.0/edge_nativeclr.node deleted file mode 100644 index 9bfe726..0000000 Binary files a/lib/native/win32/x64/23.0.0/edge_nativeclr.node and /dev/null differ diff --git a/lib/native/win32/x64/24.0.0/edge_coreclr.node b/lib/native/win32/x64/24.0.0/edge_coreclr.node deleted file mode 100644 index e502882..0000000 Binary files a/lib/native/win32/x64/24.0.0/edge_coreclr.node and /dev/null differ diff --git a/lib/native/win32/x64/24.0.0/edge_nativeclr.node b/lib/native/win32/x64/24.0.0/edge_nativeclr.node deleted file mode 100644 index 4272b0d..0000000 Binary files a/lib/native/win32/x64/24.0.0/edge_nativeclr.node and /dev/null differ diff --git a/lib/native/win32/x64/25.0.0/edge_coreclr.node b/lib/native/win32/x64/25.0.0/edge_coreclr.node deleted file mode 100644 index 72932cd..0000000 Binary files a/lib/native/win32/x64/25.0.0/edge_coreclr.node and /dev/null differ diff --git a/lib/native/win32/x64/25.0.0/edge_nativeclr.node b/lib/native/win32/x64/25.0.0/edge_nativeclr.node deleted file mode 100644 index 2029a68..0000000 Binary files a/lib/native/win32/x64/25.0.0/edge_nativeclr.node and /dev/null differ diff --git a/lib/native/win32/x64/32.0.0/edge_coreclr.node b/lib/native/win32/x64/32.0.0/edge_coreclr.node new file mode 100644 index 0000000..c16d40c Binary files /dev/null and b/lib/native/win32/x64/32.0.0/edge_coreclr.node differ diff --git a/lib/native/win32/x64/32.0.0/edge_nativeclr.node b/lib/native/win32/x64/32.0.0/edge_nativeclr.node new file mode 100644 index 0000000..2e0dc64 Binary files /dev/null and b/lib/native/win32/x64/32.0.0/edge_nativeclr.node differ diff --git a/package.json b/package.json index 2a82577..48732d4 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "url": "http://tomasz.janczuk.org", "twitter": "tjanczuk" }, - "version": "31.3.1", + "version": "32.0.0", "description": "Edge.js: run .NET and Node.js in-process on Electron", "tags": [ "owin", diff --git a/tools/install.js b/tools/install.js index 9dab748..fe5bbe5 100644 --- a/tools/install.js +++ b/tools/install.js @@ -117,24 +117,6 @@ else { return null; } - function replaceCppRuntime(){ - var files = ['build/build_managed.vcxproj','build/edge_coreclr.vcxproj', 'build/edge_nativeclr.vcxproj']; - - files.map(file => { - const res = spawn('sed', ['-i', '-e', 's/std:c++17/std:c++20/g', file], { stdio: 'inherit' }); - - return new Promise((resolve, reject) => { - res.on("close", code => { - if (code === 0) { - resolve(code) - } else { - reject(code) - } - }); - }); - }); - } - location = locateElectronPrebuilt(); version = null; electronPath = null; @@ -154,25 +136,9 @@ else { } if (version !== null) { - const configure = spawn('node-gyp', ['configure', '--target='+version, '--runtime=electron', '--disturl=https://electronjs.org/headers', '--release'], { stdio: 'inherit' }); - - if(version.startsWith('32')){ - configure.on('close', (code) => { - // spawn('ls', ['-R', 'build'], { stdio: 'inherit' }); - spawn('node-gyp', ['build'], { stdio: 'inherit' }); - - // Promise.all(replaceCppRuntime()).then((code) => { - // spawn('node-gyp', ['build'], { stdio: 'inherit' }); - // }); - }); - }else{ - configure.on('close', (code) => { - spawn('node-gyp', ['build'], { stdio: 'inherit' }); - }); - } + spawn('node-gyp', ['configure', 'build', '--target='+version, '--runtime=electron', '--disturl=https://electronjs.org/headers', '--release'], { stdio: 'inherit' }); } - else{ + else spawn('node-gyp', ['configure', 'build'], { stdio: 'inherit' }); - } }