Merge pull request #8624 from loganfsmyth/misc-fixes

Verify 'sourceMap' option with hasOwnProperty, and verify string-typed 'version'
This commit is contained in:
Logan Smyth 2018-09-04 09:27:10 -07:00 committed by GitHub
commit f6643d1804
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions

View File

@ -542,7 +542,7 @@ function normalizeOptions(opts: ValidatedOptions): ValidatedOptions {
// "sourceMap" is just aliased to sourceMap, so copy it over as // "sourceMap" is just aliased to sourceMap, so copy it over as
// we merge the options together. // we merge the options together.
if (options.sourceMap) { if (options.hasOwnProperty("sourceMap")) {
options.sourceMaps = options.sourceMap; options.sourceMaps = options.sourceMap;
delete options.sourceMap; delete options.sourceMap;
} }

View File

@ -74,6 +74,9 @@ export default declare((api, options, dirname) => {
`but got ${JSON.stringify(corejsVersion)}.`, `but got ${JSON.stringify(corejsVersion)}.`,
); );
} }
if (typeof runtimeVersion !== "string") {
throw new Error(`The 'version' option must be a version string.`);
}
function has(obj, key) { function has(obj, key) {
return Object.prototype.hasOwnProperty.call(obj, key); return Object.prototype.hasOwnProperty.call(obj, key);