diff --git a/.eslintrc.json b/.eslintrc.json index 011e046..3aea495 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -7,16 +7,9 @@ ], "overrides": [ { - "files": [ - "*.ts" - ], + "files": ["*.ts"], "parserOptions": { - "project": [ - "./tsconfig.serve.json", - "./src/tsconfig.app.json", - "./src/tsconfig.spec.json", - "./e2e/tsconfig.e2e.json" - ], + "project": ["./tsconfig.serve.json", "./src/tsconfig.app.json"], "createDefaultProgram": true }, "extends": [ @@ -33,7 +26,7 @@ "@typescript-eslint/no-unsafe-call": 0, "@typescript-eslint/no-unsafe-member-access": 0, "prefer-arrow/prefer-arrow-functions": 0, - "@angular-eslint/directive-selector": 0, + "@angular-eslint/directive-selector": 0, "@angular-eslint/component-selector": [ "error", { @@ -46,14 +39,9 @@ } }, { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended" - ], - "rules": { - } + "files": ["*.html"], + "extends": ["plugin:@angular-eslint/template/recommended"], + "rules": {} } ] } diff --git a/angular.json b/angular.json index a750f75..0965fa9 100644 --- a/angular.json +++ b/angular.json @@ -1,9 +1,7 @@ { "$schema": "./node_modules/@angular/cli/lib/config/schema.json", "cli": { - "schematicCollections": [ - "@angular-eslint/schematics" - ] + "schematicCollections": ["@angular-eslint/schematics"] }, "version": 1, "newProjectRoot": "projects", @@ -31,13 +29,8 @@ "tsConfig": "src/tsconfig.app.json", "polyfills": "src/polyfills.ts", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [], "customWebpackConfig": { "path": "./angular.webpack.js", @@ -142,30 +135,13 @@ "options": { "polyfills": ["src/polyfills-test.ts"], "tsConfig": "src/tsconfig.spec.json", - "globalMocks": ["styleTransform", "matchMedia", "getComputedStyle"], + "globalMocks": ["styleTransform", "matchMedia", "getComputedStyle"] } }, "lint": { "builder": "@angular-eslint/builder:lint", "options": { - "lintFilePatterns": [ - "src/**/*.ts", - "src/**/*.html" - ] - } - } - } - }, - "angular-electron-e2e": { - "root": "e2e", - "projectType": "application", - "architect": { - "lint": { - "builder": "@angular-eslint/builder:lint", - "options": { - "lintFilePatterns": [ - "e2e/**/*.ts" - ] + "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"] } } } diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index ab5df28..e6dba7c 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,28 +1,28 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; -import { PageNotFoundComponent } from './shared/components'; +import { RouterModule, Routes } from '@angular/router'; +import { PageNotFoundComponent } from './shared/components/page-not-found'; -import { HomeRoutingModule } from './home/home-routing.module'; import { DetailRoutingModule } from './detail/detail-routing.module'; +import { HomeRoutingModule } from './home/home-routing.module'; const routes: Routes = [ { path: '', redirectTo: 'home', - pathMatch: 'full' + pathMatch: 'full', }, { path: '**', - component: PageNotFoundComponent - } + component: PageNotFoundComponent, + }, ]; @NgModule({ imports: [ RouterModule.forRoot(routes, {}), HomeRoutingModule, - DetailRoutingModule + DetailRoutingModule, ], - exports: [RouterModule] + exports: [RouterModule], }) -export class AppRoutingModule { } +export class AppRoutingModule {} diff --git a/src/app/shared/components/index.ts b/src/app/shared/components/index.ts deleted file mode 100644 index 88746a9..0000000 --- a/src/app/shared/components/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './page-not-found/page-not-found.component'; diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 00948ee..74d1389 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -1,14 +1,13 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; - import { FormsModule } from '@angular/forms'; -import { PageNotFoundComponent } from './components/'; +import { PageNotFoundComponent } from './components/page-not-found'; import { WebviewDirective } from './directives/'; @NgModule({ declarations: [PageNotFoundComponent, WebviewDirective], imports: [CommonModule, FormsModule], - exports: [WebviewDirective, FormsModule] + exports: [WebviewDirective, FormsModule], }) export class SharedModule {} diff --git a/src/polyfills-test.ts b/src/polyfills-test.ts deleted file mode 100644 index e7331e6..0000000 --- a/src/polyfills-test.ts +++ /dev/null @@ -1 +0,0 @@ -import 'zone.js'; diff --git a/src/tsconfig.spec.json b/src/tsconfig.spec.json deleted file mode 100644 index 7d17189..0000000 --- a/src/tsconfig.spec.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "esModuleInterop": true, - "outDir": "../out-tsc/spec", - "types": [ - "jest", - "node" - ] - }, - "files": [ - "polyfills-test.ts" - ], - "include": [ - "**/*.spec.ts", - "**/*.d.ts" - ], - "exclude": [ - "dist", - "release", - "node_modules" - ] -} diff --git a/tsconfig.serve.json b/tsconfig.serve.json index 348d70d..2f677c3 100644 --- a/tsconfig.serve.json +++ b/tsconfig.serve.json @@ -7,21 +7,10 @@ "experimentalDecorators": true, "module": "commonjs", "target": "es2015", - "types": [ - "node" - ], - "lib": [ - "es2017", - "es2016", - "es2015", - "dom" - ] + "types": ["node"], + "lib": ["es2017", "es2016", "es2015", "dom"] }, - "files": [ - "app/main.ts" - ], - "exclude": [ - "node_modules", - "**/*.spec.ts" - ] + "files": ["app/main.ts"], + "include": ["src/**/*.ts"], + "exclude": ["node_modules", "**/*.spec.ts"] }