Skip to content

Commit 23007c4

Browse files
committed
clean up webpack and disable run insecure contet
1 parent 8dffc09 commit 23007c4

File tree

5 files changed

+23
-35
lines changed

5 files changed

+23
-35
lines changed

main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ function createWindow() {
202202
backgroundColor: "-webkit-linear-gradient(top, #3dadc2 0%,#2f4858 100%)",
203203
show: false,
204204
title: "Swell",
205-
allowRunningInsecureContent: true,
205+
// allowRunningInsecureContent: true,
206206
webPreferences: {
207207
nodeIntegration: false,
208208
contextIsolation: true,

package-lock.json

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,9 @@
77
"scripts": {
88
"test-jest": "jest",
99
"test-mocha": "webpack --mode=production --config ./webpack.production.js && mocha",
10-
<<<<<<< HEAD
11-
"build": "cross-env NODE_ENV=production webpack --mode=production --config ./webpack.production.js",
12-
"start": "electron --noDevServer .",
13-
"prod": "webpack --mode production --config ./webpack.production.js && electron --noDevServer .",
14-
"dev": "webpack-dev-server --config ./webpack.development.js",
15-
=======
1610
"build": "webpack --mode=production --config ./webpack.production.js",
1711
"dev": "webpack-dev-server --mode=development --config ./webpack.development.js",
1812
"prod": "webpack --mode production --config ./webpack.production.js && electron --noDevServer .",
19-
>>>>>>> 892abbce7ecb7a42642effcec82e49f74862552b
2013
"server": "nodemon test-server/server.js",
2114
"package-mac": "electron-builder build --x64 --mac",
2215
"package-all": "electron-builder build -mwl",

webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ module.exports = {
6565
// unsafe-eval allowed because dependency (protobufjs) of @grpc/grpc-js uses eval();
6666
// hopefully, grpc will update their version of protobufjs, and that version will not use eval
6767
// related to this issue: https://github.com/protobufjs/protobuf.js/issues/997
68-
"script-src": ["'self'", "'unsafe-eval'"],
68+
"script-src": ["'self'"],
6969
"style-src": ["'self'"],
7070
},
7171
hashEnabled: {

webpack.production.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,4 @@ module.exports = merge(base, {
1010
publicPath: "./",
1111
},
1212
devtool: "nosources-source-map",
13-
output: {
14-
path: path.resolve(__dirname, "dist"),
15-
filename: "bundle.js",
16-
publicPath: "./",
17-
},
1813
});

0 commit comments

Comments
 (0)