nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rfell...@apache.org
Subject [nifi-registry] branch master updated: [NIFIREG-319] remove code coverage instrumentation from nifi-fds js modules
Date Thu, 03 Oct 2019 15:06:23 GMT
This is an automated email from the ASF dual-hosted git repository.

rfellows pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/master by this push:
     new 1f8bbc8  [NIFIREG-319] remove code coverage instrumentation from nifi-fds js modules
1f8bbc8 is described below

commit 1f8bbc8a8eedd62597c70e2348f237be9f6b88fb
Author: Scott Aslan <scottyaslan@gmail.com>
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$/,


Mime
View raw message