Upstream/bitwarden-desktop
1
0
Fork 0
mirror of https://github.com/bitwarden/desktop.git synced 2024-11-30 12:54:31 +01:00
Code Issues Projects Releases Wiki Activity

Remove webpack-node-externals and use asarUnpack (#1221)

Browse Source
This commit is contained in:
Oscar Hinton 2022-01-12 11:32:02 +01:00 committed by GitHub
parent 23a7072341
commit f6f0bd2bfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 2173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
package-lock.json generated
View File

@ -62,8 +62,7 @@
"typescript": "4.3.5", "typescript": "4.3.5",
"webpack": "^5.64.4", "webpack": "^5.64.4",
"webpack-cli": "^4.9.1", "webpack-cli": "^4.9.1",
"webpack-merge": "^5.8.0", "webpack-merge": "^5.8.0"
"webpack-node-externals": "^3.0.0"
}, },
"engines": { "engines": {
"node": "~16", "node": "~16",
@ -9818,15 +9817,6 @@
"node": ">=10.0.0" "node": ">=10.0.0"
} }
}, },
"node_modules/webpack-node-externals": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-3.0.0.tgz",
"integrity": "sha512-LnL6Z3GGDPht/AigwRh2dvL9PQPFQ8skEpVrWZXLWBYmqcaojHNN0onvHzie6rq7EWKrrBfPYqNEzTJgiwEQDQ==",
"dev": true,
"engines": {
"node": ">=6"
}
},
"node_modules/webpack-sources": { "node_modules/webpack-sources": {
"version": "3.2.2", "version": "3.2.2",
"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz",
@ -17513,12 +17503,6 @@
"wildcard": "^2.0.0" "wildcard": "^2.0.0"
} }
}, },
"webpack-node-externals": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-3.0.0.tgz",
"integrity": "sha512-LnL6Z3GGDPht/AigwRh2dvL9PQPFQ8skEpVrWZXLWBYmqcaojHNN0onvHzie6rq7EWKrrBfPYqNEzTJgiwEQDQ==",
"dev": true
},
"webpack-sources": { "webpack-sources": {
"version": "3.2.2", "version": "3.2.2",
"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz",

11
package.json
View File

@ -72,6 +72,9 @@
"app": "build" "app": "build"
}, },
"afterSign": "scripts/after-sign.js", "afterSign": "scripts/after-sign.js",
"asarUnpack": [
"*.node"
],
"mac": { "mac": {
"electronUpdaterCompatibility": ">=0.0.1", "electronUpdaterCompatibility": ">=0.0.1",
"category": "public.app-category.productivity", "category": "public.app-category.productivity",
@ -179,10 +182,7 @@
"mas": { "mas": {
"entitlements": "resources/entitlements.mas.plist", "entitlements": "resources/entitlements.mas.plist",
"entitlementsInherit": "resources/entitlements.mas.inherit.plist", "entitlementsInherit": "resources/entitlements.mas.inherit.plist",
"hardenedRuntime": false, "hardenedRuntime": false
"asarUnpack": [
"node_modules/keytar"
]
}, },
"nsisWeb": { "nsisWeb": {
"oneClick": false, "oneClick": false,
@ -281,8 +281,7 @@
"typescript": "4.3.5", "typescript": "4.3.5",
"webpack": "^5.64.4", "webpack": "^5.64.4",
"webpack-cli": "^4.9.1", "webpack-cli": "^4.9.1",
"webpack-merge": "^5.8.0", "webpack-merge": "^5.8.0"
"webpack-node-externals": "^3.0.0"
}, },
"dependencies": { "dependencies": {
"@angular/animations": "^12.2.13", "@angular/animations": "^12.2.13",

2131
src/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

14
src/package.json
View File

@ -11,17 +11,5 @@
"type": "git", "type": "git",
"url": "https://github.com/bitwarden/desktop" "url": "https://github.com/bitwarden/desktop"
}, },
"dependencies": { "dependencies": {}
"@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4",
"big-integer": "1.6.48",
"browser-hrtime": "^1.1.8",
"electron-log": "4.4.1",
"electron-store": "8.0.1",
"electron-updater": "4.6.1",
"forcefocus": "^1.1.0",
"keytar": "7.6.0",
"node-ipc": "^9.1.4",
"regedit": "^3.0.3",
"zxcvbn": "4.4.2"
}
} }

9
webpack.main.js
View File

@ -2,7 +2,6 @@ const path = require("path");
const { merge } = require("webpack-merge"); const { merge } = require("webpack-merge");
const CopyWebpackPlugin = require("copy-webpack-plugin"); const CopyWebpackPlugin = require("copy-webpack-plugin");
const { CleanWebpackPlugin } = require("clean-webpack-plugin"); const { CleanWebpackPlugin } = require("clean-webpack-plugin");
const nodeExternals = require("webpack-node-externals");
const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin"); const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
const NODE_ENV = process.env.NODE_ENV == null ? "development" : process.env.NODE_ENV; const NODE_ENV = process.env.NODE_ENV == null ? "development" : process.env.NODE_ENV;
@ -76,11 +75,9 @@ const main = {
], ],
}), }),
], ],
externals: [ externals: {
nodeExternals({ "electron-reload": "commonjs2 electron-reload",
allowlist: ["rxjs"], },
}),
],
}; };
module.exports = merge(common, NODE_ENV === "development" ? dev : prod, main); module.exports = merge(common, NODE_ENV === "development" ? dev : prod, main);