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

fix(karma-webpack): correctly map entries to outputted assets (config.output) #347

Merged
merged 3 commits into from
Sep 3, 2018
Merged

fix(karma-webpack): correctly map entries to outputted assets (config.output) #347

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c84a024
fix(karma-webpack): fix issue with tests hanging due to filename config
ryanclark Sep 3, 2018
1f47c75
refactor(karma-webpack): code review comments
ryanclark Sep 3, 2018
560d7cf
fix(karma-webpack): change readFile logic for multi-compilers
ryanclark Sep 3, 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
84 changes: 55 additions & 29 deletions src/karma-webpack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ function Plugin(
}

if (!webpackOptions.output.filename) {
webpackOptions.output.filename = '[name].js'
webpackOptions.output.filename = '[name].js';
}

if (!webpackOptions.output.chunkFilename) {
webpackOptions.output.chunkFilename = '[id].bundle.js'
webpackOptions.output.chunkFilename = '[id].bundle.js';
}

// For webpack 4+, optimization.splitChunks and optimization.runtimeChunk must be false.
Expand All @@ -111,6 +111,8 @@ function Plugin(
this.files = [];
this.basePath = basePath;
this.waiting = [];
this.entryFilesMap = new Map();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this.entries = new Map()
this.outputs = new Map()

this.outputFilesMap = new Map();
this.plugin = { name: 'KarmaWebpack' };

let compiler;
Expand Down Expand Up @@ -157,6 +159,20 @@ function Plugin(
applyStats.forEach((stats) => {
stats = stats.toJson();

this.outputFilesMap.clear();

const assetKeys = Object.keys(stats.assetsByChunkName);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

const entries = ...

for (let i = 0; i < assetKeys.length; i++) {
const entryName = assetKeys[i];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

const entry = entries[i]


if (this.entryFilesMap.has(entryName)) {
const entryPath = this.entryFilesMap.get(entryName);
const outputPath = stats.assetsByChunkName[entryName];

this.outputFilesMap.set(entryPath, outputPath);
}
}

assets.push(...stats.assets);
if (stats.assets.length === 0) {
noAssets = true;
Expand Down Expand Up @@ -237,6 +253,8 @@ Plugin.prototype.addFile = function(entry) {
};

Plugin.prototype.make = function(compilation, callback) {
this.entryFilesMap.clear();

async.forEach(
this.files.slice(),
(file, callback) => {
Expand All @@ -250,24 +268,27 @@ Plugin.prototype.make = function(compilation, callback) {

const dep = new SingleEntryDependency(entry);

compilation.addEntry(
'',
dep,
path.relative(this.basePath, file).replace(/\\/g, '/'),
(err) => {
// If the module fails because of an File not found error, remove the test file
if (
dep.module &&
dep.module.error &&
dep.module.error.error &&
dep.module.error.error.code === 'ENOENT'
) {
this.files = this.files.filter((f) => file !== f);
invalidate(this.middleware);
}
callback(err);
}
const filename = path.relative(this.basePath, file).replace(/\\/g, '/');
const name = path.join(
path.dirname(filename),
path.basename(filename, path.extname(filename))
);

this.entryFilesMap.set(name, filename);

compilation.addEntry('', dep, name, (err) => {
// If the module fails because of an File not found error, remove the test file
if (
dep.module &&
dep.module.error &&
dep.module.error.error &&
dep.module.error.error.code === 'ENOENT'
) {
this.files = this.files.filter((f) => file !== f);
invalidate(this.middleware);
}
callback(err);
});
},
callback
);
Expand Down Expand Up @@ -313,7 +334,11 @@ Plugin.prototype.readFile = function(file, callback) {
} else {
try {
const fileContents = middleware.fileSystem.readFileSync(
path.join(os.tmpdir(), '_karma_webpack_', file.replace(/\\/g, '/'))
path.join(
os.tmpdir(),
'_karma_webpack_',
this.outputFilesMap.get(file)
)
);

callback(null, fileContents);
Expand Down Expand Up @@ -355,17 +380,18 @@ function createPreprocesor(/* config.basePath */ basePath, webpackPlugin) {
invalidate(webpackPlugin.middleware);
}

const filename = path.relative(basePath, file.originalPath);
// read blocks until bundle is done
webpackPlugin.readFile(
path.relative(basePath, file.originalPath),
(err, content) => {
if (err) {
throw err;
}

done(err, content && content.toString());
webpackPlugin.readFile(filename, (err, content) => {
if (err) {
throw err;
}
);

const outputPath = webpackPlugin.outputFilesMap.get(filename);
file.path = path.join(basePath, outputPath);

done(err, content && content.toString());
});
};
}

Expand Down