NIFIREG-302 - Enable building with uncompressed javascript
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 @@
plugins: [
// Fix style only entry generating an extra js file
- new FixStyleOnlyEntriesPlugin()
+ new FixStyleOnlyEntriesPlugin({ silent: true })
]
};
