From f46dac81c0c7a8199edbd427ab0dd17ac7f26d57 Mon Sep 17 00:00:00 2001 From: Tim Sebastian Date: Thu, 12 Jan 2017 19:55:08 +1100 Subject: [PATCH] fix issue where `requirejs.config()` would be evaluated to `;` instead of `undefined` this may lead to potential Syntaxerrors as `const x = requirejs.config();` would be transformed to `const x = ;;` --- lib/RequireJsStuffPlugin.js | 4 ++-- test/RequireJsStuffPlugin.test.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/RequireJsStuffPlugin.js b/lib/RequireJsStuffPlugin.js index daa4eb053..d0ef58937 100644 --- a/lib/RequireJsStuffPlugin.js +++ b/lib/RequireJsStuffPlugin.js @@ -19,8 +19,8 @@ module.exports = class RequireJsStuffPlugin { if(typeof parserOptions.requireJs !== "undefined" && !parserOptions.requireJs) return; - parser.plugin("call require.config", ParserHelpers.toConstantDependency(";")); - parser.plugin("call requirejs.config", ParserHelpers.toConstantDependency(";")); + parser.plugin("call require.config", ParserHelpers.toConstantDependency("undefined")); + parser.plugin("call requirejs.config", ParserHelpers.toConstantDependency("undefined")); parser.plugin("expression require.version", ParserHelpers.toConstantDependency(JSON.stringify("0.0.0"))); parser.plugin("expression requirejs.onError", ParserHelpers.toConstantDependency(JSON.stringify("__webpack_require__.oe"))); diff --git a/test/RequireJsStuffPlugin.test.js b/test/RequireJsStuffPlugin.test.js index ee31c225b..9d4499816 100644 --- a/test/RequireJsStuffPlugin.test.js +++ b/test/RequireJsStuffPlugin.test.js @@ -136,7 +136,7 @@ describe("RequireJsStuffPlugin", function() { var addDependencySpy = parserEventContext.state.current.addDependency; var addedDependency = JSON.stringify(addDependencySpy.getCall(0).args[0]); addDependencySpy.callCount.should.be.exactly(1); - addedDependency.should.be.exactly('{"module":null,"expression":";","range":10,"loc":5}'); + addedDependency.should.be.exactly('{"module":null,"expression":"undefined","range":10,"loc":5}'); }); }); }); @@ -159,7 +159,7 @@ describe("RequireJsStuffPlugin", function() { const addDependencySpy = parserEventContext.state.current.addDependency; const addedDependency = JSON.stringify(addDependencySpy.getCall(0).args[0]); addDependencySpy.callCount.should.be.exactly(1); - addedDependency.should.be.exactly('{"module":null,"expression":";","range":10,"loc":5}'); + addedDependency.should.be.exactly('{"module":null,"expression":"undefined","range":10,"loc":5}'); }); }); });