1
0
mirror of https://github.com/bitwarden/browser synced 2026-01-01 08:03:20 +00:00

*Wip* Run proxy app through electron

This commit is contained in:
Hinton
2020-11-23 18:37:04 +01:00
parent 4f466fba43
commit efb7cc98ae
7 changed files with 21 additions and 98 deletions

View File

@@ -32,7 +32,6 @@
"build:main": "webpack --config webpack.main.js",
"build:renderer": "gulp prebuild:renderer && webpack --config webpack.renderer.js",
"build:renderer:watch": "gulp prebuild:renderer && webpack --config webpack.renderer.js --watch",
"build:proxy": "tsc --build proxy",
"electron": "npm run build:main && concurrently -k -n Main,Rend -c yellow,cyan \"electron --inspect=5858 ./build --watch\" \"npm run build:renderer:watch\"",
"clean:dist": "rimraf ./dist/*",
"clean:l10n": "git push origin --delete l10n_master",
@@ -43,15 +42,13 @@
"pack:mac:masdev": "npm run clean:dist && electron-builder --mac mas-dev -p never",
"pack:win": "npm run clean:dist && electron-builder --win --x64 --ia32 -p never -c.win.certificateSubjectName=\"8bit Solutions LLC\"",
"pack:win:ci": "npm run clean:dist && electron-builder --win --x64 --ia32 -p never",
"pack:proxy": "pkg build/proxy/app.js --out-path build/proxies",
"dist:dir": "npm run build && npm run dist:proxy && npm run pack:dir",
"dist:lin": "npm run build && npm run dist:proxy && npm run pack:lin",
"dist:mac": "npm run build && npm run dist:proxy && npm run pack:mac",
"dist:mac:mas": "npm run build && npm run dist:proxy && npm run pack:mac:mas",
"dist:mac:masdev": "npm run build && npm run dist:proxy && npm run pack:mac:masdev",
"dist:win": "npm run build && npm run dist:proxy && npm run pack:win",
"dist:win:ci": "npm run build && npm run dist:proxy && npm run pack:win:ci",
"dist:proxy": "npm run build:proxy && npm run pack:proxy",
"dist:dir": "npm run build && npm run pack:dir",
"dist:lin": "npm run build && npm run pack:lin",
"dist:mac": "npm run build && npm run pack:mac",
"dist:mac:mas": "npm run build && npm run pack:mac:mas",
"dist:mac:masdev": "npm run build && npm run pack:mac:masdev",
"dist:win": "npm run build && npm run pack:win",
"dist:win:ci": "npm run build && npm run pack:win:ci",
"publish:lin": "npm run build && npm run clean:dist && electron-builder --linux --x64 -p always",
"publish:mac": "npm run build && npm run clean:dist && electron-builder --mac -p always",
"publish:mac:mas": "npm run dist:mac:mas && npm run upload:mas",
@@ -114,12 +111,6 @@
"target": [
"dmg",
"zip"
],
"extraResources": [
{
"from": "build/proxies/app-macos",
"to": "proxy"
}
]
},
"win": {
@@ -130,10 +121,6 @@
"appx"
],
"extraResources": [
{
"from": "build/proxies/app-win.exe",
"to": "proxy.exe"
},
{
"from": "node_modules/regedit/vbs",
"to": "regedit/vbs",
@@ -157,13 +144,7 @@
"Name": "Bitwarden",
"Type": "Application",
"GenericName": "Password Manager"
},
"extraResources": [
{
"from": "build/proxies/app-linux",
"to": "proxy"
}
]
}
},
"dmg": {
"icon": "dmg.icns",
@@ -290,7 +271,6 @@
"node-abi": "^2.9.0",
"node-loader": "^0.6.0",
"node-sass": "^4.13.1",
"pkg": "^4.4.9",
"rimraf": "^2.6.2",
"sass-loader": "^7.1.0",
"ts-loader": "^8.0.2",