Skip to content

Commit

Permalink
ref/ set default angular eslint rules
Browse files Browse the repository at this point in the history
  • Loading branch information
maximegris committed Jun 20, 2021
1 parent 2b819d7 commit 7d531d1
Show file tree
Hide file tree
Showing 15 changed files with 34 additions and 36 deletions.
11 changes: 6 additions & 5 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"root": true,
"ignorePatterns": [
"projects/**/*"
"app/**/*", // ignore nodeJs files
"dist/**/*",
"release/**/*"
],
"overrides": [
{
Expand All @@ -18,7 +20,8 @@
"createDefaultProgram": true
},
"extends": [
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/ng-cli-compat",
"plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
"plugin:@angular-eslint/template/process-inline-templates"
],
"rules": {
Expand All @@ -35,14 +38,12 @@
},
{
"files": [
"*.component.html"
"*.html"
],
"extends": [
"plugin:@angular-eslint/template/recommended"
],
"rules": {
"@angular-eslint/template/banana-in-box": "error",
"@angular-eslint/template/no-negated-async": "error"
}
}
]
Expand Down
4 changes: 1 addition & 3 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,9 @@
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"eslintConfig": ".eslintrc.json",
"lintFilePatterns": [
"src/**/*.ts",
"src/**/*.component.html"
"src/**/*.html"
]
}
}
Expand All @@ -148,7 +147,6 @@
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"eslintConfig": ".eslintrc.json",
"lintFilePatterns": [
"e2e/**/*.ts"
]
Expand Down
16 changes: 8 additions & 8 deletions e2e/common-setup.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
const Application = require('spectron').Application;
const electronPath = require('electron'); // Require Electron from the binaries included in node_modules.
const path = require('path');
const APPLICATION = require('spectron').Application;
const ELECTRON_PATH = require('electron'); // Require Electron from the binaries included in node_modules.
const PATH = require('path');

export default function setup(): void {
beforeEach(async function () {
this.app = new Application({
beforeEach(async () => {
this.app = new APPLICATION({
// Your electron path can be any binary
// i.e for OSX an example path could be '/Applications/MyApp.app/Contents/MacOS/MyApp'
// But for the sake of the example we fetch it from our node_modules.
path: electronPath,
path: ELECTRON_PATH,

// Assuming you have the following directory structure

Expand All @@ -23,14 +23,14 @@ export default function setup(): void {

// The following line tells spectron to look and use the main.js file
// and the package.json located 1 level above.
args: [path.join(__dirname, '..')],
args: [PATH.join(__dirname, '..')],
webdriverOptions: {}
});

await this.app.start();
});

afterEach(async function () {
afterEach(async () => {
if (this.app && this.app.isRunning()) {
await this.app.stop();
}
Expand Down
6 changes: 3 additions & 3 deletions e2e/main.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { SpectronClient } from 'spectron';

import commonSetup from './common-setup';

describe('angular-electron App', function () {
describe('angular-electron App', () => {

commonSetup.apply(this);

Expand All @@ -13,12 +13,12 @@ describe('angular-electron App', function () {
client = this.app.client;
});

it('creates initial windows', async function () {
it('creates initial windows', async () => {
const count = await client.getWindowCount();
expect(count).to.equal(1);
});

it('should display message saying App works !', async function () {
it('should display message saying App works !', async () => {
const elem = await client.$('app-home h1');
const text = await elem.getText();
expect(text).to.equal('App works !');
Expand Down
4 changes: 2 additions & 2 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component } from '@angular/core';
import { ElectronService } from './core/services';
import { TranslateService } from '@ngx-translate/core';
import { AppConfig } from '../environments/environment';
import { APP_CONFIG } from '../environments/environment';

@Component({
selector: 'app-root',
Expand All @@ -14,7 +14,7 @@ export class AppComponent {
private translate: TranslateService
) {
this.translate.setDefaultLang('en');
console.log('AppConfig', AppConfig);
console.log('APP_CONFIG', APP_CONFIG);

if (electronService.isElectron) {
console.log(process.env);
Expand Down
6 changes: 2 additions & 4 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ import { DetailModule } from './detail/detail.module';
import { AppComponent } from './app.component';

// AoT requires an exported function for factories
export function HttpLoaderFactory(http: HttpClient): TranslateHttpLoader {
return new TranslateHttpLoader(http, './assets/i18n/', '.json');
}
const httpLoaderFactory = (http: HttpClient): TranslateHttpLoader => new TranslateHttpLoader(http, './assets/i18n/', '.json');

@NgModule({
declarations: [AppComponent],
Expand All @@ -35,7 +33,7 @@ export function HttpLoaderFactory(http: HttpClient): TranslateHttpLoader {
TranslateModule.forRoot({
loader: {
provide: TranslateLoader,
useFactory: HttpLoaderFactory,
useFactory: httpLoaderFactory,
deps: [HttpClient]
}
})
Expand Down
3 changes: 2 additions & 1 deletion src/app/core/services/electron/electron.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ export class ElectronService {
this.childProcess = window.require('child_process');
this.fs = window.require('fs');

// If you want to use a NodeJS 3rd party deps in Renderer process (like @electron/remote), it must be declared in dependencies of both package.json (in root and app folders)
// If you want to use a NodeJS 3rd party deps in Renderer process (like @electron/remote),
// it must be declared in dependencies of both package.json (in root and app folders)
// If you want to use remote object in renderer process, please set enableRemoteModule to true in main.ts
this.remote = window.require('@electron/remote');
console.log('remote - globalShortcut', this.remote.globalShortcut);
Expand Down
2 changes: 1 addition & 1 deletion src/app/detail/detail.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export class DetailComponent implements OnInit {
constructor() { }

ngOnInit(): void {
console.log("DetailComponent INIT");
console.log('DetailComponent INIT');
}

}
4 changes: 2 additions & 2 deletions src/app/home/home.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ export class HomeComponent implements OnInit {

constructor(private router: Router) { }

ngOnInit(): void {
console.log("HomeComponent INIT");
ngOnInit(): void {
console.log('HomeComponent INIT');
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ export class PageNotFoundComponent implements OnInit {
constructor() {}

ngOnInit(): void {
console.log("PageNotFoundComponent INIT");
console.log('PageNotFoundComponent INIT');
}
}
2 changes: 1 addition & 1 deletion src/environments/environment.dev.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const AppConfig = {
export const APP_CONFIG = {
production: false,
environment: 'DEV'
};
2 changes: 1 addition & 1 deletion src/environments/environment.prod.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const AppConfig = {
export const APP_CONFIG = {
production: true,
environment: 'PROD'
};
2 changes: 1 addition & 1 deletion src/environments/environment.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const AppConfig = {
export const APP_CONFIG = {
production: false,
environment: 'LOCAL'
};
2 changes: 1 addition & 1 deletion src/environments/environment.web.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const AppConfig = {
export const APP_CONFIG = {
production: false,
environment: 'WEB'
};
4 changes: 2 additions & 2 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { enableProdMode } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';

import { AppModule } from './app/app.module';
import { AppConfig } from './environments/environment';
import { APP_CONFIG } from './environments/environment';

if (AppConfig.production) {
if (APP_CONFIG.production) {
enableProdMode();
}

Expand Down

0 comments on commit 7d531d1

Please sign in to comment.