diff --git a/e2e/common-setup.ts b/e2e/common-setup.ts index e6c0436cf..577604d5d 100644 --- a/e2e/common-setup.ts +++ b/e2e/common-setup.ts @@ -1,8 +1,5 @@ -/* eslint "@typescript-eslint/no-var-requires": 0 */ const Application = require('spectron').Application; -/* eslint "@typescript-eslint/no-var-requires": 0 */ const electronPath = require('electron'); // Require Electron from the binaries included in node_modules. -/* eslint "@typescript-eslint/no-var-requires": 0 */ const path = require('path'); export default function setup(): void { diff --git a/e2e/main.spec.ts b/e2e/main.spec.ts index ec90683cc..163f13480 100644 --- a/e2e/main.spec.ts +++ b/e2e/main.spec.ts @@ -6,13 +6,11 @@ import commonSetup from './common-setup'; describe('angular-electron App', function () { commonSetup.apply(this); - /* eslint "@typescript-eslint/no-explicit-any": 0 */ let browser: any; let client: SpectronClient; beforeEach(function () { client = this.app.client; - /* eslint "@typescript-eslint/no-explicit-any": 0 */ browser = client as any; }); @@ -21,7 +19,6 @@ describe('angular-electron App', function () { expect(text).to.equal('App works !'); }); - it('creates initial windows', async function () { const count = await client.getWindowCount(); expect(count).to.equal(1); diff --git a/eslintrc.json b/eslintrc.json index a1f75f922..913e297a9 100644 --- a/eslintrc.json +++ b/eslintrc.json @@ -15,5 +15,10 @@ "parserOptions": { "tsconfigRootDir": "." }, - "plugins": ["@typescript-eslint"] + "plugins": ["@typescript-eslint"], + "rules": { + "@typescript-eslint/no-empty-function": 0, + "@typescript-eslint/no-var-requires": 0, + "@typescript-eslint/no-explicit-any": 0 + } } diff --git a/main.ts b/main.ts index 35dd37aad..e38690786 100644 --- a/main.ts +++ b/main.ts @@ -24,7 +24,6 @@ function createWindow(): BrowserWindow { }); if (serve) { - /* eslint "@typescript-eslint/no-var-requires": 0 */ require('electron-reload')(__dirname, { electron: require(`${__dirname}/node_modules/electron`) }); diff --git a/package.json b/package.json index e4f0de47f..41f8d60c4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angular-electron", - "version": "6.3.1", + "version": "6.4.0", "description": "Angular 8 with Electron (Typescript + SASS + Hot Reload)", "homepage": "https://github.com/maximegris/angular-electron", "author": { @@ -12,6 +12,8 @@ "angular 8", "electron", "typescript", + "eslint", + "spectron", "sass" ], "main": "main.js", @@ -56,8 +58,8 @@ "@types/jasminewd2": "2.0.6", "@types/mocha": "5.2.7", "@types/node": "12.6.8", - "@typescript-eslint/eslint-plugin": "^2.7.0", - "@typescript-eslint/parser": "^2.7.0", + "@typescript-eslint/eslint-plugin": "2.8.0", + "@typescript-eslint/parser": "2.8.0", "chai": "4.2.0", "codelyzer": "5.1.0", "conventional-changelog-cli": "2.0.25", @@ -65,13 +67,13 @@ "electron": "7.1.1", "electron-builder": "21.2.0", "electron-reload": "1.5.0", - "eslint": "^6.6.0", - "eslint-plugin-import": "^2.18.2", + "eslint": "6.6.0", + "eslint-plugin-import": "2.18.2", "jasmine-core": "3.4.0", "jasmine-spec-reporter": "4.2.1", "karma": "4.2.0", "karma-coverage-istanbul-reporter": "2.1.0", - "karma-electron": "^6.3.0", + "karma-electron": "6.3.0", "karma-jasmine": "2.0.1", "karma-jasmine-html-reporter": "1.4.2", "mocha": "6.2.0", diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 739960791..ec5d46529 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -7,10 +7,8 @@ import { Component, OnInit } from '@angular/core'; }) export class HomeComponent implements OnInit { - /* eslint "no-empty-function":0, "@typescript-eslint/no-empty-function": 0 */ constructor() { } - /* eslint "no-empty-function":0, "@typescript-eslint/no-empty-function": 0 */ ngOnInit(): void { } } diff --git a/src/app/shared/components/page-not-found/page-not-found.component.ts b/src/app/shared/components/page-not-found/page-not-found.component.ts index 2aca12676..ae41e0d80 100644 --- a/src/app/shared/components/page-not-found/page-not-found.component.ts +++ b/src/app/shared/components/page-not-found/page-not-found.component.ts @@ -6,9 +6,7 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./page-not-found.component.scss'] }) export class PageNotFoundComponent implements OnInit { - /* eslint "no-empty-function":0, "@typescript-eslint/no-empty-function": 0 */ constructor() {} - /* eslint "no-empty-function":0, "@typescript-eslint/no-empty-function": 0 */ ngOnInit(): void {} } diff --git a/src/app/shared/directives/webview/webview.directive.ts b/src/app/shared/directives/webview/webview.directive.ts index 026fd51d4..224958663 100644 --- a/src/app/shared/directives/webview/webview.directive.ts +++ b/src/app/shared/directives/webview/webview.directive.ts @@ -4,6 +4,5 @@ import { Directive } from '@angular/core'; selector: 'webview' }) export class WebviewDirective { - /* eslint "no-empty-function":0, "@typescript-eslint/no-empty-function": 0 */ constructor() {} } diff --git a/src/test.ts b/src/test.ts index 2f09f7f2c..16317897b 100644 --- a/src/test.ts +++ b/src/test.ts @@ -7,7 +7,6 @@ import { platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; -/* eslint "@typescript-eslint/no-explicit-any":0 */ declare const require: any; // First, initialize the Angular testing environment.