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 2022/09/16 07:13:41 UTC
[myfaces-tobago] branch tobago-5.x updated: demo(test): npm update and rebuild (#3198)
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch tobago-5.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/tobago-5.x by this push:
new 4d3acd1160 demo(test): npm update and rebuild (#3198)
4d3acd1160 is described below
commit 4d3acd11607212212156d3f352ed51d0c57865a5
Author: Udo Schnurpfeil <gi...@schnurpfeil.de>
AuthorDate: Fri Sep 16 09:13:35 2022 +0200
demo(test): npm update and rebuild (#3198)
---
.../tobago-example-demo/package-lock.json | 58 ++++++-------
tobago-example/tobago-example-demo/package.json | 6 +-
.../src/main/webapp/js/jasmine.js | 95 +++++++++++++---------
3 files changed, 89 insertions(+), 70 deletions(-)
diff --git a/tobago-example/tobago-example-demo/package-lock.json b/tobago-example/tobago-example-demo/package-lock.json
index 0aef959b88..ccb82394b3 100644
--- a/tobago-example/tobago-example-demo/package-lock.json
+++ b/tobago-example/tobago-example-demo/package-lock.json
@@ -14,10 +14,10 @@
"prismjs": "^1.29.0"
},
"devDependencies": {
- "@rollup/plugin-node-resolve": "^14.0.0",
+ "@rollup/plugin-node-resolve": "^14.1.0",
"@rollup/plugin-replace": "^4.0.0",
"@types/prismjs": "^1.26.0",
- "autoprefixer": "^10.4.8",
+ "autoprefixer": "^10.4.11",
"clean-css-cli": "^5.6.1",
"lodash": "^4.17.21",
"ncp": "^2.0.0",
@@ -26,7 +26,7 @@
"rollup": "^2.79.0",
"sass": "^1.54.9",
"tslint": "^6.1.3",
- "typescript": "^4.8.2",
+ "typescript": "^4.8.3",
"y18n": "^5.0.8"
}
},
@@ -101,9 +101,9 @@
}
},
"node_modules/@rollup/plugin-node-resolve": {
- "version": "14.0.0",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-14.0.0.tgz",
- "integrity": "sha512-XkWfpgp/zGiFu8LS+JAiQeZN4oYYA4/ViFJiZhwQegTg5ZbzKTvM9YyKXVBNnmZ8Et76WnlVgwRUu1rhKF4ayw==",
+ "version": "14.1.0",
+ "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-14.1.0.tgz",
+ "integrity": "sha512-5G2niJroNCz/1zqwXtk0t9+twOSDlG00k1Wfd7bkbbXmwg8H8dvgHdIWAun53Ps/rckfvOC7scDBjuGFg5OaWw==",
"dev": true,
"dependencies": {
"@rollup/pluginutils": "^3.1.0",
@@ -221,9 +221,9 @@
}
},
"node_modules/autoprefixer": {
- "version": "10.4.8",
- "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.8.tgz",
- "integrity": "sha512-75Jr6Q/XpTqEf6D2ltS5uMewJIx5irCU1oBYJrWjFenq/m12WRRrz6g15L1EIoYvPLXTbEry7rDOwrcYNj77xw==",
+ "version": "10.4.11",
+ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.11.tgz",
+ "integrity": "sha512-5lHp6DgRodxlBLSkzHOTcufWFflH1ewfy2hvFQyjrblBFlP/0Yh4O/Wrg4ow8WRlN3AAUFFLAQwX8hTptzqVHg==",
"dev": true,
"funding": [
{
@@ -237,7 +237,7 @@
],
"dependencies": {
"browserslist": "^4.21.3",
- "caniuse-lite": "^1.0.30001373",
+ "caniuse-lite": "^1.0.30001399",
"fraction.js": "^4.2.0",
"normalize-range": "^0.1.2",
"picocolors": "^1.0.0",
@@ -344,9 +344,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001373",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001373.tgz",
- "integrity": "sha512-pJYArGHrPp3TUqQzFYRmP/lwJlj8RCbVe3Gd3eJQkAV8SAC6b19XS9BjMvRdvaS8RMkaTN8ZhoHP6S1y8zzwEQ==",
+ "version": "1.0.30001402",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001402.tgz",
+ "integrity": "sha512-Mx4MlhXO5NwuvXGgVb+hg65HZ+bhUYsz8QtDGDo2QmaJS2GBX47Xfi2koL86lc8K+l+htXeTEB/Aeqvezoo6Ew==",
"dev": true,
"funding": [
{
@@ -2246,9 +2246,9 @@
}
},
"node_modules/typescript": {
- "version": "4.8.2",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz",
- "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==",
+ "version": "4.8.3",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.3.tgz",
+ "integrity": "sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==",
"dev": true,
"bin": {
"tsc": "bin/tsc",
@@ -2502,9 +2502,9 @@
}
},
"@rollup/plugin-node-resolve": {
- "version": "14.0.0",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-14.0.0.tgz",
- "integrity": "sha512-XkWfpgp/zGiFu8LS+JAiQeZN4oYYA4/ViFJiZhwQegTg5ZbzKTvM9YyKXVBNnmZ8Et76WnlVgwRUu1rhKF4ayw==",
+ "version": "14.1.0",
+ "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-14.1.0.tgz",
+ "integrity": "sha512-5G2niJroNCz/1zqwXtk0t9+twOSDlG00k1Wfd7bkbbXmwg8H8dvgHdIWAun53Ps/rckfvOC7scDBjuGFg5OaWw==",
"dev": true,
"requires": {
"@rollup/pluginutils": "^3.1.0",
@@ -2598,13 +2598,13 @@
}
},
"autoprefixer": {
- "version": "10.4.8",
- "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.8.tgz",
- "integrity": "sha512-75Jr6Q/XpTqEf6D2ltS5uMewJIx5irCU1oBYJrWjFenq/m12WRRrz6g15L1EIoYvPLXTbEry7rDOwrcYNj77xw==",
+ "version": "10.4.11",
+ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.11.tgz",
+ "integrity": "sha512-5lHp6DgRodxlBLSkzHOTcufWFflH1ewfy2hvFQyjrblBFlP/0Yh4O/Wrg4ow8WRlN3AAUFFLAQwX8hTptzqVHg==",
"dev": true,
"requires": {
"browserslist": "^4.21.3",
- "caniuse-lite": "^1.0.30001373",
+ "caniuse-lite": "^1.0.30001399",
"fraction.js": "^4.2.0",
"normalize-range": "^0.1.2",
"picocolors": "^1.0.0",
@@ -2671,9 +2671,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001373",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001373.tgz",
- "integrity": "sha512-pJYArGHrPp3TUqQzFYRmP/lwJlj8RCbVe3Gd3eJQkAV8SAC6b19XS9BjMvRdvaS8RMkaTN8ZhoHP6S1y8zzwEQ==",
+ "version": "1.0.30001402",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001402.tgz",
+ "integrity": "sha512-Mx4MlhXO5NwuvXGgVb+hg65HZ+bhUYsz8QtDGDo2QmaJS2GBX47Xfi2koL86lc8K+l+htXeTEB/Aeqvezoo6Ew==",
"dev": true
},
"chalk": {
@@ -4026,9 +4026,9 @@
}
},
"typescript": {
- "version": "4.8.2",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz",
- "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==",
+ "version": "4.8.3",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.3.tgz",
+ "integrity": "sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==",
"dev": true
},
"unbox-primitive": {
diff --git a/tobago-example/tobago-example-demo/package.json b/tobago-example/tobago-example-demo/package.json
index a2ea52b223..e6f006903f 100644
--- a/tobago-example/tobago-example-demo/package.json
+++ b/tobago-example/tobago-example-demo/package.json
@@ -40,10 +40,10 @@
"prismjs": "^1.29.0"
},
"devDependencies": {
- "@rollup/plugin-node-resolve": "^14.0.0",
+ "@rollup/plugin-node-resolve": "^14.1.0",
"@rollup/plugin-replace": "^4.0.0",
"@types/prismjs": "^1.26.0",
- "autoprefixer": "^10.4.8",
+ "autoprefixer": "^10.4.11",
"clean-css-cli": "^5.6.1",
"lodash": "^4.17.21",
"ncp": "^2.0.0",
@@ -52,7 +52,7 @@
"rollup": "^2.79.0",
"sass": "^1.54.9",
"tslint": "^6.1.3",
- "typescript": "^4.8.2",
+ "typescript": "^4.8.3",
"y18n": "^5.0.8"
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/js/jasmine.js b/tobago-example/tobago-example-demo/src/main/webapp/js/jasmine.js
index 6a429e53c3..bcf2d4ca92 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/js/jasmine.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/js/jasmine.js
@@ -2789,8 +2789,32 @@ getJasmineRequireObj().CallTracker = function(j$) {
getJasmineRequireObj().clearStack = function(j$) {
const maxInlineCallCount = 10;
- function messageChannelImpl(global, setTimeout) {
- const channel = new global.MessageChannel();
+ function browserQueueMicrotaskImpl(global) {
+ const { setTimeout, queueMicrotask } = global;
+ let currentCallCount = 0;
+ return function clearStack(fn) {
+ currentCallCount++;
+
+ if (currentCallCount < maxInlineCallCount) {
+ queueMicrotask(fn);
+ } else {
+ currentCallCount = 0;
+ setTimeout(fn);
+ }
+ };
+ }
+
+ function nodeQueueMicrotaskImpl(global) {
+ const { queueMicrotask } = global;
+
+ return function(fn) {
+ queueMicrotask(fn);
+ };
+ }
+
+ function messageChannelImpl(global) {
+ const { MessageChannel, setTimeout } = global;
+ const channel = new MessageChannel();
let head = {};
let tail = head;
@@ -2801,7 +2825,7 @@ getJasmineRequireObj().clearStack = function(j$) {
delete head.task;
if (taskRunning) {
- global.setTimeout(task, 0);
+ setTimeout(task, 0);
} else {
try {
taskRunning = true;
@@ -2827,29 +2851,31 @@ getJasmineRequireObj().clearStack = function(j$) {
}
function getClearStack(global) {
- let currentCallCount = 0;
- const realSetTimeout = global.setTimeout;
- const setTimeoutImpl = function clearStack(fn) {
- Function.prototype.apply.apply(realSetTimeout, [global, [fn, 0]]);
- };
-
- if (j$.isFunction_(global.setImmediate)) {
- const realSetImmediate = global.setImmediate;
- return function(fn) {
- currentCallCount++;
-
- if (currentCallCount < maxInlineCallCount) {
- realSetImmediate(fn);
- } else {
- currentCallCount = 0;
-
- setTimeoutImpl(fn);
- }
- };
- } else if (!j$.util.isUndefined(global.MessageChannel)) {
- return messageChannelImpl(global, setTimeoutImpl);
+ const NODE_JS =
+ global.process &&
+ global.process.versions &&
+ typeof global.process.versions.node === 'string';
+
+ const SAFARI =
+ global.navigator &&
+ /^((?!chrome|android).)*safari/i.test(global.navigator.userAgent);
+
+ if (NODE_JS) {
+ // Unlike browsers, Node doesn't require us to do a periodic setTimeout
+ // so we avoid the overhead.
+ return nodeQueueMicrotaskImpl(global);
+ } else if (
+ SAFARI ||
+ j$.util.isUndefined(global.MessageChannel) /* tests */
+ ) {
+ // queueMicrotask is dramatically faster than MessageChannel in Safari.
+ // Some of our own integration tests provide a mock queueMicrotask in all
+ // environments because it's simpler to mock than MessageChannel.
+ return browserQueueMicrotaskImpl(global);
} else {
- return setTimeoutImpl;
+ // MessageChannel is faster than queueMicrotask in supported browsers
+ // other than Safari.
+ return messageChannelImpl(global);
}
}
@@ -4055,21 +4081,14 @@ getJasmineRequireObj().GlobalErrors = function(j$) {
}
};
- if (global.addEventListener) {
- global.addEventListener(
- 'unhandledrejection',
- browserRejectionHandler
- );
- }
+ global.addEventListener('unhandledrejection', browserRejectionHandler);
this.uninstall = function uninstall() {
global.onerror = originalHandler;
- if (global.removeEventListener) {
- global.removeEventListener(
- 'unhandledrejection',
- browserRejectionHandler
- );
- }
+ global.removeEventListener(
+ 'unhandledrejection',
+ browserRejectionHandler
+ );
};
}
};
@@ -10429,5 +10448,5 @@ getJasmineRequireObj().UserContext = function(j$) {
};
getJasmineRequireObj().version = function() {
- return '4.3.0';
+ return '4.4.0';
};