Skip to content

Commit a37f9f8

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

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

lib/web/requirejs/require.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ var requirejs, require, define;
6161
{
6262
if (ary) {
6363
var i;
64+
6465
for (i = 0; i < ary.length; i += 1) {
6566
if (ary[i] && func(ary[i], i, ary)) {
6667
break;
@@ -838,7 +839,7 @@ var requirejs, require, define;
838839
this.fetched = true;
839840

840841
context.startTime = (new Date()).getTime();
841-
842+
// eslint-disable-next-line vars-on-top
842843
var map = this.map;
843844

844845
//If the manager is for a plugin managed resource,
@@ -939,18 +940,19 @@ var requirejs, require, define;
939940
}
940941

941942
this.exports = exports;
942-
943+
/* eslint-disable max-depth */
943944
if (this.map.isDefine && !this.ignore) {
944945
defined[id] = exports;
945946

946947
if (req.onResourceLoad) {
947-
var resLoadMaps = [];
948+
var resLoadMaps = []; // eslint-disable-line one-var
948949
each(this.depMaps, function (depMap) {
949950
resLoadMaps.push(depMap.normalizedMap || depMap);
950951
});
951952
req.onResourceLoad(context, this.map, resLoadMaps);
952953
}
953954
}
955+
/* eslint-enable max-depth */
954956

955957
//Clean up
956958
cleanRegistry(id);
@@ -1288,6 +1290,7 @@ var requirejs, require, define;
12881290
//Make sure any remaining defQueue items get properly processed.
12891291
while (defQueue.length) {
12901292
args = defQueue.shift();
1293+
/* eslint-disable no-else-return */
12911294
if (args[0] === null) {
12921295
return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' +
12931296
args[args.length - 1]));
@@ -1296,6 +1299,7 @@ var requirejs, require, define;
12961299
//define() function.
12971300
callGetModule(args);
12981301
}
1302+
/* eslint-enable no-else-return */
12991303
}
13001304
context.defQueueMap = {};
13011305
}
@@ -1317,8 +1321,8 @@ var requirejs, require, define;
13171321
* Set a configuration for the context.
13181322
* @param {Object} cfg config object to integrate.
13191323
*/
1324+
/* eslint-disable no-shadow */
13201325
configure: function (cfg) {
1321-
// eslint-disable-line no-shadow
13221326
//Make sure the baseUrl ends in a slash.
13231327
if (cfg.baseUrl) {
13241328
if (cfg.baseUrl.charAt(cfg.baseUrl.length - 1) !== '/') {
@@ -1427,7 +1431,7 @@ var requirejs, require, define;
14271431
context.require(cfg.deps || [], cfg.callback);
14281432
}
14291433
},
1430-
1434+
/* eslint-enable no-shadow */
14311435
makeShimExports: function (value) {
14321436
function fn()
14331437
{
@@ -1921,8 +1925,8 @@ var requirejs, require, define;
19211925
/**
19221926
* Creates the node for the load command. Only used in browser envs.
19231927
*/
1928+
/* eslint-disable no-unused-vars */
19241929
req.createNode = function (config, moduleName, url) {
1925-
// eslint-disable-line no-unused-vars
19261930
var node = config.xhtml ?
19271931
document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') :
19281932
document.createElement('script');
@@ -1931,6 +1935,7 @@ var requirejs, require, define;
19311935
node.async = true;
19321936
return node;
19331937
};
1938+
/* eslint-enable no-unused-vars */
19341939

19351940
/**
19361941
* Does the request to load a module for the browser case.

0 commit comments

Comments
 (0)