Skip to content

Commit

Permalink
Merge pull request #299 from gulp-sourcemaps/2.x-node-0.10
Browse files Browse the repository at this point in the history
Switch to strip-bom-string to support 0.10+ in 2.x
  • Loading branch information
nmccready authored and phated committed Apr 3, 2017
2 parents 4a3b159 + b6265a8 commit 43c7e46
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ language: node_js
node_js:
- 6
- 4
- 0.12
- 0.10

cache:
directories:
Expand Down
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@

### Branching

- master: is latest currently (2.X) - node > 4.X
- 1.X: is node 0.X - only issues appear to be es6

Preferably, we would like move on from node 0.X as much as possible as some of the dependencies are doing so as well. Meaning for features please target master for PRs. If bugs are found to be relvant to both 1.X and master then please target PRs for the 1.X branch to make git merging easier.
__2.X now supports node 0.10+ due to switching out a dependency.__

### Usage

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"detect-newline": "2.X",
"graceful-fs": "4.X",
"source-map": "0.X",
"strip-bom": "3.X",
"strip-bom-string": "1.X",
"through2": "2.X",
"vinyl": "1.X"
},
Expand Down
2 changes: 1 addition & 1 deletion src/init/index.internals.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var utils = require('../utils');
var PLUGIN_NAME = utils.PLUGIN_NAME;
var makeDebug = require('debug-fabulous')();
var convert = require('convert-source-map');
var stripBom = require('strip-bom');
var stripBom = require('strip-bom-string');
var urlRegex = utils.urlRegex;
var fs = require('graceful-fs');
var path = require('path');
Expand Down
2 changes: 1 addition & 1 deletion src/write/index.internals.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module.exports = function(destPath, options) {
PLUGIN_NAME = utils.PLUGIN_NAME,
fs = require('graceful-fs'),
path = require('path'),
stripBom = require('strip-bom'),
stripBom = require('strip-bom-string'),
makeDebug = require('debug-fabulous')();

var rootDebug = makeDebug(PLUGIN_NAME + ':write:internals');
Expand Down

0 comments on commit 43c7e46

Please sign in to comment.