Skip to content

Commit

Permalink
fix: create safe-buffers
Browse files Browse the repository at this point in the history
Replace the overloaded Buffer constructor with the safer alternative,
via the shim that makes it possible to support across our entire
supported range.
  • Loading branch information
terinjokes committed Jul 11, 2018
1 parent a751c5a commit b2492c4
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ matrix:
- node_js: 10
script: npm run lint
script:
- npm run test
- node --throw-deprecation ./node_modules/.bin/tape --require intelli-espower-loader test/*.js
3 changes: 2 additions & 1 deletion lib/minify.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
'use strict';
var Buffer = require('safe-buffer').Buffer;
var applySourceMap = require('vinyl-sourcemaps-apply');
var isObject = require('lodash/fp/isObject');
var defaultsDeep = require('lodash/fp/defaultsDeep');
Expand Down Expand Up @@ -64,7 +65,7 @@ module.exports = function(uglify, log) {
});
}

file.contents = new Buffer(mangled.code);
file.contents = Buffer.from(mangled.code);

if (hasSourceMaps) {
var sourceMap = JSON.parse(mangled.map);
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"has-gulplog": "^0.1.0",
"lodash": "^4.13.1",
"make-error-cause": "^1.1.1",
"safe-buffer": "^5.1.2",
"through2": "^2.0.0",
"uglify-js": "^3.0.5",
"vinyl-sourcemaps-apply": "^0.2.0"
Expand Down
3 changes: 2 additions & 1 deletion test/create-error.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict';
var test = require('tape-catch');
var assert = require('assert');
var Buffer = require('safe-buffer').Buffer;
var Vinyl = require('vinyl');
var createError = require('../lib/create-error');
var GulpUglifyError = require('../lib/gulp-uglify-error');
Expand Down Expand Up @@ -44,6 +45,6 @@ function createTestFile() {
cwd: '/home/terin/broken-promises/',
base: '/home/terin/broken-promises/test',
path: '/home/terin/broken-promises/test/test2.js',
contents: new Buffer(testOkContentsInput)
contents: Buffer.from(testOkContentsInput)
});
}
5 changes: 3 additions & 2 deletions test/err.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict';
var test = require('tape');
var assert = require('assert');
var Buffer = require('safe-buffer').Buffer;
var Vinyl = require('vinyl');
var td = require('testdouble');
var GulpUglifyError = require('../lib/gulp-uglify-error');
Expand All @@ -11,7 +12,7 @@ test('errors should report files in error', function(t) {
cwd: '/home/terin/broken-promises/',
base: '/home/terin/broken-promises/test',
path: '/home/terin/broken-promises/test/test1.js',
contents: new Buffer('function errorFunction(error)\n{')
contents: Buffer.from('function errorFunction(error)\n{')
});
var uglify = td.object(['minify']);
var logger = td.object(['warn']);
Expand Down Expand Up @@ -68,7 +69,7 @@ test("errors shouldn't blow up", function(t) {
cwd: '/home/terin/broken-promises/',
base: '/home/terin/broken-promises/test',
path: '/home/terin/broken-promises/test/test1.js',
contents: new Buffer('{}')
contents: Buffer.from('{}')
});
var uglify = td.object(['minify']);
var logger = td.object(['warn']);
Expand Down
3 changes: 2 additions & 1 deletion test/minify.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
var test = require('tape');
var assert = require('assert');
var Vinyl = require('vinyl');
var Buffer = require('safe-buffer').Buffer;
var td = require('testdouble');
var minify = require('../lib/minify');

Expand Down Expand Up @@ -78,6 +79,6 @@ function createTestFile(input) {
cwd: '/home/terin/broken-promises/',
base: '/home/terin/broken-promises/test',
path: '/home/terin/broken-promises/test/test1.js',
contents: new Buffer(input)
contents: Buffer.from(input)
});
}
5 changes: 3 additions & 2 deletions test/sourcemap.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict';
var test = require('tape');
var assert = require('assert');
var Buffer = require('safe-buffer').Buffer;
var Vinyl = require('vinyl');
var SourceListMap = require('source-list-map').SourceListMap;
var fromStringWithSourceMap = require('source-list-map')
Expand All @@ -15,7 +16,7 @@ test('sourcemaps should be merged', function(t) {
cwd: '/home/terin/broken-promises/',
base: '/home/terin/broken-promises/test',
path: '/home/terin/broken-promises/test/test1.js',
contents: new Buffer(testContents1Input)
contents: Buffer.from(testContents1Input)
});

var originalMap = new SourceListMap();
Expand Down Expand Up @@ -80,7 +81,7 @@ test('sourcemaps should merge when concatted', function(t) {
cwd: '/home/terin/broken-promises/',
base: '/home/terin/broken-promises/test',
path: '/home/terin/broken-promises/test/test1.js',
contents: new Buffer(String(inMap))
contents: Buffer.from(String(inMap))
});
testFile.sourceMap = inMap.toStringWithSourceMap({file: 'test1.js'}).map;

Expand Down

0 comments on commit b2492c4

Please sign in to comment.