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 2021/02/03 14:53:13 UTC
[myfaces-tobago] branch master updated: refactor: 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
The following commit(s) were added to refs/heads/master by this push:
new 8eada3d refactor: Theme Building
8eada3d is described below
commit 8eada3de29b7a066f4763aef8dddae2c9848f4ee
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Fri Jan 29 22:26:09 2021 +0100
refactor: Theme Building
* update dependencies
* use maintained node-resolve plugin
** adjust nodeResolve() call
* adjust tobago-date imports
Issue: TOBAGO-1932
---
.../tobago-theme-standard/npm/package-lock.json | 68 +++++++++-------------
.../tobago-theme-standard/npm/package.json | 6 +-
.../tobago-theme-standard/npm/rollup.config.js | 9 +--
.../tobago-theme-standard/npm/ts/tobago-date.ts | 3 +-
4 files changed, 36 insertions(+), 50 deletions(-)
diff --git a/tobago-theme/tobago-theme-standard/npm/package-lock.json b/tobago-theme/tobago-theme-standard/npm/package-lock.json
index 8510725..fe2350d 100644
--- a/tobago-theme/tobago-theme-standard/npm/package-lock.json
+++ b/tobago-theme/tobago-theme-standard/npm/package-lock.json
@@ -704,6 +704,31 @@
"integrity": "sha512-cPqjjzuFWNK3BSKLm0abspP0sp/IGOli4p5I5fKFAzdS8fvjdOwDCfZqAaIiXd9lPkOWi3SUUfZof3hEb7J/uw==",
"dev": true
},
+ "@rollup/plugin-node-resolve": {
+ "version": "11.1.1",
+ "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.1.1.tgz",
+ "integrity": "sha512-zlBXR4eRS+2m79TsUZWhsd0slrHUYdRx4JF+aVQm+MI0wsKdlpC2vlDVjmlGvtZY1vsefOT9w3JxvmWSBei+Lg==",
+ "dev": true,
+ "requires": {
+ "@rollup/pluginutils": "^3.1.0",
+ "@types/resolve": "1.17.1",
+ "builtin-modules": "^3.1.0",
+ "deepmerge": "^4.2.2",
+ "is-module": "^1.0.0",
+ "resolve": "^1.19.0"
+ },
+ "dependencies": {
+ "@types/resolve": {
+ "version": "1.17.1",
+ "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
+ "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
+ "dev": true,
+ "requires": {
+ "@types/node": "*"
+ }
+ }
+ }
+ },
"@rollup/plugin-replace": {
"version": "2.3.4",
"resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.3.4.tgz",
@@ -869,15 +894,6 @@
"integrity": "sha512-6gOkRe7OIioWAXfnO/2lFiv+SJichKVSys1mSsgyrYHSEjk8Ctv4tSR/Odvnu+HWlH2C8j53dahU03XmQdd5fA==",
"dev": true
},
- "@types/resolve": {
- "version": "0.0.8",
- "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz",
- "integrity": "sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==",
- "dev": true,
- "requires": {
- "@types/node": "*"
- }
- },
"@types/stack-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
@@ -2193,12 +2209,6 @@
"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
"dev": true
},
- "estree-walker": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
- "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
- "dev": true
- },
"esutils": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
@@ -5213,9 +5223,9 @@
}
},
"rollup": {
- "version": "2.37.1",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.37.1.tgz",
- "integrity": "sha512-V3ojEeyGeSdrMSuhP3diBb06P+qV4gKQeanbDv+Qh/BZbhdZ7kHV0xAt8Yjk4GFshq/WjO7R4c7DFM20AwTFVQ==",
+ "version": "2.38.1",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.38.1.tgz",
+ "integrity": "sha512-q07T6vU/V1kqM8rGRRyCgEvIQcIAXoKIE5CpkYAlHhfiWM1Iuh4dIPWpIbqFngCK6lwAB2aYHiUVhIbSWHQWhw==",
"dev": true,
"requires": {
"fsevents": "~2.1.2"
@@ -5230,28 +5240,6 @@
}
}
},
- "rollup-plugin-node-resolve": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz",
- "integrity": "sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==",
- "dev": true,
- "requires": {
- "@types/resolve": "0.0.8",
- "builtin-modules": "^3.1.0",
- "is-module": "^1.0.0",
- "resolve": "^1.11.1",
- "rollup-pluginutils": "^2.8.1"
- }
- },
- "rollup-pluginutils": {
- "version": "2.8.2",
- "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
- "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==",
- "dev": true,
- "requires": {
- "estree-walker": "^0.6.1"
- }
- },
"rsvp": {
"version": "4.8.5",
"resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
diff --git a/tobago-theme/tobago-theme-standard/npm/package.json b/tobago-theme/tobago-theme-standard/npm/package.json
index 074952d..8106c1c 100644
--- a/tobago-theme/tobago-theme-standard/npm/package.json
+++ b/tobago-theme/tobago-theme-standard/npm/package.json
@@ -54,7 +54,7 @@
"dependencies": {
"@trevoreyre/autocomplete": "^2.2.0",
"@trevoreyre/autocomplete-js": "^2.2.0",
- "vanillajs-datepicker": "^1.0.3"
+ "vanillajs-datepicker": "^1.1.2"
},
"devDependencies": {
"tobago-core": "file:../../../tobago-core/npm",
@@ -71,8 +71,8 @@
"jest": "^26.6.3",
"npm-run-all": "^4.1.5",
"postcss-cli": "^7.1.2",
- "rollup": "^2.37.1",
- "rollup-plugin-node-resolve": "^5.2.0",
+ "rollup": "^2.38.1",
+ "@rollup/plugin-node-resolve": "^11.1.1",
"@rollup/plugin-replace": "^2.3.4",
"sass": "^1.29.0",
"ts-jest": "^26.4.4",
diff --git a/tobago-theme/tobago-theme-standard/npm/rollup.config.js b/tobago-theme/tobago-theme-standard/npm/rollup.config.js
index 649e44e..030b88d 100644
--- a/tobago-theme/tobago-theme-standard/npm/rollup.config.js
+++ b/tobago-theme/tobago-theme-standard/npm/rollup.config.js
@@ -15,11 +15,8 @@
* limitations under the License.
*/
-import resolve from "rollup-plugin-node-resolve"
-// fixme: "@rollup/plugin-node-resolve" is the new version of "rollup-plugin-node-resolve", but doesn't work with
-// the vaillajs-datepicker
-// import resolve from "@rollup/plugin-node-resolve"
import replace from '@rollup/plugin-replace';
+import {nodeResolve} from "@rollup/plugin-node-resolve";
export default {
input: 'dist/js/tobago-all.js',
@@ -30,9 +27,9 @@ export default {
name: 'tobago'
},
plugins: [
- resolve(),
+ nodeResolve(),
replace({
// XXX workaround for popper2 included by bootstrap, otherwise be get an error: process is not defined at runtime
'process.env.NODE_ENV': JSON.stringify('production')
- }), ]
+ }),]
};
diff --git a/tobago-theme/tobago-theme-standard/npm/ts/tobago-date.ts b/tobago-theme/tobago-theme-standard/npm/ts/tobago-date.ts
index cbff64d..62a7b6d 100644
--- a/tobago-theme/tobago-theme-standard/npm/ts/tobago-date.ts
+++ b/tobago-theme/tobago-theme-standard/npm/ts/tobago-date.ts
@@ -15,7 +15,8 @@
* limitations under the License.
*/
-import Datepicker from "vanillajs-datepicker/js/Datepicker.js";
+// @ts-ignore
+import {Datepicker} from "vanillajs-datepicker";
import {DateUtils} from "./tobago-date-utils";
import {Page} from "./tobago-page";