build: fix arm64 mac build (#1704)

This commit is contained in:
Peng Xiao
2023-03-28 07:03:11 +08:00
committed by GitHub
parent d780e90d88
commit dc768e0ba9
3 changed files with 14 additions and 1 deletions
+1 -1
View File
@@ -139,7 +139,7 @@ jobs:
path: apps/electron/dist path: apps/electron/dist
- name: build octobase-node - name: build octobase-node
run: yarn build:octobase-node run: yarn build:octobase-node --target=aarch64-apple-darwin
working-directory: apps/electron working-directory: apps/electron
- name: move octobase Binary - name: move octobase Binary
+11
View File
@@ -10,6 +10,16 @@ const { node } = JSON.parse(
) )
); );
const nativeNodeModulesPlugin = {
name: 'native-node-modules',
setup(build) {
// Mark native Node.js modules as external
build.onResolve({ filter: /\.node$/, namespace: 'file' }, args => {
return { path: args.path, external: true };
});
},
};
/** @type {import('esbuild').BuildOptions} */ /** @type {import('esbuild').BuildOptions} */
export const mainConfig = { export const mainConfig = {
entryPoints: ['layers/main/src/index.ts'], entryPoints: ['layers/main/src/index.ts'],
@@ -18,6 +28,7 @@ export const mainConfig = {
target: `node${node}`, target: `node${node}`,
platform: 'node', platform: 'node',
external: ['electron'], external: ['electron'],
plugins: [nativeNodeModulesPlugin],
}; };
export const preloadConfig = { export const preloadConfig = {
+2
View File
@@ -54,6 +54,7 @@ async function main() {
const preloadBuild = await esbuild.context({ const preloadBuild = await esbuild.context({
...preloadConfig, ...preloadConfig,
plugins: [ plugins: [
...(preloadConfig.plugins ?? []),
{ {
name: 'affine-dev:reload-app-on-preload-change', name: 'affine-dev:reload-app-on-preload-change',
setup(build) { setup(build) {
@@ -86,6 +87,7 @@ async function main() {
'process.env.DEV_SERVER_URL': `"${process.env.DEV_SERVER_URL}"`, 'process.env.DEV_SERVER_URL': `"${process.env.DEV_SERVER_URL}"`,
}, },
plugins: [ plugins: [
...(mainConfig.plugins ?? []),
{ {
name: 'affine-dev:reload-app-on-main-change', name: 'affine-dev:reload-app-on-main-change',
setup(build) { setup(build) {