Merge pull request #2 from akim-mcmath/next

v2.0.0

.babelrc

@@ -0,0 +1,8 @@
+{
+  "presets": [
+    "es2015"
+  ],
+  "plugins": [
+    "add-module-exports"
+  ]
+}

.eslintrc.yml

@@ -0,0 +1,7 @@
+extends: eslint:recommended
+parserOptions:
+  ecmaVersion: 6
+  sourceType: module
+env:
+  node: true
+  mocha: true

.gitignore

@@ -1,11 +1,5 @@
-.DS_Store
-logs
-*.log
-pids
-*.pid
-*.seed
-lib-cov
-coverage
-.lock-wscript
-npm-debug.log*
-node_modules
+/coverage/
+/lib/
+/node_modules/
+/npm-debug.log
+.tmp

.npmignore

@@ -0,0 +1,8 @@
+/coverage/
+/src/
+/test/
+/.babelrc
+/.editorconfig
+/.eslintrc.yml
+/.gitignore
+/.travis.yml

.travis.yml

@@ -1,12 +1,24 @@
 language: node_js
 node_js:
-  - "stable"
-  - "5.0"
-  - "4.0"
+  - "6"
+  - "5"
+  - "4"
   - "0.12"
   - "0.10"
-after_script:
+after_success:
   - npm run coveralls
-branches:
-  only:
-    - master
+before_deploy:
+  - npm run build
+deploy:
+  provider: npm
+  email:
+    secure: E1X0Di6u1dhOXAvEsGXTTMZzz0Cx7RqNS9O4U5Tgdqlqaq9maDoHz8rZNHwqcx97m6DkgH4/go+D22DARLPr7Y+5XJNBrFcDKWPbU34lBHsTjwhxnuoKS8h7VZ/lGvQqPp1ircyYvsG5rd97J4z0hI27gF3Sj9tk8W3bn3ZTc8JxIoEw00aiEC7KNNnDpOosWkHv+SiVASo5Fk9Iwdt+k8FRtmrfmjVb/K1qp8e4lkjN8sXtxLoAYqzuOt5TUpTFDzGjlY4KS42apJxq0cKTvPXsU38Wn4QE848E4urJAIHKLR8N45wapD54FxlvS4FKjWUCpscVf8vDAGPXPbFK0uireqlI1RdHZYhEKeyR0vnIC62lQbYd9GKrh26q9TVeGniKXfIpNC/j5gp6dexYkKqNjmWE5K1CgTplgLq5ufmZArkeS+hKrSGcdGYcfib5hGM3gEfisK0Mvm0/rRposChu3UwUh9IlEblKhGbsynrs8Ee8zSerrTPnuaFuJycDO7m+SpxBe5ujf7W4/Dhh8etCsNIG0f9xxlVSfwgeeLONs1z1i94g7gGHR4n1JTW4/xLhyJuE4jsvEm23y4M1nDwEOCiPw1oJvCASXxxKN5/ydQ0wJsV6t7R0RFwDQSbOA4FYlYsWQQzmqgLJ8BES2JgAEuFhCEHpT/K4lVZl9oA=
+  api_key:
+    secure: YGkGJVV8Wx86+4fy8k88vLBku/JU7402q+fFS7VFLa1Lt017N9qsIasJgSiUWBsmRbp6L8FqT77yv7BZsyn3swdeFk/Uz8Le3lKQgANFAy7JQj/4MaceZsGxvuOU1+PHsFMqZDlIQpTzkaiPN6bVCj/nrxspPfTEiaDThsNPy/BNXjoPMnwvg8PuRgotJSHEx1vWlemnLql69RnfoWO0dqO1RY8To8wNjPJVQtMsOGgdDbg1Gi6FAdp3YltVbCIl9XSn0ibjo+sEPfHEhToPszlbyExm4GelocK3qCFowTE6YMO/PHNXq12oPI/mOB0VESyNeawnT6MYQYI+ClgWS8KXGaZVUuOJ3s9nkPODMjTBmx7TElPWBmNNtutOI12VxTmXKs+gKynJuEf7T9xIgunIuzDOFZR/OflT1qySQoVGeYBJCjYeG2IA0hIVcnVHmYBybVuw6ut5A1N5fORxVS+yToJRfR8IrU6dmuhd61nffoAPJ81TzOvcGIldKuN0g6wfc40EaJQr+QZgUvBPp72jffajP0DviQ3RBx0y3ktikqvetm0TuXc9FzLEkjBKJY4r2BKahTcqv9YyPI4Ui9vNvjaD2VG4Qa7HtsUNi342/uaVnRMf24/VI/UOkhgI8e2DDKH35RucLK0sxrEEUfTwqNM2jhBuNQHA+BDpyAg=
+  skip_cleanup: true
+  on:
+    repo: akim-mcmath/ejs-html-loader
+    node: "4"
+    tags: true
+after_deploy:
+  - npm run unbuild

README.md

@@ -6,43 +6,38 @@
 [![Coverage][coverage-badge]][coveralls]
 [![Dependencies][dependencies-badge]][gemnasium]
 
-A [Webpack][webpack] loader for rendering plain HTML from [EJS][ejs]
-template files.
+[Webpack][webpack] loader for rendering plain HTML from [EJS][ejs]
+template files
 
 ## Install
 
-Install via [npm][npm]:
+Install with [npm][npm]. And be sure to install [EJS][ejs] and
+[Webpack][webpack], which are peer dependencies.
 
 ```sh
-npm install --save-dev ejs-html-loader
+npm install --save-dev webpack ejs ejs-html-loader
 ```
 
 ## Usage
 
-Options and locals may be set via query string or query object:
+In your Webpack [configuration][webpack-configuration], options and locals can
+be passed to EJS in two ways. First, through a query string or query object:
 
 ```js
-// webpack.config.js
-
 module.exports = {
   // ...
   module: {
-    loaders: [
-      {
-        test: /\.ejs$/,
-        loader: 'ejs-html?title=The%20Big%20Gatsby&production'
-      }
-    ]
+    loaders: [{
+      test: /\.ejs$/,
+      loader: 'ejs-html?title=The%20Big%20Gatsby&production'
+    }]
   }
 };
 ```
 
-Or they may be set in the `ejsHtml` or `ejsHtmlLoader` property of your
-Webpack configuration:
+Or second, via an `'ejsHtml'` property:
 
 ```js
-// webpack.config.js
-
 module.exports = {
   // ...
   ejsHtml: {
@@ -88,9 +83,10 @@ Copyright © 2016 Akim McMath. Licensed under the [MIT License][license].
 [dependencies-badge]: https://img.shields.io/gemnasium/akim-mcmath/ejs-html-loader.svg?style=flat-square
 
 [npm]: https://www.npmjs.com/package/ejs-html-loader
-[license]: LICENSE.txt
+[license]: LICENSE
 [travis]: https://travis-ci.org/akim-mcmath/ejs-html-loader
 [coveralls]: https://coveralls.io/github/akim-mcmath/ejs-html-loader?branch=master
 [gemnasium]: https://gemnasium.com/akim-mcmath/ejs-html-loader
 [webpack]: https://webpack.github.io/
+[webpack-configuration]: https://webpack.github.io/docs/configuration.html
 [ejs]: http://ejs.co/

package.json

@@ -1,23 +1,16 @@
 {
   "name": "ejs-html-loader",
-  "version": "1.2.2",
+  "version": "2.0.0",
   "description": "Webpack loader for rendering HTML from EJS templates",
-  "main": "index.js",
-  "files": [
-    "lib",
-    "index.js",
-    "README.md",
-    "LICENSE.txt"
-  ],
+  "main": "lib/index.js",
   "scripts": {
-    "test": "npm run jshint && npm run jscs && npm run mocha",
-    "jshint": "jshint . --exclude-path .gitignore",
-    "jscs": "jscs .",
-    "mocha": "istanbul cover _mocha",
-    "clean": "rm -rf ./node_modules ./coverage",
-    "coverage": "npm test && open ./coverage/lcov-report/index.html",
-    "coveralls": "cat ./coverage/lcov.info | coveralls",
-    "preversion": "npm run test"
+    "build": "npm run unbuild && babel src -d lib",
+    "unbuild": "rimraf lib",
+    "test:lint": "eslint lib test",
+    "test:unit": "istanbul cover _mocha -- test/index.coffee",
+    "test:report": "npm run test:unit && open coverage/lcov-report/index.html",
+    "test": "npm run test:lint && npm run test:unit",
+    "coveralls": "cat coverage/lcov.info | coveralls"
   },
   "engines": {
     "node": ">=0.10"
@@ -42,21 +35,27 @@
   },
   "homepage": "https://github.com/akim-mcmath/ejs-html-loader#readme",
   "peerDependencies": {
-    "webpack": "1.x - 2.x"
+    "webpack": "1.x - 2.x",
+    "ejs": "2.x"
   },
   "dependencies": {
-    "ejs": "^2.0.2",
-    "loader-utils": "^0.2.0"
+    "loader-utils": "^0.2.15"
   },
   "devDependencies": {
+    "babel-plugin-add-module-exports": "^0.2.1",
+    "babel-preset-es2015": "^6.9.0",
+    "babel-register": "^6.9.0",
+    "bluebird": "^3.4.0",
     "chai": "^3.5.0",
-    "coveralls": "^2.11.6",
+    "coffee-script": "^1.10.0",
+    "coveralls": "^2.11.9",
+    "ejs": "^2.4.2",
+    "eslint": "^2.11.1",
     "file-loader": "^0.8.5",
-    "istanbul": "^0.4.2",
-    "jscs": "^2.9.0",
-    "jshint": "^2.9.1",
-    "mocha": "^2.4.5",
-    "rimraf": "^2.5.1",
+    "istanbul": "1.0.0-alpha.2",
+    "mocha": "^2.5.3",
+    "relative-path-map": "^1.0.1",
+    "rimraf": "^2.5.2",
     "webpack": "^1.12.13"
   }
 }

src/cache.js

@@ -0,0 +1,24 @@
+const cache = {};
+
+export function addDependencies(ctx) {
+  add(ctx, get(ctx));
+}
+
+export function saveDependencies(ctx, deps) {
+  add(ctx, save(ctx, deps));
+}
+
+function get(ctx) {
+  return cache[ctx.resourcePath] || [];
+}
+
+function save(ctx, deps=[]) {
+  cache[ctx.resourcePath] = deps;
+  return get(ctx);
+}
+
+function add(ctx, deps) {
+  deps.forEach(name => {
+    ctx.addDependency(name);
+  });
+}