Skip to content

fix(@angular-devkit/build-angular): identify plugin provided as string #19574

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

Merged
merged 1 commit into from
Dec 9, 2020
Merged

fix(@angular-devkit/build-angular): identify plugin provided as string #19574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions packages/angular_devkit/build_angular/src/karma/code-coverage_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,19 @@ describe('Karma Builder code coverage', () => {
await run.stop();

}, 120000);

it('is able to process coverage plugin provided as string', async () => {
host.replaceInFile('karma.conf.js', /plugins: \[.+?\]/s, `plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('@angular-devkit/build-angular/plugins/karma'),
'karma-coverage', // instead of require('karma-coverage')
]`);
const run = await architect.scheduleTarget(karmaTargetSpec, { codeCoverage: true });

const {success} = await run.result;
expect(success).toBe(true);
await run.stop();
}, 120000);
});
20 changes: 18 additions & 2 deletions packages/angular_devkit/build_angular/src/webpack/plugins/karma.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
config.plugins = config.plugins || [];
config.reporters = config.reporters || [];
const {plugins, reporters} = config;
const hasCoveragePlugin = plugins.some((p: {}) => 'reporter:coverage' in p);
const hasIstanbulPlugin = plugins.some((p: {}) => 'reporter:coverage-istanbul' in p);
const hasCoveragePlugin = plugins.some(isPlugin('karma-coverage', 'reporter:coverage'));
const hasIstanbulPlugin = plugins.some(isPlugin('karma-coverage-istanbul-reporter', 'reporter:coverage-istanbul'));
const hasCoverageReporter = reporters.includes('coverage');
const hasIstanbulReporter = reporters.includes('coverage-istanbul');
if (hasCoveragePlugin && !hasCoverageReporter) {
Expand Down Expand Up @@ -334,6 +334,22 @@ function fallbackMiddleware() {
};
}

/**
* Returns a function that returns true if the plugin identifier matches the
* `moduleId` or `pluginName`. A plugin identifier can be either a string or
* an object according to https://karma-runner.github.io/5.2/config/plugins.html
* @param moduleId name of the node module (e.g. karma-coverage)
* @param pluginName name of the karma plugin (e.g. reporter:coverage)
*/
function isPlugin(moduleId: string, pluginName: string) {
return (plugin: string|{}): boolean => {
if (typeof plugin === 'string') {
return plugin === moduleId;
}
return pluginName in plugin;
}
}

module.exports = {
'framework:@angular-devkit/build-angular': ['factory', init],
'reporter:@angular-devkit/build-angular--sourcemap-reporter': ['type', sourceMapReporter],
Expand Down