Skip to content

Commit 4a19c22

Browse files
author
Alexander Krasnoyarov
committed
Chore: prepare 1.1.0 release.
1 parent b537506 commit 4a19c22

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

CHANGELOG.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1-
# Head
1+
# 1.1.0 - 2016-10-18
22

33
- Added: support `js` configuration.
4+
- Chore: improve performance.
45
- Chore: update a minimal version of `ajv-cli` from `0.9.0` to `1.1.0`.
56
- Chore: update a minimal version of `remark-preset-lint-itgalaxy` from `1.0.0` to `2.0.0`.
7+
- Chore: update a minimal version of `eslint-plugin-import` from `1.16.0` to `2.0.0`.
8+
- Chore: update a minimal version of `eslint-plugin-lodash` from `1.10.0` to `2.1.0`.
9+
- Chore: update a minimal version of `eslint-plugin-promise` from `2.0.0` to `3.0.0`.
10+
- Chore: update a minimal version of `eslint-plugin-itgalaxy` from `13.0.0` to `23.0.0`.
611

712
# 1.0.0
813

index.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/* eslint-disable strict, import/no-commonjs */
2+
23
'use strict';
34

45
const figlet = require('figlet');
@@ -68,9 +69,7 @@ module.exports = function (resolveConfig) {
6869

6970
const callback = this.async();
7071

71-
let externalConfig = resolveConfig && isJSON(resolveConfig)
72-
? JSON.parse(resolveConfig)
73-
: this.exec(resolveConfig, this.resource);
72+
let externalConfig = null;
7473

7574
if (this.query.length > 0) {
7675
let parsedQuery = {};
@@ -82,6 +81,10 @@ module.exports = function (resolveConfig) {
8281
if (parsedQuery.config) {
8382
externalConfig = JSON.parse(parsedQuery.config);
8483
}
84+
} else {
85+
externalConfig = resolveConfig && isJSON(resolveConfig)
86+
? JSON.parse(resolveConfig)
87+
: this.exec(resolveConfig, this.resource);
8588
}
8689

8790
const config = Object.assign(

package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "figlet-loader",
3-
"version": "1.0.0",
3+
"version": "1.1.0",
44
"description": "Get your figlet build bundled with webpack, use figlet with webpack easily",
55
"repository": {
66
"type": "git",
@@ -32,12 +32,12 @@
3232
"babel-register": "^6.14.0",
3333
"eslint": "^3.4.0",
3434
"eslint-plugin-ava": "^3.0.0",
35-
"eslint-plugin-import": "^1.14.0",
36-
"eslint-plugin-itgalaxy": "^13.0.0",
35+
"eslint-plugin-import": "^2.0.0",
36+
"eslint-plugin-itgalaxy": "^23.0.0",
3737
"eslint-plugin-jsx-a11y": "^2.2.0",
38-
"eslint-plugin-lodash": "^1.10.0",
38+
"eslint-plugin-lodash": "^2.1.0",
3939
"eslint-plugin-node": "^2.0.0",
40-
"eslint-plugin-promise": "^2.0.0",
40+
"eslint-plugin-promise": "^3.0.0",
4141
"eslint-plugin-react": "^6.2.0",
4242
"eslint-plugin-xo": "^0.5.0",
4343
"npmpub": "^3.1.0",

0 commit comments

Comments
 (0)