diff --git a/angular.json b/angular.json index 82bf5d7..df3fb46 100644 --- a/angular.json +++ b/angular.json @@ -50,7 +50,7 @@ } ] }, - "dev-web": { + "web": { "optimization": false, "outputHashing": "all", "sourceMap": true, @@ -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" diff --git a/main.ts b/main.ts index 71bd586..793275d 100644 --- a/main.ts +++ b/main.ts @@ -19,6 +19,7 @@ function createWindow() { height: size.height, webPreferences: { nodeIntegration: true, + allowRunningInsecureContent: (serve) ? true : false, }, }); diff --git a/package.json b/package.json index bbbcf12..c5e0549 100644 --- a/package.json +++ b/package.json @@ -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 .", @@ -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", diff --git a/tslint.json b/tslint.json index d675883..6da6f44 100644 --- a/tslint.json +++ b/tslint.json @@ -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,