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/02 14:28:59 UTC

[myfaces-tobago] branch master updated: renaming tobago-bundle.js to just bundle.js

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


The following commit(s) were added to refs/heads/master by this push:
     new 0d0c17d  renaming tobago-bundle.js to just bundle.js
0d0c17d is described below

commit 0d0c17db9d45801d9936be5a27049d9013df4c7d
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Jul 2 16:28:46 2020 +0200

    renaming tobago-bundle.js to just bundle.js
    
    issue: TOBAGO-1932 Refactor Bootstrap Theme Building
---
 tobago-theme/pom.xml                                                    | 2 ++
 tobago-theme/tobago-theme-standard/src/main/npm/dev-rollup.config.js    | 2 +-
 tobago-theme/tobago-theme-standard/src/main/npm/package.json            | 2 +-
 tobago-theme/tobago-theme-standard/src/main/npm/rollup.config.js        | 2 +-
 .../tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tobago-theme/pom.xml b/tobago-theme/pom.xml
index a80c13a..2b069d8 100644
--- a/tobago-theme/pom.xml
+++ b/tobago-theme/pom.xml
@@ -152,6 +152,8 @@
                     <include>js/tobago*.js.map</include>
                     <include>js/jsf*.js</include>
                     <include>js/jsf*.js.map</include>
+                    <include>js/bundle.js</include>
+                    <include>js/bundle.js.map</include>
                     <include>ts/tobago*.ts</include>
                     <include>ts/test.ts</include>
                   </includes>
diff --git a/tobago-theme/tobago-theme-standard/src/main/npm/dev-rollup.config.js b/tobago-theme/tobago-theme-standard/src/main/npm/dev-rollup.config.js
index ebcf683..1dbfccd 100644
--- a/tobago-theme/tobago-theme-standard/src/main/npm/dev-rollup.config.js
+++ b/tobago-theme/tobago-theme-standard/src/main/npm/dev-rollup.config.js
@@ -20,7 +20,7 @@ import resolve from "rollup-plugin-node-resolve"
 export default {
   input: '../../../target/dist/js/tobago-all.js',
   output: {
-    file: '../../../target/dist/js/tobago-bundle.js',
+    file: '../../../target/dist/js/bundle.js',
     format: 'umd', /* tbd: check if "iife" is better? */
     sourcemap: true,
     name: 'tobago'
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 c4c9307..98d40ab 100644
--- a/tobago-theme/tobago-theme-standard/src/main/npm/package.json
+++ b/tobago-theme/tobago-theme-standard/src/main/npm/package.json
@@ -3,7 +3,7 @@
   "version": "5.0.0-SNAPSHOT",
   "xxx_version": "${project.version}",
   "description": "The 'standard' theme of the Tobago framework",
-  "main": "tobago-bundle.js",
+  "main": "bundle.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/apache/myfaces-tobago.git"
diff --git a/tobago-theme/tobago-theme-standard/src/main/npm/rollup.config.js b/tobago-theme/tobago-theme-standard/src/main/npm/rollup.config.js
index 478be89..edbcb0e 100644
--- a/tobago-theme/tobago-theme-standard/src/main/npm/rollup.config.js
+++ b/tobago-theme/tobago-theme-standard/src/main/npm/rollup.config.js
@@ -20,7 +20,7 @@ import resolve from "rollup-plugin-node-resolve"
 export default {
   input: 'js/tobago-all.js',
   output: {
-    file: 'js/tobago-bundle.js',
+    file: 'js/bundle.js',
     format: 'umd', /* tbd: check if "iife" is better? */
     sourcemap: true,
     name: 'tobago'
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
index 06ebd65..9d05c4c 100644
--- a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
@@ -56,7 +56,7 @@
           <script name="/webjars/popper.js/1.14.3/umd/popper.js"/>
           <script name="/tobago/standard/${project.version}/js/jsf-development.js"/>
           <script name="/tobago/standard/${project.version}/js/tobago-polyfill.js"/>
-          <script type="module" name="/tobago/standard/${project.version}/js/tobago-bundle.js"/>
+          <script type="module" name="/tobago/standard/${project.version}/js/bundle.js"/>
 <!--
           <script name="/tobago/standard/${project.version}/js/ext-bootstrap.js"/>
           <script name="/tobago/standard/${project.version}/js/tobago-listener.js"/>