You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2020/07/15 14:05:57 UTC
[myfaces-tobago] 01/03: TOBAGO-1932: Refactor Bootstrap Theme
Building
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 07675a804149808490ef6b27aa9b78724e7987ce
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Jul 15 11:45:49 2020 +0200
TOBAGO-1932: Refactor Bootstrap Theme Building
---
tobago-theme/pom.xml | 57 ++--------------------
.../src/main/npm/package.json | 1 +
.../src/main/npm/package.json | 1 +
.../src/main/npm/package.json | 1 +
.../src/main/npm/package.json | 1 +
.../src/main/npm/package.json | 2 +-
6 files changed, 10 insertions(+), 53 deletions(-)
diff --git a/tobago-theme/pom.xml b/tobago-theme/pom.xml
index 2b069d8..6c95adc 100644
--- a/tobago-theme/pom.xml
+++ b/tobago-theme/pom.xml
@@ -67,7 +67,7 @@
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
+ <version>3.1.0</version>
<executions>
<execution>
<!-- copy customization to target/bootstrap -->
@@ -194,11 +194,11 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
- <version>1.7.6</version>
+ <version>1.10.0</version>
<!-- optional -->
<configuration>
- <nodeVersion>v12.16.3</nodeVersion> <!-- contains npm version 6.14.4 -->
+ <nodeVersion>v12.18.2</nodeVersion> <!-- contains npm version 6.14.5 -->
<!-- optional: Where to download Node.js binary from. Defaults to http://nodejs.org/dist/ -->
<!--<nodeDownloadRoot>https://nodejs.org/dist/</nodeDownloadRoot>-->
@@ -234,68 +234,21 @@
</goals>
<phase>generate-resources</phase>
<configuration>
- <!--<arguments>install jquery popper.js ajv-keywords eslint-plugin-compat ajv eslint</arguments>-->
<arguments>install</arguments>
</configuration>
</execution>
<execution>
<!-- build "Tobago with Bootstrap" -->
- <id>step #5: npm run css</id>
+ <id>step #5: npm run build</id>
<goals>
<goal>npm</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
- <arguments>run css</arguments>
+ <arguments>run build</arguments>
</configuration>
</execution>
- <execution>
- <id>step #5a: test</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <phase>generate-resources</phase>
- <configuration>
- <arguments>run test</arguments>
- </configuration>
- </execution>
- <execution>
- <id>step #5b: ts-lint + ts-compile</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <phase>generate-resources</phase>
- <configuration>
- <arguments>run ts</arguments>
- </configuration>
- </execution>
-
-<!-- XXX remove it
- <execution>
- <id>step #5c: es6 to es5</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <phase>generate-resources</phase>
- <configuration>
- <arguments>run js-transpile</arguments>
- </configuration>
- </execution>
--->
-
-<!--
- <execution>
- <id>step #5d: minify</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <phase>generate-resources</phase>
- <configuration>
- <arguments>run js-minify</arguments>
- </configuration>
- </execution>
--->
</executions>
</plugin>
diff --git a/tobago-theme/tobago-theme-charlotteville/src/main/npm/package.json b/tobago-theme/tobago-theme-charlotteville/src/main/npm/package.json
index 744366c..3e88a5c 100644
--- a/tobago-theme/tobago-theme-charlotteville/src/main/npm/package.json
+++ b/tobago-theme/tobago-theme-charlotteville/src/main/npm/package.json
@@ -18,6 +18,7 @@
},
"homepage": "https://myfaces.apache.org/tobago/",
"scripts": {
+ "build": "npm-run-all --parallel css test ts",
"css": "npm-run-all --parallel css-compile --sequential css-prefix css-minify",
"css-lint": "echo 'Not implemented yet!'",
"css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/tobago-theme.scss css/tobago.css",
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/npm/package.json b/tobago-theme/tobago-theme-roxborough/src/main/npm/package.json
index 4a1b7b5..f78b639 100644
--- a/tobago-theme/tobago-theme-roxborough/src/main/npm/package.json
+++ b/tobago-theme/tobago-theme-roxborough/src/main/npm/package.json
@@ -18,6 +18,7 @@
},
"homepage": "https://myfaces.apache.org/tobago/",
"scripts": {
+ "build": "npm-run-all --parallel css test ts",
"css": "npm-run-all --parallel css-compile --sequential css-prefix css-minify",
"css-lint": "echo 'Not implemented yet!'",
"css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/tobago-theme.scss css/tobago.css",
diff --git a/tobago-theme/tobago-theme-scarborough/src/main/npm/package.json b/tobago-theme/tobago-theme-scarborough/src/main/npm/package.json
index bed02e6..ba12962 100644
--- a/tobago-theme/tobago-theme-scarborough/src/main/npm/package.json
+++ b/tobago-theme/tobago-theme-scarborough/src/main/npm/package.json
@@ -18,6 +18,7 @@
},
"homepage": "https://myfaces.apache.org/tobago/",
"scripts": {
+ "build": "npm-run-all --parallel css test ts",
"css": "npm-run-all --parallel css-compile --sequential css-prefix css-minify",
"css-lint": "echo 'Not implemented yet!'",
"css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/tobago-theme.scss css/tobago.css",
diff --git a/tobago-theme/tobago-theme-speyside/src/main/npm/package.json b/tobago-theme/tobago-theme-speyside/src/main/npm/package.json
index e38d2c3..f65ea45 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/npm/package.json
+++ b/tobago-theme/tobago-theme-speyside/src/main/npm/package.json
@@ -18,6 +18,7 @@
},
"homepage": "https://myfaces.apache.org/tobago/",
"scripts": {
+ "build": "npm-run-all --parallel css test ts",
"css": "npm-run-all --parallel css-compile --sequential css-prefix css-minify",
"css-lint": "echo 'Not implemented yet!'",
"css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/tobago-theme.scss css/tobago.css",
diff --git a/tobago-theme/tobago-theme-standard/src/main/npm/package.json b/tobago-theme/tobago-theme-standard/src/main/npm/package.json
index 98d40ab..f6f6a10 100644
--- a/tobago-theme/tobago-theme-standard/src/main/npm/package.json
+++ b/tobago-theme/tobago-theme-standard/src/main/npm/package.json
@@ -18,6 +18,7 @@
},
"homepage": "https://myfaces.apache.org/tobago/",
"scripts": {
+ "build": "npm-run-all --parallel css test ts",
"css": "npm-run-all --parallel css-compile --sequential css-prefix css-minify",
"css-lint": "echo 'Not implemented yet!'",
"css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/tobago-theme.scss css/tobago.css",
@@ -26,7 +27,6 @@
"ts": "npm-run-all --parallel ts-lint ts-compile --sequential rollup",
"ts-lint": "tslint --project tsconfig.json --config tslint.json",
"ts-compile": "tsc",
- "js-minify": "uglifyjs --compress typeofs=false,drop_console=true --mangle --source-map includeSources --output js/tobago.min.js js/tobago-polyfill.js js/tobago-listener.js js/tobago-core.js js/tobago-dropdown.js js/tobago-date.js js/tobago-command.js js/tobago-file.js js/tobago-focus.js js/tobago-header-footer.js js/tobago-in.js js/tobago-jsf.js js/tobago-overlay.js js/tobago-panel.js js/tobago-popover.js js/tobago-popup.js js/tobago-reload.js js/tobago-scroll.js js/tobago-select-bo [...]
"rollup": "rollup --config",
"test": "jest",
"dev-css": "npm-run-all --sequential dev-css-compile dev-mkdir dev-css-cp",