Skip to content

Commit

Permalink
require is not defined
Browse files Browse the repository at this point in the history
fix security issue with http local server:
https://github.com/electron/electron/blob/master/docs/api/browser-window.md#class-browserwindow

beutify dev-web -> web
fix tslint.json v5 naming issue
  • Loading branch information
Yuri Cherepanov committed Nov 15, 2019
1 parent c4b2cb6 commit 632c454
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
6 changes: 3 additions & 3 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
}
]
},
"dev-web": {
"web": {
"optimization": false,
"outputHashing": "all",
"sourceMap": true,
Expand Down Expand Up @@ -95,8 +95,8 @@
"dev": {
"browserTarget": "angular-electron:build:dev"
},
"dev-web": {
"browserTarget": "angular-electron:build:dev-web"
"web": {
"browserTarget": "angular-electron:build:web"
},
"production": {
"browserTarget": "angular-electron:build:production"
Expand Down
1 change: 1 addition & 0 deletions main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ function createWindow() {
height: size.height,
webPreferences: {
nodeIntegration: true,
allowRunningInsecureContent: (serve) ? true : false,
},
});

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"build:dev": "npm run build -- -c dev",
"build:prod": "npm run build -- -c production",
"ng:serve": "ng serve",
"ng:serve:web": "ng serve -c dev-web -o",
"ng:serve:web": "ng serve -c web -o",
"electron:serve-tsc": "tsc -p tsconfig-serve.json",
"electron:serve": "wait-on http-get://localhost:4200/ && npm run electron:serve-tsc && electron . --serve",
"electron:local": "npm run build:prod && electron .",
Expand Down Expand Up @@ -59,7 +59,7 @@
"codelyzer": "5.1.0",
"conventional-changelog-cli": "2.0.25",
"core-js": "3.1.4",
"electron": "7.0.0",
"electron": "7.1.1",
"electron-builder": "21.2.0",
"electron-reload": "1.5.0",
"jasmine-core": "3.4.0",
Expand Down
2 changes: 1 addition & 1 deletion tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
}
],
"unified-signatures": true,
"use-life-cycle-interface": true,
"use-lifecycle-interface": true,
"use-lifecycle-interface": true,
"use-pipe-transform-interface": true,
"variable-name": false,
Expand Down

0 comments on commit 632c454

Please sign in to comment.