Skip to content
This repository has been archived by the owner on Dec 5, 2019. It is now read-only.

fix: improve isSouceMap check #284

Merged
merged 1 commit into from
May 2, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ class UglifyJsPlugin {
} else {
inputSourceMap = map;
compilation.warnings.push(
new Error(`${file} contain invalid source map`),
new Error(`${file} contains invalid source map`),
);
}
} else {
Expand Down
4 changes: 2 additions & 2 deletions src/utils/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ function isSourceMap(input) {
return Boolean(input &&
input.version &&
input.sources &&
input.names &&
input.mappings);
Array.isArray(input.sources) &&
typeof input.mappings === 'string');
}

export default {
Expand Down
4 changes: 2 additions & 2 deletions test/__snapshots__/source-map-options.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`when options.sourceMap true and options.parallel true compilation handl

exports[`when options.sourceMap true and options.parallel true compilation handler when called optimize-chunk-assets handler only calls callback once: warnings 1`] = `
Array [
[Error: test4.js contain invalid source map],
[Error: test4.js contains invalid source map],
]
`;

Expand Down Expand Up @@ -204,7 +204,7 @@ exports[`when options.sourceMap true compilation handler when called optimize-ch

exports[`when options.sourceMap true compilation handler when called optimize-chunk-assets handler only calls callback once: warnings 1`] = `
Array [
[Error: test4.js contain invalid source map],
[Error: test4.js contains invalid source map],
]
`;

Expand Down
13 changes: 13 additions & 0 deletions test/utils/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,25 @@ describe('utils', () => {
sourceRoot: 'http://example.com/www/js/',
mappings: 'CAAC,IAAI,IAAM,SAAUA,GAClB,OAAOC,IAAID;CCDb,IAAI,IAAM,SAAUE,GAClB,OAAOA',
};
const emptyRawSourceMap = {
version: 3,
sources: [],
mappings: '',
};

expect(utils.isSourceMap(null)).toBe(false);
expect(utils.isSourceMap()).toBe(false);
expect(utils.isSourceMap({})).toBe(false);
expect(utils.isSourceMap([])).toBe(false);
expect(utils.isSourceMap('foo')).toBe(false);
expect(utils.isSourceMap({ version: 3 })).toBe(false);
expect(utils.isSourceMap({ sources: '' })).toBe(false);
expect(utils.isSourceMap({ mappings: [] })).toBe(false);
expect(utils.isSourceMap({ version: 3, sources: '' })).toBe(false);
expect(utils.isSourceMap({ version: 3, mappings: [] })).toBe(false);
expect(utils.isSourceMap({ sources: '', mappings: [] })).toBe(false);
expect(utils.isSourceMap({ version: 3, sources: '', mappings: [] })).toBe(false);
expect(utils.isSourceMap(rawSourceMap)).toBe(true);
expect(utils.isSourceMap(emptyRawSourceMap)).toBe(true);
});
});