Merge d35738c into b375137

.nvmrc

@@ -1 +1 @@
-8
+8.10

README.md

@@ -44,18 +44,10 @@ Done! Just configure your Aurelia plugins/components and run your target!
 
 ## Development
 
-Before doing anything, install the repository hooks:
-
-```bash
-# You can either use npm or yarn, it doesn't matter
-yarn run hooks
-```
-
 ### Yarn/NPM Tasks
 
 | Task                    | Description                         |
 |-------------------------|-------------------------------------|
-| `yarn run hooks`        | Install the GIT repository hooks.   |
 | `yarn test`             | Run the project unit tests.         |
 | `yarn run lint`         | Lint the modified files.            |
 | `yarn run lint:full`    | Lint the project code.              |

package.json

@@ -1,53 +1,59 @@
 {
-    "name": "projext-plugin-webpack-aurelia",
-    "description": "Allows you to bundle an Aurelia project with projext using the webpack build engine.",
-    "homepage": "https://homer0.github.io/projext-plugin-webpack-aurelia/",
-    "version": "1.0.2",
-    "repository": "homer0/projext-plugin-webpack-aurelia",
-    "author": "Leonardo Apiwan (@homer0) <me@homer0.com>",
-    "license": "MIT",
-    "dependencies": {
-      "aurelia-extract-clean-loader": "^2.0.0",
-      "aurelia-webpack-plugin": "^4.0.0",
-      "aurelia-loader-webpack": "^2.2.1",
-      "aurelia-loader-nodejs": "^1.0.1",
-      "aurelia-pal-nodejs": "^1.2.0",
+  "name": "projext-plugin-webpack-aurelia",
+  "description": "Allows you to bundle an Aurelia project with projext using the webpack build engine.",
+  "homepage": "https://homer0.github.io/projext-plugin-webpack-aurelia/",
+  "version": "1.0.2",
+  "repository": "homer0/projext-plugin-webpack-aurelia",
+  "author": "Leonardo Apiwan (@homer0) <me@homer0.com>",
+  "license": "MIT",
+  "dependencies": {
+    "aurelia-extract-clean-loader": "^2.0.1",
+    "aurelia-webpack-plugin": "^4.0.0",
+    "aurelia-loader-webpack": "^2.2.1",
+    "aurelia-loader-nodejs": "^1.0.1",
+    "aurelia-pal-nodejs": "^1.2.0",
 
-      "aurelia-templating": "^1.10.2",
-      "aurelia-dependency-injection": "^1.4.2",
-      "aurelia-path": "^1.1.3",
+    "aurelia-templating": "^1.10.2",
+    "aurelia-dependency-injection": "^1.4.2",
+    "aurelia-path": "^1.1.3",
 
-      "webpack": "^4.34.0",
-      "babel-plugin-transform-class-inject-directive": "^2.0.0"
-    },
-    "devDependencies": {
-      "wootils": "^2.3.0",
-      "eslint": "^5.16.0",
-      "eslint-config-airbnb-base": "^13.1.0",
-      "eslint-plugin-import": "^2.17.3",
-      "eslint-plugin-node": "^9.1.0",
-      "@babel/core": "7.4.4",
-      "@babel/preset-env": "7.4.4",
-      "@babel/plugin-transform-runtime": "7.4.4",
-      "jest-ex": "^6.0.1",
-      "jest-cli": "^24.8.0",
-      "jasmine-expect": "^4.0.1",
-      "esdoc": "^1.1.0",
-      "esdoc-standard-plugin": "^1.0.0",
-      "esdoc-node": "^1.0.4",
-      "coveralls": "^3.0.4"
-    },
-    "engine-strict": true,
-    "engines": {
-      "node": ">=8.0.0",
-      "npm": ">=3.0.0"
-    },
-    "main": "src/index.js",
-    "scripts": {
-      "hooks": "./utils/hooks/install",
-      "test": "./utils/scripts/test",
-      "lint": "./utils/scripts/lint",
-      "lint:full": "./utils/scripts/lint-full",
-      "docs": "./utils/scripts/docs"
+    "webpack": "^4.38.0",
+    "babel-plugin-transform-class-inject-directive": "^2.0.1"
+  },
+  "devDependencies": {
+    "wootils": "^2.6.0",
+    "eslint": "^5.16.0",
+    "eslint-config-airbnb-base": "^13.2.0",
+    "eslint-plugin-import": "^2.18.2",
+    "eslint-plugin-node": "^9.1.0",
+    "@babel/core": "7.5.5",
+    "@babel/preset-env": "7.5.5",
+    "@babel/plugin-transform-runtime": "7.5.5",
+    "jest-ex": "^6.1.1",
+    "jest-cli": "^24.8.0",
+    "jasmine-expect": "^4.0.3",
+    "esdoc": "^1.1.0",
+    "esdoc-standard-plugin": "^1.0.0",
+    "esdoc-node": "^1.0.4",
+    "coveralls": "^3.0.5",
+    "husky": "^3.0.2"
+  },
+  "engine-strict": true,
+  "engines": {
+    "node": ">=8.10.0",
+    "npm": ">=3.0.0"
+  },
+  "main": "src/index.js",
+  "husky": {
+    "hooks": {
+      "pre-commit": "./utils/hooks/pre-commit",
+      "post-merge": "./utils/hooks/post-merge"
     }
+  },
+  "scripts": {
+    "test": "./utils/scripts/test",
+    "lint": "./utils/scripts/lint",
+    "lint:full": "./utils/scripts/lint-full",
+    "docs": "./utils/scripts/docs"
+  }
 }

utils/hooks/post-merge

@@ -0,0 +1,7 @@
+#!/bin/bash -ex
+
+if hash yarn 2>/dev/null; then
+  yarn
+else
+  npm install
+fi

utils/hooks/pre-commit

@@ -0,0 +1,9 @@
+#!/bin/bash -e
+
+if hash yarn 2>/dev/null; then
+  yarn run lint
+  yarn test
+else
+  npm run lint
+  npm test
+fi