This is an automated email from the ASF dual-hosted git repository.
benweidig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to refs/heads/master by this push:
new 76cf30aa5 TAP5-2836: update require.js/underscore
76cf30aa5 is described below
commit 76cf30aa5a5ca762c9d6dce97ab20d50451e3b39
Author: Ben Weidig <[email protected]>
AuthorDate: Sun Jul 19 09:14:13 2026 +0200
TAP5-2836: update require.js/underscore
---
.../META-INF/assets/es-modules/underscore.js | 6 +++---
.../resources/META-INF/assets/tapestry5/require.js | 25 ++++++++++++----------
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git
a/tapestry-core/src/main/resources/META-INF/assets/es-modules/underscore.js
b/tapestry-core/src/main/resources/META-INF/assets/es-modules/underscore.js
index dd5899219..d0e6c4ee7 100644
--- a/tapestry-core/src/main/resources/META-INF/assets/es-modules/underscore.js
+++ b/tapestry-core/src/main/resources/META-INF/assets/es-modules/underscore.js
@@ -1,5 +1,5 @@
-// Underscore.js 1.13.7
+// Underscore.js 1.13.8
// https://underscorejs.org
-// (c) 2009-2024 Jeremy Ashkenas, Julian Gonggrijp, and DocumentCloud and
Investigative Reporters & Editors
+// (c) 2009-2026 Jeremy Ashkenas, Julian Gonggrijp, and DocumentCloud and
Investigative Reporters & Editors
// Underscore may be freely distributed under the MIT license.
-var VERSION="1.13.7",root="object"==typeof
self&&self.self===self&&self||"object"==typeof
global&&global.global===global&&global||Function("return
this")()||{},ArrayProto=Array.prototype,ObjProto=Object.prototype,SymbolProto="undefined"!=typeof
Symbol?Symbol.prototype:null,push=ArrayProto.push,slice=ArrayProto.slice,toString=ObjProto.toString,hasOwnProperty=ObjProto.hasOwnProperty,supportsArrayBuffer="undefined"!=typeof
ArrayBuffer,supportsDataView="undefined"!=typeof DataView,nativeIsAr [...]
\ No newline at end of file
+var VERSION="1.13.8",root="object"==typeof
self&&self.self===self&&self||"object"==typeof
global&&global.global===global&&global||Function("return
this")()||{},ArrayProto=Array.prototype,ObjProto=Object.prototype,SymbolProto="undefined"!=typeof
Symbol?Symbol.prototype:null,push=ArrayProto.push,slice=ArrayProto.slice,toString=ObjProto.toString,hasOwnProperty=ObjProto.hasOwnProperty,supportsArrayBuffer="undefined"!=typeof
ArrayBuffer,supportsDataView="undefined"!=typeof DataView,nativeIsAr [...]
\ No newline at end of file
diff --git
a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/require.js
b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/require.js
index 23ddb4ee6..5c8b5fc29 100644
--- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/require.js
+++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/require.js
@@ -1,6 +1,6 @@
/** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS 2.2.0 Copyright jQuery Foundation and other contributors.
- * Released under MIT license, http://github.com/requirejs/requirejs/LICENSE
+ * @license RequireJS 2.3.8 Copyright jQuery Foundation and other contributors.
+ * Released under MIT license,
https://github.com/requirejs/requirejs/blob/master/LICENSE
*/
//Not using strict: uneven strict support in browsers, #392, and causes
//problems with requirejs.exec()/transpiler plugins that may not be strict.
@@ -8,11 +8,11 @@
/*global window, navigator, document, importScripts, setTimeout, opera */
var requirejs, require, define;
-(function (global) {
+(function (global, setTimeout) {
var req, s, head, baseElement, dataMain, src,
interactiveScript, currentlyAddingScript, mainScript, subPath,
- version = '2.2.0',
- commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
+ version = '2.3.8',
+ commentRegExp = /\/\*[\s\S]*?\*\/|([^:"'=]|^)\/\/.*$/mg,
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
jsSuffixRegExp = /\.js$/,
currDirRegExp = /^\.\//,
@@ -36,7 +36,7 @@ var requirejs, require, define;
useInteractive = false;
//Could match something like ')//comment', do not lose the prefix to
comment.
- function commentReplace(match, multi, multiText, singlePrefix) {
+ function commentReplace(match, singlePrefix) {
return singlePrefix || '';
}
@@ -94,7 +94,7 @@ var requirejs, require, define;
function eachProp(obj, func) {
var prop;
for (prop in obj) {
- if (hasProp(obj, prop)) {
+ if (hasProp(obj, prop) && prop !== '__proto__' && prop !==
'constructor') {
if (func(obj[prop], prop)) {
break;
}
@@ -165,7 +165,7 @@ var requirejs, require, define;
* @returns {Error}
*/
function makeError(id, msg, err, requireModules) {
- var e = new Error(msg + '\nhttp://requirejs.org/docs/errors.html#' +
id);
+ var e = new Error(msg + '\nhttps://requirejs.org/docs/errors.html#' +
id);
e.requireType = id;
e.requireModules = requireModules;
if (err) {
@@ -440,7 +440,9 @@ var requirejs, require, define;
//Account for relative paths if there is a base name.
if (name) {
if (prefix) {
- if (pluginModule && pluginModule.normalize) {
+ if (isNormalized) {
+ normalizedName = name;
+ } else if (pluginModule && pluginModule.normalize) {
//Plugin is loaded, use its normalize method.
normalizedName = pluginModule.normalize(name, function
(name) {
return normalize(name, parentName, applyMap);
@@ -972,7 +974,8 @@ var requirejs, require, define;
//prefix and name should already be normalized, no need
//for applying map config again either.
normalizedMap = makeModuleMap(map.prefix + '!' + name,
- this.map.parentMap);
+ this.map.parentMap,
+ true);
on(normalizedMap,
'defined', bind(this, function (value) {
this.map.normalizedMap = normalizedMap;
@@ -2139,4 +2142,4 @@ var requirejs, require, define;
//Set up with config info.
req(cfg);
-}(this));
+}(this, (typeof setTimeout === 'undefined' ? undefined : setTimeout)));
\ No newline at end of file
