Skip to content

Commit d872534

Browse files
authored
Merge pull request #163 from sengulhamza/fix-esbuild-in-macos
esbuild executable bin handling to OS
2 parents f76edea + c76d94a commit d872534

File tree

3 files changed

+26
-4
lines changed

3 files changed

+26
-4
lines changed

resources/bin/esbuild

9.36 MB
Binary file not shown.

src/cli/build.ts

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
import dllLib from '../../resources/lib/zlgcan.dll?asset&asarUnpack'
2-
import esbuildWin from '../../resources/bin/esbuild.exe?asset&asarUnpack'
2+
3+
let esbuild_executable: any
4+
5+
const loadEsbuild = async () => {
6+
if (process.platform === 'win32') {
7+
esbuild_executable = await import('../../../resources/bin/esbuild.exe?asset&asarUnpack')
8+
} else {
9+
esbuild_executable = await import('../../../resources/bin/esbuild?asset&asarUnpack')
10+
//<-- May change fetch from node_modules esbuild_executable = await import('esbuild/bin/esbuild?asset&asarUnpack')
11+
}
12+
}
13+
314
import path from 'path'
415
import { DataSet } from 'src/preload/data'
516
import { compileTsc, getBuildStatus } from 'src/main/docan/uds'
@@ -20,7 +31,7 @@ export async function build(
2031
projectName,
2132
data,
2233
entry,
23-
esbuildWin,
34+
esbuild_executable,
2435
path.join(libPath, 'js'),
2536
isTest
2637
)

src/main/ipc/uds.ts

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
import { BrowserWindow, ipcMain, shell } from 'electron'
22
import scriptIndex from '../../../resources/docs/.gitkeep?asset&asarUnpack'
3-
import esbuildWin from '../../../resources/bin/esbuild.exe?asset&asarUnpack'
3+
4+
let esbuild_executable: any
5+
6+
const loadEsbuild = async () => {
7+
if (process.platform === 'win32') {
8+
esbuild_executable = await import('../../../resources/bin/esbuild.exe?asset&asarUnpack')
9+
} else {
10+
esbuild_executable = await import('../../../resources/bin/esbuild?asset&asarUnpack')
11+
//<-- May change fetch from node_modules esbuild_executable = await import('esbuild/bin/esbuild?asset&asarUnpack')
12+
}
13+
}
14+
415
import path from 'path'
516
import {
617
compileTsc,
@@ -88,7 +99,7 @@ ipcMain.handle('ipc-build-project', async (event, ...arg) => {
8899
projectName,
89100
data,
90101
entry,
91-
esbuildWin,
102+
esbuild_executable,
92103
path.join(libPath, 'js'),
93104
isTest
94105
)

0 commit comments

Comments
 (0)