Merge branch '3.0'

mcmath · mcmath · commit f3a972ef59a4 · 2017-05-09T14:43:20.000-07:00
Merges #8
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 /coverage/
 /lib/
 /node_modules/
-/npm-debug.log
+/npm-debug.*
 .tmp
diff --git a/.npmignore b/.npmignore
@@ -6,3 +6,4 @@
 /.eslintrc.yml
 /.gitignore
 /.travis.yml
+/coffeelint.json
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,7 @@
 language: node_js
 node_js:
   - "6"
-  - "5"
   - "4"
-  - "0.12"
-  - "0.10"
 after_success:
   - npm run coveralls
 before_deploy:
@@ -17,8 +14,8 @@ deploy:
     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"
+    repo: mcmath/ejs-html-loader
+    node: "6"
     tags: true
 after_deploy:
   - npm run unbuild
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016 Akim McMath
+Copyright (c) 2016-2017 Akim McMath
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
diff --git a/README.md b/README.md
@@ -1,56 +1,47 @@
 # ejs-html-loader
 
 [![Version][version-badge]][npm]
-[![License][license-badge]][license]
 [![Build][build-badge]][travis]
 [![Coverage][coverage-badge]][coveralls]
 [![Dependencies][dependencies-badge]][gemnasium]
 
-[Webpack][webpack] loader for rendering plain HTML from [EJS][ejs]
+[Webpack 2][webpack] loader for rendering plain HTML from [EJS][ejs]
 template files
 
 ## Install
 
-Install with [npm][npm]. And be sure to install [EJS][ejs] and
-[Webpack][webpack], which are peer dependencies.
+Install with [npm][npm]. Ensure [EJS][ejs] and [Webpack 2][webpack] are installed
+as well, as these are peer dependencies.
 
 ```sh
 npm install --save-dev webpack ejs ejs-html-loader
 ```
 
 ## Usage
 
-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:
+In your Webpack [configuration][webpack-configuration], pass data to your
+templates through either an `'options'` object or as query parameters.
 
 ```js
 module.exports = {
   // ...
   module: {
-    loaders: [{
+    rules: [{
       test: /\.ejs$/,
-      loader: 'ejs-html?title=The%20Big%20Gatsby&production'
+      loader: 'ejs-html-loader',
+      options: {
+        title: "The Ant: An Introduction",
+        production: process.env.ENV === "production"
+      }
     }]
   }
-};
-```
-
-Or second, via an `'ejsHtml'` property:
-
-```js
-module.exports = {
   // ...
-  ejsHtml: {
-    title: 'For Whom the Bell Rings',
-    baseUrl: '/',
-    delimiter: '?'
-  }
 };
 ```
 
 ## Options
 
-All properties passed to the loader will be available to your
+All properties passed as loader options will be available to your
 templates as local variables. In addition, the following [EJS][ejs]
 options may be set:
 
@@ -66,27 +57,26 @@ Defaults to `'%'`, as in `<%= some.variable %>`.
 
 The EJS `filename` option is set automatically, so you may include partials
 relative to your template files. If you want your included files to
-automatically recompile in **watch mode**, be sure to use the following syntax:
+automatically recompile in watch mode, be sure to use the following syntax:
 
 ```
 <% include some/file %>
 ```
 
 ## License
 
-Copyright &copy; 2016 Akim McMath. Licensed under the [MIT License][license].
+Copyright &copy; 2016&ndash;2017 Akim McMath. Licensed under the [MIT License][license].
 
 [version-badge]: https://img.shields.io/npm/v/ejs-html-loader.svg?style=flat-square
-[license-badge]: https://img.shields.io/npm/l/ejs-html-loader.svg?style=flat-square
-[build-badge]: https://img.shields.io/travis/akim-mcmath/ejs-html-loader/master.svg?style=flat-square
-[coverage-badge]: https://img.shields.io/coveralls/akim-mcmath/ejs-html-loader/master.svg?style=flat-square&service=github
-[dependencies-badge]: https://img.shields.io/gemnasium/akim-mcmath/ejs-html-loader.svg?style=flat-square
+[build-badge]: https://img.shields.io/travis/mcmath/ejs-html-loader/master.svg?style=flat-square
+[coverage-badge]: https://img.shields.io/coveralls/mcmath/ejs-html-loader/master.svg?style=flat-square&service=github
+[dependencies-badge]: https://img.shields.io/gemnasium/mcmath/ejs-html-loader.svg?style=flat-square
 
 [npm]: https://www.npmjs.com/package/ejs-html-loader
 [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
+[travis]: https://travis-ci.org/mcmath/ejs-html-loader
+[coveralls]: https://coveralls.io/github/mcmath/ejs-html-loader?branch=master
+[gemnasium]: https://gemnasium.com/mcmath/ejs-html-loader
+[webpack]: https://webpack.js.org/
+[webpack-configuration]: https://webpack.js.org/configuration/
 [ejs]: http://ejs.co/
diff --git a/coffeelint.json b/coffeelint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "@mcmath/coffeelint-config"
+}
diff --git a/package.json b/package.json
@@ -6,22 +6,21 @@
   "scripts": {
     "build": "npm run unbuild && babel src -d lib",
     "unbuild": "rimraf lib",
-    "test:lint": "eslint lib test",
+    "test:lint": "eslint lib test && coffeelint -q 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"
+    "node": ">=4"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/akim-mcmath/ejs-html-loader.git"
+    "url": "git+https://github.com/mcmath/ejs-html-loader.git"
   },
   "keywords": [
     "webpack",
-    "webpack-2",
     "loader",
     "webpack-loader",
     "ejs",
@@ -31,32 +30,33 @@
   "author": "Akim McMath <akim.elijah.mcmath@gmail.com>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/akim-mcmath/ejs-html-loader/issues"
+    "url": "https://github.com/mcmath/ejs-html-loader/issues"
   },
-  "homepage": "https://github.com/akim-mcmath/ejs-html-loader#readme",
+  "homepage": "https://github.com/mcmath/ejs-html-loader#readme",
   "peerDependencies": {
-    "webpack": "1.x - 2.x",
+    "webpack": "2.x",
     "ejs": "2.x"
   },
   "dependencies": {
-    "loader-utils": "^0.2.15"
+    "loader-utils": "^1.1.0"
   },
   "devDependencies": {
-    "babel-cli": "^6.9.0",
+    "@mcmath/coffeelint-config": "^1.0.1",
+    "babel-cli": "^6.24.1",
     "babel-plugin-add-module-exports": "^0.2.1",
-    "babel-preset-es2015": "^6.9.0",
-    "babel-register": "^6.9.0",
-    "bluebird": "^3.4.0",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-register": "^6.24.1",
     "chai": "^3.5.0",
-    "coffee-script": "^1.10.0",
-    "coveralls": "^2.11.9",
-    "ejs": "^2.4.2",
-    "eslint": "^2.11.1",
-    "file-loader": "^0.8.5",
-    "istanbul": "1.0.0-alpha.2",
-    "mocha": "^2.5.3",
+    "coffee-script": "^1.12.5",
+    "coffeelint": "^1.16.0",
+    "coveralls": "^2.13.1",
+    "ejs": "^2.5.6",
+    "eslint": "^3.19.0",
+    "file-loader": "^0.11.1",
+    "istanbul": "1.1.0-alpha.1",
+    "mocha": "^3.3.0",
     "relative-path-map": "^1.0.1",
-    "rimraf": "^2.5.2",
-    "webpack": "^1.12.13"
+    "rimraf": "^2.6.1",
+    "webpack": "^2.5.1"
   }
 }
diff --git a/src/index.js b/src/index.js
@@ -1,10 +1,9 @@
-import {getLoaderConfig} from 'loader-utils';
+import {getOptions} from 'loader-utils';
 import {addDependencies, saveDependencies} from './cache';
 import {render} from './render';
 
 export default function ejsHtmlLoader(src) {
   this.cacheable();
-
   let rendered = '';
 
   try {
@@ -17,7 +16,7 @@ export default function ejsHtmlLoader(src) {
 }
 
 function renderTemplate(ctx, src) {
-  let data = getLoaderConfig(ctx, 'ejsHtml');
+  let data = getOptions(ctx);
   let {rendered, deps} = render(ctx, src, data);
 
   saveDependencies(ctx, deps);
diff --git a/test/config/paths.coffee b/test/config/paths.coffee
@@ -2,10 +2,10 @@ path = require 'path'
 pathMap = require 'relative-path-map'
 
 module.exports = pathMap(
-  root: path.resolve __dirname, '../..'
-  src: '[root]/src/index.js'
-  test: '[root]/test'
-  fixt: '[test]/fixtures'
-  out: '[test]/.tmp'
-  outFile: '[out]/index.html'
+    root: path.resolve __dirname, '../..'
+    src: '[root]/src/index.js'
+    test: '[root]/test'
+    fixt: '[test]/fixtures'
+    out: '[test]/.tmp'
+    outFile: '[out]/index.html'
 )
diff --git a/test/fixtures/bad-locals.js b/test/fixtures/bad-locals.js
@@ -1 +1 @@
-require('./bad-locals.ejs')
+require('./bad-locals.ejs');
diff --git a/test/fixtures/bad-syntax.js b/test/fixtures/bad-syntax.js
@@ -1 +1 @@
-require('./bad-syntax.ejs')
+require('./bad-syntax.ejs');
diff --git a/test/fixtures/context.js b/test/fixtures/context.js
@@ -1 +1 @@
-require('./context.ejs')
+require('./context.ejs');
diff --git a/test/fixtures/delimiter.js b/test/fixtures/delimiter.js
@@ -1 +1 @@
-require('./delimiter.ejs')
+require('./delimiter.ejs');
diff --git a/test/helpers/compile.coffee b/test/helpers/compile.coffee
@@ -1,17 +1,17 @@
 {readFile} = require 'fs'
 {expect} = require 'chai'
-Promise = require 'bluebird'
 webpack = require 'webpack'
 paths = require '../config/paths'
 config = require './config'
 
 module.exports = (match, opts) ->
-  new Promise (resolve) ->
-    webpack config(opts), (err) ->
-      expect(err).not.to.exist
+    new Promise((resolve) ->
+        webpack config(opts), (err) ->
+            expect(err).not.to.exist
 
-      readFile paths.outFile, 'utf8', (err, content) ->
-        expect(err).not.to.exist
-        expect(content).to.match match
+            readFile paths.outFile, 'utf8', (err, content) ->
+                expect(err).not.to.exist
+                expect(content).to.match match
 
-        resolve()
+                resolve()
+    )
diff --git a/test/helpers/config.coffee b/test/helpers/config.coffee
@@ -1,20 +1,18 @@
 {resolve} = require 'path'
 paths = require '../config/paths'
 
-ejsRe = /\.ejs$/
-
 module.exports = (opts) ->
-  context: paths.fixt
-  entry: resolve paths.fixt, opts.entry
-  output:
-    path: paths.out
-    filename: 'bundle.js'
-  module:
-    loaders: [
-      test: ejsRe
-      loader: 'file?name=index.html'
-    ,
-      test: ejsRe
-      loader: "#{paths.src}?#{opts.query || ''}"
-    ]
-  ejsHtml: opts.ejsHtml
+    context: paths.fixt
+    entry: resolve paths.fixt, opts.entry
+    output:
+        path: paths.out
+        filename: 'bundle.js'
+    module:
+        rules: [
+            test: /\.ejs$/
+            use:
+                loader: 'file-loader?name=index.html'
+            ,
+                loader: if opts.query then "#{paths.src}?#{opts.query}" else paths.src,
+                options: opts.ejsHtml
+        ]
diff --git a/test/helpers/error.coffee b/test/helpers/error.coffee
@@ -1,12 +1,12 @@
 {expect} = require 'chai'
-Promise = require 'bluebird'
 webpack = require 'webpack'
 config = require './config'
 
 module.exports = (match, opts, done) ->
-  new Promise (resolve) ->
-    webpack config(opts), (err, stats) ->
-      expect(err).not.to.exist
-      expect(stats.toString()).to.match match
-      
-      resolve()
+    new Promise((resolve) ->
+        webpack config(opts), (err, stats) ->
+            expect(err).not.to.exist
+            expect(stats.toString()).to.match match
+
+            resolve()
+    )
diff --git a/test/index.coffee b/test/index.coffee
diff --git a/test/mocha.opts b/test/mocha.opts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2016 Akim McMath`
	`1`	`+Copyright (c) 2016-2017 Akim McMath`
`2`	`2`
`3`	`3`	`Permission is hereby granted, free of charge, to any person obtaining a copy of`
`4`	`4`	`this software and associated documentation files (the "Software"), to deal in`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "extends": "@mcmath/coffeelint-config"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-require('./bad-locals.ejs')`
	`1`	`+require('./bad-locals.ejs');`