Merge pull request #3 from calvinmetcalf/safe-buffer

safe-buffer

build/files.js

@@ -16,15 +16,7 @@ module.exports['string_decoder.js'] = [
 
   , [
         /const Buffer = require\('buffer'\).Buffer;/
-      , 'var Buffer = require(\'buffer\').Buffer;\n' +
-        'var bufferShim = require(\'buffer-shims\');'
-    ]
-
-    // allocUnsafe
-
-  , [
-      /Buffer\.((?:alloc)|(?:allocUnsafe)|(?:from))/g,
-      'bufferShim.$1'
+      , 'var Buffer = require(\'safe-buffer\').Buffer;\n'
     ]
 
     // add Buffer.isEncoding where missing

build/test-replacements.js

@@ -11,7 +11,7 @@ module.exports.all = [
 
   , [
       /^('use strict';)$/m,
-      '$1\nconst bufferShim = require(\'buffer-shims\');'
+      '$1\nconst bufferShim = require(\'safe-buffer\').Buffer;'
     ]
 
 ]
@@ -60,4 +60,3 @@ module.exports['test-string-decoder.js'] = [
       , ''
     ]
 ]
-

lib/string_decoder.js

@@ -1,7 +1,6 @@
 'use strict';
 
-var Buffer = require('buffer').Buffer;
-var bufferShim = require('buffer-shims');
+var Buffer = require('safe-buffer').Buffer;
 
 var isEncoding = Buffer.isEncoding || function (encoding) {
   encoding = '' + encoding;
@@ -78,7 +77,7 @@ function StringDecoder(encoding) {
   }
   this.lastNeed = 0;
   this.lastTotal = 0;
-  this.lastChar = bufferShim.allocUnsafe(nb);
+  this.lastChar = Buffer.allocUnsafe(nb);
 }
 
 StringDecoder.prototype.write = function (buf) {

package.json

@@ -4,7 +4,7 @@
   "description": "The string_decoder module from Node core",
   "main": "lib/string_decoder.js",
   "dependencies": {
-    "buffer-shims": "~1.0.0"
+    "safe-buffer": "^5.0.1"
   },
   "devDependencies": {
     "babel-polyfill": "^6.23.0",

test/parallel/test-string-decoder-end.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 // verify that the string decoder works getting 1 byte at a time,
 // the whole buffer at once, and that both match the .toString(enc)
 // result of the entire buffer.

test/parallel/test-string-decoder.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 require('../common');
 var assert = require('assert');
 var inspect = require('util').inspect;