You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sc...@apache.org on 2019/08/15 12:39:45 UTC
[nifi-registry] branch master updated (5d080f6 -> 641c35b)
This is an automated email from the ASF dual-hosted git repository.
scottyaslan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git.
from 5d080f6 [NIFIREG-279] upgrade client deps [NIFIREG-279] configure webpack to work with npm link [NIFIREG-279] update to latest deps [NIFIREG-279] upgrade to latest nifi fds 0.2.0 address pr review comments [NIFIREG-279] update broken unit tests
new b3209bd NIFIREG-302 - Enable building with uncompressed javascript
new 641c35b NIFIREG-302 - clean up console messages that report as errors(even though they really are not) during build.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
nifi-registry-core/nifi-registry-web-ui/pom.xml | 18 +-
.../nifi-registry-web-ui/src/main/karma.conf.js | 5 +
.../src/main/package-lock.json | 190 ++++++---------------
.../nifi-registry-web-ui/src/main/package.json | 4 +-
.../src/main/webpack.common.js | 4 +-
5 files changed, 72 insertions(+), 149 deletions(-)
[nifi-registry] 01/02: NIFIREG-302 - Enable building with
uncompressed javascript
Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
scottyaslan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git
commit b3209bd5c7f95ee65ec33ae36cde0ca5aaf1c72c
Author: Rob Fellows <ro...@gmail.com>
AuthorDate: Mon Aug 12 11:49:10 2019 -0400
NIFIREG-302 - Enable building with uncompressed javascript
---
nifi-registry-core/nifi-registry-web-ui/pom.xml | 18 +++++++++++++-----
.../nifi-registry-web-ui/src/main/package.json | 2 +-
.../nifi-registry-web-ui/src/main/webpack.common.js | 2 +-
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/nifi-registry-core/nifi-registry-web-ui/pom.xml b/nifi-registry-core/nifi-registry-web-ui/pom.xml
index 337fa6f..095867e 100644
--- a/nifi-registry-core/nifi-registry-web-ui/pom.xml
+++ b/nifi-registry-core/nifi-registry-web-ui/pom.xml
@@ -30,6 +30,7 @@
<frontend.dependency.configs>${basedir}/src/main</frontend.dependency.configs>
<frontend.working.dir>${project.build.directory}/frontend-working-directory</frontend.working.dir>
<frontend.assets>${project.build.directory}/${project.build.finalName}/node_modules</frontend.assets>
+ <npm.bundle.script>build:webapp:bundle:production</npm.bundle.script>
</properties>
<build>
<!--
@@ -199,10 +200,10 @@
<directory>${frontend.working.dir}</directory>
<filtering>false</filtering>
<includes>
- <include>nf-registry.bundle.min.*.js*</include>
- <include>vendor.min.*.js*</include>
- <include>nf-registry.style.min.*.css*</include>
- <include>vendor.min.*.css*</include>
+ <include>nf-registry.bundle.min*.js*</include>
+ <include>vendor.min*.js*</include>
+ <include>nf-registry.style.min*.css*</include>
+ <include>vendor.min*.css*</include>
<include>index.html</include>
<include>assets/**/*</include>
<include>registry-favicon.png</include>
@@ -260,7 +261,7 @@
</goals>
<phase>generate-resources</phase>
<configuration>
- <arguments>run build:webapp:bundle:production</arguments>
+ <arguments>run ${npm.bundle.script}</arguments>
<workingDirectory>${frontend.working.dir}</workingDirectory>
</configuration>
</execution>
@@ -339,7 +340,14 @@
<id>development-mode</id>
<activation>
<activeByDefault>false</activeByDefault>
+ <property>
+ <name>env</name>
+ <value>dev</value>
+ </property>
</activation>
+ <properties>
+ <npm.bundle.script>build:webapp:bundle:development</npm.bundle.script>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/nifi-registry-core/nifi-registry-web-ui/src/main/package.json b/nifi-registry-core/nifi-registry-web-ui/src/main/package.json
index 37ef7a7..b342b62 100644
--- a/nifi-registry-core/nifi-registry-web-ui/src/main/package.json
+++ b/nifi-registry-core/nifi-registry-web-ui/src/main/package.json
@@ -25,7 +25,7 @@
"stylelint": "./node_modules/.bin/stylelint './webapp/theming/**/*.scss'",
"lint": "npm run eslint && npm run stylelint",
"lint:production": "../../target/frontend-working-directory/node/node ../../target/frontend-working-directory/node/node_modules/npm/bin/npm-cli.js run eslint --scripts-prepend-node-path && ../../target/frontend-working-directory/node/node ../../target/frontend-working-directory/node/node_modules/npm/bin/npm-cli.js run stylelint --scripts-prepend-node-path",
- "build:webapp:bundle:devlopment": "npm run webpack:development",
+ "build:webapp:bundle:development": "npm run webpack:development",
"build:webapp:bundle:production": "../../target/frontend-working-directory/node/node ../../target/frontend-working-directory/node/node_modules/npm/bin/npm-cli.js run lint:production && ../../target/frontend-working-directory/node/node ../../target/frontend-working-directory/node/node_modules/npm/bin/npm-cli.js run webpack:production",
"webpack:development": "./node_modules/.bin/webpack --config webpack.dev.js",
"webpack:production": "./node_modules/.bin/webpack --config webpack.prod.js",
diff --git a/nifi-registry-core/nifi-registry-web-ui/src/main/webpack.common.js b/nifi-registry-core/nifi-registry-web-ui/src/main/webpack.common.js
index 5f04bce..9e18333 100644
--- a/nifi-registry-core/nifi-registry-web-ui/src/main/webpack.common.js
+++ b/nifi-registry-core/nifi-registry-web-ui/src/main/webpack.common.js
@@ -84,6 +84,6 @@ module.exports = {
plugins: [
// Fix style only entry generating an extra js file
- new FixStyleOnlyEntriesPlugin()
+ new FixStyleOnlyEntriesPlugin({ silent: true })
]
};
[nifi-registry] 02/02: NIFIREG-302 - clean up console messages that
report as errors(even though they really are not) during build.
Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
scottyaslan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git
commit 641c35b6d630c3f07ca917fbca38af3171752458
Author: Rob Fellows <ro...@gmail.com>
AuthorDate: Wed Aug 14 17:16:45 2019 -0400
NIFIREG-302 - clean up console messages that report as errors(even though they really are not) during build.
This closes #216
Signed-off-by: Scott Aslan <sc...@gmail.com>
---
.../nifi-registry-web-ui/src/main/karma.conf.js | 5 +
.../src/main/package-lock.json | 190 ++++++---------------
.../nifi-registry-web-ui/src/main/package.json | 2 +-
.../src/main/webpack.common.js | 2 +
4 files changed, 57 insertions(+), 142 deletions(-)
diff --git a/nifi-registry-core/nifi-registry-web-ui/src/main/karma.conf.js b/nifi-registry-core/nifi-registry-web-ui/src/main/karma.conf.js
index 0998a38..e439184 100644
--- a/nifi-registry-core/nifi-registry-web-ui/src/main/karma.conf.js
+++ b/nifi-registry-core/nifi-registry-web-ui/src/main/karma.conf.js
@@ -66,6 +66,11 @@ module.exports = function (config) {
noInfo: true
},
+ webpackMiddleware: {
+ stats: 'errors-only',
+ logLevel: 'error'
+ },
+
exclude: [],
preprocessors: {
diff --git a/nifi-registry-core/nifi-registry-web-ui/src/main/package-lock.json b/nifi-registry-core/nifi-registry-web-ui/src/main/package-lock.json
index 070dce6..51e5b27 100644
--- a/nifi-registry-core/nifi-registry-web-ui/src/main/package-lock.json
+++ b/nifi-registry-core/nifi-registry-web-ui/src/main/package-lock.json
@@ -3828,15 +3828,6 @@
"integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
"dev": true
},
- "d": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
- "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
- "dev": true,
- "requires": {
- "es5-ext": "0.10.42"
- }
- },
"damerau-levenshtein": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz",
@@ -4456,28 +4447,6 @@
"is-symbol": "1.0.2"
}
},
- "es5-ext": {
- "version": "0.10.42",
- "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz",
- "integrity": "sha1-jAfdM68E1dzRMQtc7xO+pjqJuo0=",
- "dev": true,
- "requires": {
- "es6-iterator": "2.0.3",
- "es6-symbol": "3.1.1",
- "next-tick": "1.0.0"
- }
- },
- "es6-iterator": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
- "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
- "dev": true,
- "requires": {
- "d": "1.0.0",
- "es5-ext": "0.10.42",
- "es6-symbol": "3.1.1"
- }
- },
"es6-promise": {
"version": "4.2.4",
"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz",
@@ -4493,16 +4462,6 @@
"es6-promise": "4.2.4"
}
},
- "es6-symbol": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
- "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
- "dev": true,
- "requires": {
- "d": "1.0.0",
- "es5-ext": "0.10.42"
- }
- },
"es6-templates": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/es6-templates/-/es6-templates-0.2.3.tgz",
@@ -8979,108 +8938,79 @@
}
},
"karma-webpack": {
- "version": "3.0.5",
- "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-3.0.5.tgz",
- "integrity": "sha512-nRudGJWstvVuA6Tbju9tyGUfXTtI1UXMXoRHVmM2/78D0q6s/Ye2IC157PKNDC15PWFGR0mVIRtWLAdcfsRJoA==",
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-4.0.2.tgz",
+ "integrity": "sha512-970/okAsdUOmiMOCY8sb17A2I8neS25Ad9uhyK3GHgmRSIFJbDcNEFE8dqqUhNe9OHiCC9k3DMrSmtd/0ymP1A==",
"dev": true,
"requires": {
- "async": "2.6.2",
- "babel-runtime": "6.26.0",
+ "clone-deep": "4.0.1",
"loader-utils": "1.2.3",
- "lodash": "4.17.11",
- "source-map": "0.5.7",
- "webpack-dev-middleware": "2.0.6"
+ "neo-async": "2.6.1",
+ "schema-utils": "1.0.0",
+ "source-map": "0.7.3",
+ "webpack-dev-middleware": "3.7.0"
},
"dependencies": {
- "ansi-styles": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "dev": true,
- "requires": {
- "color-convert": "1.9.2"
- }
- },
- "async": {
- "version": "2.6.2",
- "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
- "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
- "dev": true,
- "requires": {
- "lodash": "4.17.11"
- },
- "dependencies": {
- "lodash": {
- "version": "4.17.11",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
- "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
- "dev": true
- }
- }
- },
- "chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "clone-deep": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+ "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
"dev": true,
"requires": {
- "ansi-styles": "3.2.1",
- "escape-string-regexp": "1.0.5",
- "supports-color": "5.5.0"
+ "is-plain-object": "2.0.4",
+ "kind-of": "6.0.2",
+ "shallow-clone": "3.0.1"
}
},
- "has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "kind-of": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
"dev": true
},
"mime": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.2.tgz",
- "integrity": "sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==",
+ "version": "2.4.4",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
+ "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
"dev": true
},
- "source-map": {
- "version": "0.5.7",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
- "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+ "neo-async": {
+ "version": "2.6.1",
+ "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
+ "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
"dev": true
},
- "supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "range-parser": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+ "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+ "dev": true
+ },
+ "shallow-clone": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+ "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
"dev": true,
"requires": {
- "has-flag": "3.0.0"
+ "kind-of": "6.0.2"
}
},
+ "source-map": {
+ "version": "0.7.3",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+ "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+ "dev": true
+ },
"webpack-dev-middleware": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-2.0.6.tgz",
- "integrity": "sha512-tj5LLD9r4tDuRIDa5Mu9lnY2qBBehAITv6A9irqXhw/HQquZgTx3BCd57zYbU2gMDnncA49ufK2qVQSbaKJwOw==",
+ "version": "3.7.0",
+ "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz",
+ "integrity": "sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==",
"dev": true,
"requires": {
- "loud-rejection": "1.6.0",
"memory-fs": "0.4.1",
- "mime": "2.4.2",
- "path-is-absolute": "1.0.1",
- "range-parser": "1.2.0",
- "url-join": "2.0.5",
- "webpack-log": "1.2.0"
- }
- },
- "webpack-log": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-1.2.0.tgz",
- "integrity": "sha512-U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==",
- "dev": true,
- "requires": {
- "chalk": "2.4.2",
- "log-symbols": "2.2.0",
- "loglevelnext": "1.0.5",
- "uuid": "3.2.1"
+ "mime": "2.4.4",
+ "range-parser": "1.2.1",
+ "webpack-log": "2.0.0"
}
}
}
@@ -9663,16 +9593,6 @@
"integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=",
"dev": true
},
- "loglevelnext": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/loglevelnext/-/loglevelnext-1.0.5.tgz",
- "integrity": "sha512-V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A==",
- "dev": true,
- "requires": {
- "es6-symbol": "3.1.1",
- "object.assign": "4.1.0"
- }
- },
"longest-streak": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.2.tgz",
@@ -10233,12 +10153,6 @@
"integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==",
"dev": true
},
- "next-tick": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
- "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
- "dev": true
- },
"nice-try": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@@ -15208,12 +15122,6 @@
}
}
},
- "url-join": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/url-join/-/url-join-2.0.5.tgz",
- "integrity": "sha1-WvIvGMBSoACkjXuCxenC4v7tpyg=",
- "dev": true
- },
"url-loader": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/url-loader/-/url-loader-1.1.2.tgz",
diff --git a/nifi-registry-core/nifi-registry-web-ui/src/main/package.json b/nifi-registry-core/nifi-registry-web-ui/src/main/package.json
index b342b62..2d26082 100644
--- a/nifi-registry-core/nifi-registry-web-ui/src/main/package.json
+++ b/nifi-registry-core/nifi-registry-web-ui/src/main/package.json
@@ -109,7 +109,7 @@
"karma-jasmine": "2.0.1",
"karma-jasmine-html-reporter": "1.4.0",
"karma-spec-reporter": "0.0.32",
- "karma-webpack": "3.0.5",
+ "karma-webpack": "4.0.2",
"license-webpack-plugin": "2.1.1",
"lint-staged": "8.1.7",
"mini-css-extract-plugin": "0.6.0",
diff --git a/nifi-registry-core/nifi-registry-web-ui/src/main/webpack.common.js b/nifi-registry-core/nifi-registry-web-ui/src/main/webpack.common.js
index 9e18333..4fc698a 100644
--- a/nifi-registry-core/nifi-registry-web-ui/src/main/webpack.common.js
+++ b/nifi-registry-core/nifi-registry-web-ui/src/main/webpack.common.js
@@ -70,6 +70,8 @@ module.exports = {
console: true
},
+ stats: 'errors-only',
+
module: {
rules: [
loaders.ts,