Merge pull request #222 from valor-software/develop

sync master with develop

Author: Georgii Rychko

.gitignore

@@ -2,7 +2,7 @@
 .vscode
 .publish
 dist
-demo-dist
+dist-demo
 build
 coverage
 bundles

.prettierrc

@@ -0,0 +1,3 @@
+printWidth: 120
+singleQuote: true
+bracketSpacing: true

e2e/app.e2e-spec.ts

@@ -31,10 +31,10 @@ describe('Tree App', () => {
     expect(browser.isElementPresent(antiquaNode)).toBeTruthy();
     expect(await antiquaNode.getText()).toEqual('Antiqua');
 
-    const attrs = {id: 'antiqua', class: 'test'};
+    const attrs = { id: 'antiqua', class: 'test' };
 
     const expectations = Object.keys(attrs).map((key: string) => {
-        return antiquaNode.getAttribute(key).then((value: string) => expect(value).toEqual(attrs[key]));
+      return antiquaNode.getAttribute(key).then((value: string) => expect(value).toEqual(attrs[key]));
     });
 
     return Promise.all(expectations as any);

package.json

@@ -33,20 +33,28 @@
   "scripts": {
     "compile": "ngc -p tsconfig-aot.json && node umd-bundler.js",
     "clean": "rimraf coverage build dist dist-demo bundles factories .publish",
-    "pre:publish": "npm run clean && npm run test && npm run lint && npm run compile && mkdir -p dist && cp -R src/styles.css README.md media dist",
+    "pre:publish":
+      "npm run clean && npm run test && npm run lint && npm run compile && mkdir -p dist && cp -R src/styles.css README.md media dist",
     "post:publish": "npm run build:demo && gh-pages -d dist-demo",
     "start": "ng serve",
     "build:demo": "ng build",
     "test": "ng test -sr",
     "test:w": "ng test -w",
     "test:cov": "ng test -sr -cc",
-    "lint": "ng lint --fix --type-check",
+    "lint": "ng lint --type-check",
     "e2e": "ng e2e",
     "changelog": "conventional-changelog -i CHANGELOG.md -s -p angular",
     "github-release": "conventional-github-releaser -p angular",
     "version": "npm run changelog && git add CHANGELOG.md",
     "postversion": "git push origin master && git push --tags && npm run github-release && node publish.js",
-    "webdriver-update": "node ./node_modules/protractor/bin/webdriver-manager update"
+    "webdriver-update": "node ./node_modules/protractor/bin/webdriver-manager update",
+    "precommit": "pretty-quick --staged",
+    "prettier": "prettier --write '{.,src,test}/**/*.ts'"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "npm run lint && pretty-quick --staged"
+    }
   },
   "devDependencies": {
     "@angular/cli": "1.6.8",
@@ -70,6 +78,7 @@
     "core-js": "2.5.1",
     "font-awesome": "4.7.0",
     "gh-pages": "1.1.0",
+    "husky": "0.14.3",
     "jasmine-core": "2.8.0",
     "jasmine-data-provider": "2.2.0",
     "jasmine-spec-reporter": "4.2.1",
@@ -82,6 +91,8 @@
     "karma-phantomjs-launcher": "1.0.4",
     "phantomjs-polyfill": "0.0.2",
     "phantomjs-prebuilt": "2.1.16",
+    "prettier": "1.10.2",
+    "pretty-quick": "1.4.1",
     "protractor": "5.2.0",
     "rimraf": "2.6.2",
     "rxjs": "5.5.2",