Skip to content

Commit 9364a98

Browse files
committed
AC-12901: Require.js upgrade to the latest version 2.3.7 (security vulnerability CVE-2024-38999)
1 parent 022bdec commit 9364a98

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

lib/web/requirejs/require.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -584,10 +584,9 @@ var requirejs, require, define;
584584
mod.usingExports = true;
585585
if (mod.map.isDefine) {
586586
if (mod.exports) {
587-
return (defined[mod.map.id] = mod.exports);
588-
} else {
589-
return (mod.exports = defined[mod.map.id] = {});
587+
return (defined[mod.map.id] = mod.exports); // eslint-disable-line no-extra-parens
590588
}
589+
return (mod.exports = defined[mod.map.id] = {}); // eslint-disable-line no-return-assign
591590
}
592591
},
593592
'module': function (mod) {
@@ -989,18 +988,19 @@ var requirejs, require, define;
989988
}));
990989

991990
normalizedMod = getOwn(registry, normalizedMap.id);
991+
/* eslint-disable max-depth */
992992
if (normalizedMod) {
993993
//Mark this as a dependency for this plugin, so it
994994
//can be traced for cycles.
995995
this.depMaps.push(normalizedMap);
996-
997996
if (this.events.error) {
998997
normalizedMod.on('error', bind(this, function (err) {
999998
this.emit('error', err);
1000999
}));
10011000
}
10021001
normalizedMod.enable();
10031002
}
1003+
/* eslint-enable max-depth */
10041004

10051005
return;
10061006
}
@@ -1282,7 +1282,7 @@ var requirejs, require, define;
12821282
* Set a configuration for the context.
12831283
* @param {Object} cfg config object to integrate.
12841284
*/
1285-
configure: function (cfg) {
1285+
configure: function (cfg) { // eslint-disable-line no-shadow
12861286
//Make sure the baseUrl ends in a slash.
12871287
if (cfg.baseUrl) {
12881288
if (cfg.baseUrl.charAt(cfg.baseUrl.length - 1) !== '/') {
@@ -1293,14 +1293,15 @@ var requirejs, require, define;
12931293
// Convert old style urlArgs string to a function.
12941294
if (typeof cfg.urlArgs === 'string') {
12951295
var urlArgs = cfg.urlArgs;
1296+
12961297
cfg.urlArgs = function(id, url) {
12971298
return (url.indexOf('?') === -1 ? '?' : '&') + urlArgs;
12981299
};
12991300
}
13001301

13011302
//Save off the paths since they require special processing,
13021303
//they are additive.
1303-
var shim = config.shim,
1304+
var shim = config.shim, // eslint-disable-line one-var
13041305
objs = {
13051306
paths: true,
13061307
bundles: true,
@@ -1512,7 +1513,7 @@ var requirejs, require, define;
15121513
//fix for #408
15131514
takeGlobalQueue();
15141515

1515-
var map = makeModuleMap(id, relMap, true),
1516+
var map = makeModuleMap(id, relMap, true), // eslint-disable vars-on-top
15161517
mod = getOwn(registry, id);
15171518

15181519
mod.undefed = true;
@@ -1731,7 +1732,7 @@ var requirejs, require, define;
17311732
var parents = [];
17321733
eachProp (registry, function(value, key) {
17331734
if (key.indexOf('_@r') !== 0) {
1734-
each(value.depMaps, function(depMap) {
1735+
each (value.depMaps, function(depMap) {
17351736
if (depMap.id === data.id) {
17361737
parents.push(key);
17371738
return true;

0 commit comments

Comments
 (0)