Use Buffer.from instead of new Buffer

ooflorent · ooflorent · commit 7f303e526073 · 2018-01-22T17:23:34.000+01:00
diff --git a/lib/Compiler.js b/lib/Compiler.js
@@ -288,7 +288,7 @@ class Compiler extends Tapable {
 					let content = source.source();
 
 					if(!Buffer.isBuffer(content)) {
-						content = new Buffer(content, "utf8"); // eslint-disable-line
+						content = Buffer.from(content, "utf8");
 					}
 
 					source.existsAt = targetPath;
diff --git a/lib/EvalSourceMapDevToolModuleTemplatePlugin.js b/lib/EvalSourceMapDevToolModuleTemplatePlugin.js
@@ -65,7 +65,7 @@ class EvalSourceMapDevToolModuleTemplatePlugin {
 			sourceMap.sourceRoot = options.sourceRoot || "";
 			sourceMap.file = `${module.id}.js`;
 
-			const footer = self.sourceMapComment.replace(/\[url\]/g, `data:application/json;charset=utf-8;base64,${new Buffer(JSON.stringify(sourceMap), "utf8").toString("base64")}`) + //eslint-disable-line
+			const footer = self.sourceMapComment.replace(/\[url\]/g, `data:application/json;charset=utf-8;base64,${Buffer.from(JSON.stringify(sourceMap), "utf8").toString("base64")}`) +
 				`\n//# sourceURL=webpack-internal:///${module.id}\n`; // workaround for chrome bug
 			source.__EvalSourceMapDevToolData = new RawSource(`eval(${JSON.stringify(content + footer)});`);
 			return source.__EvalSourceMapDevToolData;
diff --git a/lib/NormalModule.js b/lib/NormalModule.js
@@ -33,7 +33,7 @@ const asString = (buf) => {
 
 const asBuffer = str => {
 	if(!Buffer.isBuffer(str)) {
-		return new Buffer(str, "utf-8"); // eslint-disable-line
+		return Buffer.from(str, "utf-8");
 	}
 	return str;
 };
diff --git a/lib/SourceMapDevToolPlugin.js b/lib/SourceMapDevToolPlugin.js
@@ -224,7 +224,7 @@ class SourceMapDevToolPlugin {
 					} else {
 						asset.__SourceMapDevToolData[file] = compilation.assets[file] = new ConcatSource(new RawSource(source), currentSourceMappingURLComment
 							.replace(/\[map\]/g, () => sourceMapString)
-							.replace(/\[url\]/g, () => `data:application/json;charset=utf-8;base64,${new Buffer(sourceMapString, "utf-8").toString("base64")}`) // eslint-disable-line
+							.replace(/\[url\]/g, () => `data:application/json;charset=utf-8;base64,${Buffer.from(sourceMapString, "utf-8").toString("base64")}`)
 						);
 					}
 				});
diff --git a/lib/optimize/ConcatenatedModule.js b/lib/optimize/ConcatenatedModule.js
@@ -629,7 +629,7 @@ class ConcatenatedModule extends Module {
 							exportName = true;
 						} else {
 							const exportData = match[2];
-							exportName = new Buffer(exportData, "hex").toString("utf-8"); // eslint-disable-line node/no-deprecated-api
+							exportName = Buffer.from(exportData, "hex").toString("utf-8");
 						}
 						const asCall = !!match[3];
 						const strictHarmonyModule = !!match[4];
@@ -768,7 +768,7 @@ class HarmonyImportSpecifierDependencyConcatenatedTemplate {
 		} else if(dep.namespaceObjectAsContext) {
 			content = `__WEBPACK_MODULE_REFERENCE__${info.index}_ns${strictFlag}__[${JSON.stringify(dep.id)}]`;
 		} else {
-			const exportData = new Buffer(dep.id, "utf-8").toString("hex"); // eslint-disable-line node/no-deprecated-api
+			const exportData = Buffer.from(dep.id, "utf-8").toString("hex");
 			content = `__WEBPACK_MODULE_REFERENCE__${info.index}_${exportData}${callFlag}${strictFlag}__`;
 		}
 		if(dep.shorthand) {
@@ -931,7 +931,7 @@ class HarmonyExportImportedSpecifierDependencyConcatenatedTemplate {
 					if(def.id === true) {
 						finalName = `__WEBPACK_MODULE_REFERENCE__${info.index}_ns${strictFlag}__`;
 					} else {
-						const exportData = new Buffer(def.id, "utf-8").toString("hex"); // eslint-disable-line node/no-deprecated-api
+						const exportData = Buffer.from(def.id, "utf-8").toString("hex");
 						finalName = `__WEBPACK_MODULE_REFERENCE__${info.index}_${exportData}${strictFlag}__`;
 					}
 					const exportsName = this.rootModule.exportsArgument;

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ class Compiler extends Tapable {`
`288`	`288`	`let content = source.source();`
`289`	`289`
`290`	`290`	`if(!Buffer.isBuffer(content)) {`
`291`		`- content = new Buffer(content, "utf8"); // eslint-disable-line`
	`291`	`+ content = Buffer.from(content, "utf8");`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`source.existsAt = targetPath;`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ const asString = (buf) => {`
`33`	`33`
`34`	`34`	`const asBuffer = str => {`
`35`	`35`	`if(!Buffer.isBuffer(str)) {`
`36`		`- return new Buffer(str, "utf-8"); // eslint-disable-line`
	`36`	`+ return Buffer.from(str, "utf-8");`
`37`	`37`	`}`
`38`	`38`	`return str;`
`39`	`39`	`};`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ class SourceMapDevToolPlugin {`
`224`	`224`	`} else {`
`225`	`225`	`asset.__SourceMapDevToolData[file] = compilation.assets[file] = new ConcatSource(new RawSource(source), currentSourceMappingURLComment`
`226`	`226`	`.replace(/\[map\]/g, () => sourceMapString)`
`227`		- .replace(/\[url\]/g, () => `data:application/json;charset=utf-8;base64,${new Buffer(sourceMapString, "utf-8").toString("base64")}`) // eslint-disable-line
	`227`	+ .replace(/\[url\]/g, () => `data:application/json;charset=utf-8;base64,${Buffer.from(sourceMapString, "utf-8").toString("base64")}`)
`228`	`228`	`);`
`229`	`229`	`}`
`230`	`230`	`});`