diff --git a/electron-builder.json b/electron-builder.json index 8379fb56a..13a9035bc 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -9,10 +9,9 @@ "src/shared/**/*.js*", "**/*/browser/dist/**/*", "**/*/node/dist/**/*", - "src/core/api-manager/node/", + "src/workbench/node/", "src/core/**/package.json", "src/app/common/**/*", - "src/app/browser/index.html", "!**/*.ts" ], "publish": ["github"], diff --git a/package.json b/package.json index 6ed0a2481..d469572ef 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,6 @@ "postinstall": "npm-run-all --serial install:* build:app", "start": "npm-run-all -p startall electron:serve", "startall": "npm-run-all -p start:*", - "install:app": "cd src/app/browser&&npm install", - "build:app": "cd src/app/browser&&npm run build", "install:workbench": "cd src/workbench/browser&&npm install", "start:workbench": "cd src/workbench/browser&&npm start", "build:workbench": "cd src/workbench/browser&&npm run build", diff --git a/src/app/electron-main/main.ts b/src/app/electron-main/main.ts index 613711934..9f8bfb9fb 100644 --- a/src/app/electron-main/main.ts +++ b/src/app/electron-main/main.ts @@ -45,7 +45,7 @@ function createWindow(): BrowserWindow { }); if (['serve'].includes(processEnv) ) { require('electron-reload')(__dirname, { - electron: require(path.join(process.cwd(), '/node_modules/electron')), + electron: require(path.join(__dirname, '../node_modules/electron')), }); } proxyOpenExternal(win); @@ -53,7 +53,7 @@ function createWindow(): BrowserWindow { const file: string = processEnv === 'development' ? 'http://localhost:4200' - : `file://${path.join(__dirname, '../browser', 'index.html')}`; + : `file://${path.join(__dirname, '../../workbench/browser/dist/index.html')}`; win.loadURL(file); win.webContents.openDevTools({ mode: 'undocked',