diff --git a/package.json b/package.json index ce99136b1..bef5528d2 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "ng": "ng", "start": "ng serve", "build": "ng build", + "lint": "ng lint --fix", "build:client-and-server-bundles": "ng build --prod && ng build --prod --app 1 --output-hashing=false", "build:prerender": "npm run build:client-and-server-bundles && npm run webpack:server && npm run generate:prerender", "build:ssr": "npm run build:client-and-server-bundles && npm run webpack:server", @@ -27,6 +28,9 @@ "serve:prerender": "cd dist/browser && http-server", "serve:ssr": "node dist/server" }, + "pre-commit": [ + "lint" + ], "private": true, "dependencies": { "@angular/animations": "^5.0.0", @@ -51,11 +55,14 @@ "@angular/compiler-cli": "^5.0.0", "@angular/language-service": "^5.0.0", "@types/node": "^8.0.30", + "codelyzer": "^4.0.2", "cpy-cli": "^1.0.1", "express": "^4.15.2", "http-server": "^0.10.0", + "pre-commit": "^1.2.2", "reflect-metadata": "^0.1.10", "ts-loader": "^2.3.7", + "tslint": "^5.7.0", "typescript": "~2.4.2" } } diff --git a/prerender.ts b/prerender.ts index 5ddb8cd4f..a80b2c108 100644 --- a/prerender.ts +++ b/prerender.ts @@ -1,22 +1,20 @@ // Load zone.js for the server. import 'zone.js/dist/zone-node'; import 'reflect-metadata'; -import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'fs'; -import { join } from 'path'; +import {readFileSync, writeFileSync, existsSync, mkdirSync} from 'fs'; +import {join} from 'path'; -import { enableProdMode } from '@angular/core'; +import {enableProdMode} from '@angular/core'; // Faster server renders w/ Prod mode (dev mode never needed) enableProdMode(); -// Express Engine -import { ngExpressEngine } from '@nguniversal/express-engine'; // Import module map for lazy loading -import { provideModuleMap } from '@nguniversal/module-map-ngfactory-loader'; -import { renderModuleFactory } from '@angular/platform-server'; -import { ROUTES } from './static.paths'; +import {provideModuleMap} from '@nguniversal/module-map-ngfactory-loader'; +import {renderModuleFactory} from '@angular/platform-server'; +import {ROUTES} from './static.paths'; // * NOTE :: leave this as require() since this file is built Dynamically from webpack -const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./dist/server/main.bundle'); +const {AppServerModuleNgFactory, LAZY_MODULE_MAP} = require('./dist/server/main.bundle'); const BROWSER_FOLDER = join(process.cwd(), 'browser'); diff --git a/server.ts b/server.ts index 6aeb0faaf..e185cea76 100644 --- a/server.ts +++ b/server.ts @@ -1,11 +1,10 @@ import 'zone.js/dist/zone-node'; import 'reflect-metadata'; -import { renderModuleFactory } from '@angular/platform-server'; -import { enableProdMode } from '@angular/core'; +import {enableProdMode} from '@angular/core'; import * as express from 'express'; -import { join } from 'path'; -import { readFileSync } from 'fs'; +import {join} from 'path'; +import {readFileSync} from 'fs'; // Faster server renders w/ Prod mode (dev mode never needed) enableProdMode(); @@ -20,12 +19,12 @@ const DIST_FOLDER = join(process.cwd(), 'dist'); const template = readFileSync(join(DIST_FOLDER, 'browser', 'index.html')).toString(); // * NOTE :: leave this as require() since this file is built Dynamically from webpack -const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./dist/server/main.bundle'); +const {AppServerModuleNgFactory, LAZY_MODULE_MAP} = require('./dist/server/main.bundle'); // Express Engine -import { ngExpressEngine } from '@nguniversal/express-engine'; +import {ngExpressEngine} from '@nguniversal/express-engine'; // Import module map for lazy loading -import { provideModuleMap } from '@nguniversal/module-map-ngfactory-loader'; +import {provideModuleMap} from '@nguniversal/module-map-ngfactory-loader'; // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine) app.engine('html', ngExpressEngine({ diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 68cc7e619..164d1ed9f 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,5 +1,4 @@ -import { Component } from '@angular/core'; -import { Meta, Title } from '@angular/platform-browser'; +import {Component} from '@angular/core'; @Component({ selector: 'app-root', diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 7153d3581..d55d084f6 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,6 +1,6 @@ -import { BrowserModule } from '@angular/platform-browser'; -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import {BrowserModule} from '@angular/platform-browser'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; import { AppComponent } from './app.component'; import { HomeComponent } from './home/home.component'; diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 824db0058..7075356cc 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -1,8 +1,7 @@ -import { Component, OnInit } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; +import {Component, OnInit} from '@angular/core'; @Component({ - selector: 'home', + selector: 'app-home', template: `