This is an automated email from the ASF dual-hosted git repository. aboda pushed a commit to branch NIFIREG-371-RC1 in repository https://gitbox.apache.org/repos/asf/nifi-registry.git
commit 25625cdbbd04e535970792cf3b628a5fbd2b3f62 Author: Scott Aslan <[email protected]> AuthorDate: Wed Sep 18 15:25:38 2019 -0400 [NIFIREG-319] remove code coverage instrumentation from nifi-fds js modules This closes #229. --- .../nifi-registry-web-ui/src/main/webpack.karma.js | 1 + .../src/main/webpack.loader.js | 27 ++++++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/nifi-registry-core/nifi-registry-web-ui/src/main/webpack.karma.js b/nifi-registry-core/nifi-registry-web-ui/src/main/webpack.karma.js index 01eb073..c1fee77 100644 --- a/nifi-registry-core/nifi-registry-web-ui/src/main/webpack.karma.js +++ b/nifi-registry-core/nifi-registry-web-ui/src/main/webpack.karma.js @@ -30,6 +30,7 @@ module.exports = merge(commonConfig, { module: { rules: [ + loaders.jsFDS, loaders.tsCoverage, loaders.jsCoverage, loaders.html, diff --git a/nifi-registry-core/nifi-registry-web-ui/src/main/webpack.loader.js b/nifi-registry-core/nifi-registry-web-ui/src/main/webpack.loader.js index 5014a98..c424893 100644 --- a/nifi-registry-core/nifi-registry-web-ui/src/main/webpack.loader.js +++ b/nifi-registry-core/nifi-registry-web-ui/src/main/webpack.loader.js @@ -88,12 +88,35 @@ module.exports = { ] }, - jsCoverage: { + jsFDS: { test: /\.js$/, include: [ - path.resolve(__dirname, 'webapp'), path.resolve(__dirname, 'node_modules/@nifi-fds/core') ], + use: [ + { + loader: 'cache-loader', + options: { + cacheDirectory: cacheCoverageDir + } + }, + { + loader: path.resolve(__dirname, 'angular-url-loader') + }, + { + loader: 'babel-loader', + options: { + presets: ['@babel/preset-env'] + } + } + ] + }, + + jsCoverage: { + test: /\.js$/, + include: [ + path.resolve(__dirname, 'webapp') + ], // prevent these files/patterns from being included in the coverage report exclude: [ /\.spec\.js$/,
