diff --git a/angular.json b/angular.json index a83c946..cbe3c6a 100644 --- a/angular.json +++ b/angular.json @@ -130,9 +130,6 @@ "lintFilePatterns": [ "src/**.ts", "main.ts" - ], - "exclude": [ - "**/node_modules/**" ] } } @@ -148,9 +145,6 @@ "eslintConfig": ".eslintrc.json", "lintFilePatterns": [ "e2e/**.ts" - ], - "exclude": [ - "**/node_modules/**" ] } } diff --git a/main.ts b/main.ts index a7aa3d9..a219ebb 100644 --- a/main.ts +++ b/main.ts @@ -20,7 +20,8 @@ function createWindow(): BrowserWindow { webPreferences: { nodeIntegration: true, allowRunningInsecureContent: (serve) ? true : false, - enableRemoteModule : true // true if you want to run 2e2 test or use remote module in renderer context (ie. Angular) + contextIsolation: false, // false if you want to run 2e2 test with Spectron + enableRemoteModule : true // true if you want to run 2e2 test with Spectron or use remote module in renderer context (ie. Angular) }, }); diff --git a/package.json b/package.json index fa32486..2980a96 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angular-electron", - "version": "8.0.4", + "version": "8.0.5", "description": "Angular 10 with Electron (Typescript + SASS + Hot Reload)", "homepage": "https://github.com/maximegris/angular-electron", "author": { @@ -41,51 +41,51 @@ "lint": "ng lint" }, "devDependencies": { - "@angular-builders/custom-webpack": "9.2.0", - "@angular-devkit/build-angular": "0.1000.8", - "@angular-eslint/builder": "0.2.0-beta.1", - "@angular-eslint/eslint-plugin": "0.2.0-beta.1", - "@angular-eslint/eslint-plugin-template": "0.2.0-beta.1", - "@angular-eslint/template-parser": "0.2.0-beta.1", - "@angular/cli": "10.0.8", - "@angular/common": "10.0.14", - "@angular/compiler": "10.0.14", - "@angular/compiler-cli": "10.0.14", - "@angular/core": "10.0.14", - "@angular/forms": "10.0.14", - "@angular/language-service": "10.0.14", - "@angular/platform-browser": "10.0.14", - "@angular/platform-browser-dynamic": "10.0.14", - "@angular/router": "10.0.14", + "@angular-builders/custom-webpack": "10.0.1", + "@angular-devkit/build-angular": "0.1001.3", + "@angular-eslint/builder": "0.4.0-beta.2", + "@angular-eslint/eslint-plugin": "0.4.0-beta.2", + "@angular-eslint/eslint-plugin-template": "0.4.0-beta.2", + "@angular-eslint/template-parser": "0.4.0-beta.2", + "@angular/cli": "10.1.3", + "@angular/common": "10.1.3", + "@angular/compiler": "10.1.3", + "@angular/compiler-cli": "10.1.3", + "@angular/core": "10.1.3", + "@angular/forms": "10.1.3", + "@angular/language-service": "10.1.3", + "@angular/platform-browser": "10.1.3", + "@angular/platform-browser-dynamic": "10.1.3", + "@angular/router": "10.1.3", "@ngx-translate/core": "13.0.0", "@ngx-translate/http-loader": "6.0.0", "@types/jasmine": "3.5.14", "@types/jasminewd2": "2.0.8", "@types/mocha": "8.0.3", "@types/node": "12.12.6", - "@typescript-eslint/eslint-plugin": "3.10.1", - "@typescript-eslint/eslint-plugin-tslint": "3.10.1", - "@typescript-eslint/parser": "3.10.1", + "@typescript-eslint/eslint-plugin": "4.2.0", + "@typescript-eslint/eslint-plugin-tslint": "4.2.0", + "@typescript-eslint/parser": "4.2.0", "chai": "4.2.0", "conventional-changelog-cli": "2.1.0", "core-js": "3.6.5", "cross-env": "7.0.2", - "electron": "9.3.0", - "electron-builder": "22.8.0", + "electron": "10.1.2", + "electron-builder": "22.8.1", "electron-reload": "1.5.0", - "eslint": "7.7.0", - "eslint-plugin-import": "2.22.0", + "eslint": "7.10.0", + "eslint-plugin-import": "2.22.1", "jasmine-core": "3.6.0", - "jasmine-spec-reporter": "5.0.2", - "karma": "5.1.1", + "jasmine-spec-reporter": "6.0.0", + "karma": "5.2.3", "karma-coverage-istanbul-reporter": "3.0.3", "karma-electron": "6.3.1", "karma-jasmine": "4.0.1", "karma-jasmine-html-reporter": "1.5.4", "mocha": "8.1.3", "npm-run-all": "4.1.5", - "rxjs": "6.6.2", - "spectron": "11.1.0", + "rxjs": "6.6.3", + "spectron": "12.0.0", "ts-node": "9.0.0", "tslib": "2.0.1", "typescript": "3.9.7",