Skip to content

Commit 540e3b9

Browse files
authored
Merge branch 'master' into relative
2 parents 6c5290c + 7055a40 commit 540e3b9

File tree

5 files changed

+38
-7
lines changed

5 files changed

+38
-7
lines changed

.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"presets": [
33
["env", {
44
"targets": {
5-
"node": 6
5+
"node": 4
66
},
77
"loose": true,
88
"useBuiltIns": true

.circleci/config.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
version: 2
22
jobs:
3+
test_with_node_4:
4+
docker:
5+
- image: circleci/node:4
6+
steps:
7+
- checkout
8+
- run:
9+
name: Install dependencies
10+
command: npm install
11+
- run:
12+
name: Test
13+
command: npm test
314
test_with_node_6:
415
docker:
516
- image: circleci/node:6
@@ -40,6 +51,7 @@ workflows:
4051
version: 2
4152
test_all:
4253
jobs:
54+
- test_with_node_4
4355
- test_with_node_6
4456
- test_with_node_8
4557
- test_with_node_9

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
<a name="3.1.1"></a>
6+
## [3.1.1](https://github.com/tleunen/babel-plugin-module-resolver/compare/v3.1.0...v3.1.1) (2018-03-24)
7+
8+
9+
### Bug Fixes
10+
11+
* Add support for Node 4 ([#286](https://github.com/tleunen/babel-plugin-module-resolver/issues/286)) ([2d5bf09](https://github.com/tleunen/babel-plugin-module-resolver/commit/2d5bf09)), closes [#285](https://github.com/tleunen/babel-plugin-module-resolver/issues/285) [#236](https://github.com/tleunen/babel-plugin-module-resolver/issues/236)
12+
13+
14+
515
<a name="3.1.0"></a>
616
# [3.1.0](https://github.com/tleunen/babel-plugin-module-resolver/compare/v3.0.0...v3.1.0) (2018-02-08)
717

appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
environment:
22
matrix:
3+
- nodejs_version: '4'
34
- nodejs_version: '6'
45
- nodejs_version: '8'
56
- nodejs_version: '9'

package.json

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
{
22
"name": "babel-plugin-module-resolver",
3-
"version": "3.1.0",
3+
"version": "3.1.1",
44
"main": "lib/index.js",
55
"description": "Module resolver plugin for Babel",
66
"repository": {
77
"type": "git",
88
"url": "https://github.com/tleunen/babel-plugin-module-resolver.git"
99
},
1010
"engines": {
11-
"node": ">= 6.0.0"
11+
"node": ">= 4.0.0"
1212
},
13-
"files": ["lib"],
13+
"files": [
14+
"lib"
15+
],
1416
"author": {
1517
"name": "Tommy Leunen",
1618
"email": "tommy.leunen@gmail.com",
@@ -68,11 +70,17 @@
6870
"precommit": "lint-staged"
6971
},
7072
"lint-staged": {
71-
"*.{json,md}": ["prettier-eslint --write", "git add"],
72-
"*.{js}": ["prettier-eslint --write", "eslint --fix", "git add"]
73+
"*.{js}": [
74+
"prettier-eslint --write",
75+
"git add"
76+
]
7377
},
7478
"jest": {
79+
"testEnvironment": "node",
7580
"testRegex": "/test/.*\\.test\\.js$",
76-
"collectCoverageFrom": ["src/**/*.js", "!src/log.js"]
81+
"collectCoverageFrom": [
82+
"src/**/*.js",
83+
"!src/log.js"
84+
]
7785
}
7886
}

0 commit comments

Comments
 (0)