Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(karma-webpack): handle outputPath correctly #360

Merged
merged 5 commits into from
Nov 22, 2018
Merged

fix(karma-webpack): handle outputPath correctly #360

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c0715f
:bug: fix multiple output files, assamption fist file is JS is wrong
alabbas-ali Sep 17, 2018
8b5a22d
intent spacing
alabbas-ali Sep 17, 2018
7666ead
remove unnecessary checks from code
alabbas-ali Sep 21, 2018
3470e92
fix(karma-webpack): fix review comments, fix handling .js.map output
alabbas-ali Sep 22, 2018
a3a22b2
multiple output files, fix PR review comment :)
alabbas-ali Oct 18, 2018
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
38 changes: 21 additions & 17 deletions src/karma-webpack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,18 @@ var isBlocked = false

const normalize = (file) => file.replace(/\\/g, '/')

const getOutputPath = (outputPath) => {
for (var i = 0; i < outputPath.length; i++) {
if (
outputPath[i].indexOf(".js") !== -1 &&
outputPath[i].indexOf(".js.map") === -1
) {
return outputPath[i];
}
}
return null;
}

var escapeRegExp = function(str) {
// See details here https://stackoverflow.com/questions/3446170/escape-string-for-use-in-javascript-regex
return str.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&')
Expand Down Expand Up @@ -130,7 +142,12 @@ function Plugin(
if ({}.hasOwnProperty.call(this.entries, entry)) {
var entryPath = this.entries[entry]
var outputPath = stats.assetsByChunkName[entry]
this.outputs[entryPath] = outputPath
if (Array.isArray(outputPath)) {
outputPath = getOutputPath(outputPath)
}
if (outputPath !== null) {
this.outputs[entryPath] = outputPath
}
}
}

Expand Down Expand Up @@ -237,11 +254,7 @@ Plugin.prototype.readFile = function(file, callback) {
var doRead = function() {
if (optionsCount > 1) {
async.times(optionsCount, function(idx, callback) {
if (Array.isArray(this.outputs[file])) {
middleware.fileSystem.readFile(path.join(os.tmpdir(), '_karma_webpack_', String(idx), this.outputs[file][0]), callback);
} else {
middleware.fileSystem.readFile(path.join(os.tmpdir(), '_karma_webpack_', String(idx), this.outputs[file]), callback);
}
middleware.fileSystem.readFile(path.join(os.tmpdir(), '_karma_webpack_', String(idx), this.outputs[file]), callback)
}.bind(this), function(err, contents) {
if (err) {
return callback(err)
Expand All @@ -258,12 +271,7 @@ Plugin.prototype.readFile = function(file, callback) {
})
} else {
try {
var fileContents = ''
if (Array.isArray(this.outputs[file])) {
fileContents = middleware.fileSystem.readFileSync(path.join(os.tmpdir(), '_karma_webpack_', this.outputs[file][0]));
} else {
fileContents = middleware.fileSystem.readFileSync(path.join(os.tmpdir(), '_karma_webpack_', this.outputs[file]));
}
var fileContents = middleware.fileSystem.readFileSync(path.join(os.tmpdir(), '_karma_webpack_', this.outputs[file]))

callback(undefined, fileContents)
} catch (e) {
Expand Down Expand Up @@ -306,11 +314,7 @@ function createPreprocesor(/* config.basePath */ basePath, webpackPlugin) {
}

var outputPath = webpackPlugin.outputs[normalize(filename)]
if( Array.isArray(outputPath)){
file.path = normalize(path.join(basePath, outputPath[0]));
} else {
file.path = normalize(path.join(basePath, outputPath));
}
file.path = normalize(path.join(basePath, outputPath))

done(err, content && content.toString())
})
Expand Down