Skip to content

Commit f5df528

Browse files
mcmathmcmath
committed
Merge pull request #2 from akim-mcmath/next
v2.0.0
2 parents 6398db3 + 60e877a commit f5df528

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+315
-475
lines changed

‎.babelrc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"presets": [
3+
"es2015"
4+
],
5+
"plugins": [
6+
"add-module-exports"
7+
]
8+
}

‎.eslintrc.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
extends: eslint:recommended
2+
parserOptions:
3+
ecmaVersion: 6
4+
sourceType: module
5+
env:
6+
node: true
7+
mocha: true

‎.gitignore

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
.DS_Store
2-
logs
3-
*.log
4-
pids
5-
*.pid
6-
*.seed
7-
lib-cov
8-
coverage
9-
.lock-wscript
10-
npm-debug.log*
11-
node_modules
1+
/coverage/
2+
/lib/
3+
/node_modules/
4+
/npm-debug.log
5+
.tmp

‎.jscsrc

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎.jshintrc

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.npmignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/coverage/
2+
/src/
3+
/test/
4+
/.babelrc
5+
/.editorconfig
6+
/.eslintrc.yml
7+
/.gitignore
8+
/.travis.yml

‎.travis.yml

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
11
language: node_js
22
node_js:
3-
- "stable"
4-
- "5.0"
5-
- "4.0"
3+
- "6"
4+
- "5"
5+
- "4"
66
- "0.12"
77
- "0.10"
8-
after_script:
8+
after_success:
99
- npm run coveralls
10-
branches:
11-
only:
12-
- master
10+
before_deploy:
11+
- npm run build
12+
deploy:
13+
provider: npm
14+
email:
15+
secure: E1X0Di6u1dhOXAvEsGXTTMZzz0Cx7RqNS9O4U5Tgdqlqaq9maDoHz8rZNHwqcx97m6DkgH4/go+D22DARLPr7Y+5XJNBrFcDKWPbU34lBHsTjwhxnuoKS8h7VZ/lGvQqPp1ircyYvsG5rd97J4z0hI27gF3Sj9tk8W3bn3ZTc8JxIoEw00aiEC7KNNnDpOosWkHv+SiVASo5Fk9Iwdt+k8FRtmrfmjVb/K1qp8e4lkjN8sXtxLoAYqzuOt5TUpTFDzGjlY4KS42apJxq0cKTvPXsU38Wn4QE848E4urJAIHKLR8N45wapD54FxlvS4FKjWUCpscVf8vDAGPXPbFK0uireqlI1RdHZYhEKeyR0vnIC62lQbYd9GKrh26q9TVeGniKXfIpNC/j5gp6dexYkKqNjmWE5K1CgTplgLq5ufmZArkeS+hKrSGcdGYcfib5hGM3gEfisK0Mvm0/rRposChu3UwUh9IlEblKhGbsynrs8Ee8zSerrTPnuaFuJycDO7m+SpxBe5ujf7W4/Dhh8etCsNIG0f9xxlVSfwgeeLONs1z1i94g7gGHR4n1JTW4/xLhyJuE4jsvEm23y4M1nDwEOCiPw1oJvCASXxxKN5/ydQ0wJsV6t7R0RFwDQSbOA4FYlYsWQQzmqgLJ8BES2JgAEuFhCEHpT/K4lVZl9oA=
16+
api_key:
17+
secure: YGkGJVV8Wx86+4fy8k88vLBku/JU7402q+fFS7VFLa1Lt017N9qsIasJgSiUWBsmRbp6L8FqT77yv7BZsyn3swdeFk/Uz8Le3lKQgANFAy7JQj/4MaceZsGxvuOU1+PHsFMqZDlIQpTzkaiPN6bVCj/nrxspPfTEiaDThsNPy/BNXjoPMnwvg8PuRgotJSHEx1vWlemnLql69RnfoWO0dqO1RY8To8wNjPJVQtMsOGgdDbg1Gi6FAdp3YltVbCIl9XSn0ibjo+sEPfHEhToPszlbyExm4GelocK3qCFowTE6YMO/PHNXq12oPI/mOB0VESyNeawnT6MYQYI+ClgWS8KXGaZVUuOJ3s9nkPODMjTBmx7TElPWBmNNtutOI12VxTmXKs+gKynJuEf7T9xIgunIuzDOFZR/OflT1qySQoVGeYBJCjYeG2IA0hIVcnVHmYBybVuw6ut5A1N5fORxVS+yToJRfR8IrU6dmuhd61nffoAPJ81TzOvcGIldKuN0g6wfc40EaJQr+QZgUvBPp72jffajP0DviQ3RBx0y3ktikqvetm0TuXc9FzLEkjBKJY4r2BKahTcqv9YyPI4Ui9vNvjaD2VG4Qa7HtsUNi342/uaVnRMf24/VI/UOkhgI8e2DDKH35RucLK0sxrEEUfTwqNM2jhBuNQHA+BDpyAg=
18+
skip_cleanup: true
19+
on:
20+
repo: akim-mcmath/ejs-html-loader
21+
node: "4"
22+
tags: true
23+
after_deploy:
24+
- npm run unbuild

‎CHANGELOG.md

Lines changed: 0 additions & 76 deletions
This file was deleted.

‎LICENSE.txt renamed to ‎LICENSE

File renamed without changes.

‎README.md

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,43 +6,38 @@
66
[![Coverage][coverage-badge]][coveralls]
77
[![Dependencies][dependencies-badge]][gemnasium]
88

9-
A [Webpack][webpack] loader for rendering plain HTML from [EJS][ejs]
10-
template files.
9+
[Webpack][webpack] loader for rendering plain HTML from [EJS][ejs]
10+
template files
1111

1212
## Install
1313

14-
Install via [npm][npm]:
14+
Install with [npm][npm]. And be sure to install [EJS][ejs] and
15+
[Webpack][webpack], which are peer dependencies.
1516

1617
```sh
17-
npm install --save-dev ejs-html-loader
18+
npm install --save-dev webpack ejs ejs-html-loader
1819
```
1920

2021
## Usage
2122

22-
Options and locals may be set via query string or query object:
23+
In your Webpack [configuration][webpack-configuration], options and locals can
24+
be passed to EJS in two ways. First, through a query string or query object:
2325

2426
```js
25-
// webpack.config.js
26-
2727
module.exports = {
2828
// ...
2929
module: {
30-
loaders: [
31-
{
32-
test: /\.ejs$/,
33-
loader: 'ejs-html?title=The%20Big%20Gatsby&production'
34-
}
35-
]
30+
loaders: [{
31+
test: /\.ejs$/,
32+
loader: 'ejs-html?title=The%20Big%20Gatsby&production'
33+
}]
3634
}
3735
};
3836
```
3937

40-
Or they may be set in the `ejsHtml` or `ejsHtmlLoader` property of your
41-
Webpack configuration:
38+
Or second, via an `'ejsHtml'` property:
4239

4340
```js
44-
// webpack.config.js
45-
4641
module.exports = {
4742
// ...
4843
ejsHtml: {
@@ -88,9 +83,10 @@ Copyright © 2016 Akim McMath. Licensed under the [MIT License][license].
8883
[dependencies-badge]: https://img.shields.io/gemnasium/akim-mcmath/ejs-html-loader.svg?style=flat-square
8984

9085
[npm]: https://www.npmjs.com/package/ejs-html-loader
91-
[license]: LICENSE.txt
86+
[license]: LICENSE
9287
[travis]: https://travis-ci.org/akim-mcmath/ejs-html-loader
9388
[coveralls]: https://coveralls.io/github/akim-mcmath/ejs-html-loader?branch=master
9489
[gemnasium]: https://gemnasium.com/akim-mcmath/ejs-html-loader
9590
[webpack]: https://webpack.github.io/
91+
[webpack-configuration]: https://webpack.github.io/docs/configuration.html
9692
[ejs]: http://ejs.co/

0 commit comments

Comments
 (0)