-
Notifications
You must be signed in to change notification settings - Fork 5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into MMI-5059-ofa-feature
- Loading branch information
Showing
458 changed files
with
42,585 additions
and
13,431 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6,147 changes: 0 additions & 6,147 deletions
6,147
.yarn/patches/@reduxjs-toolkit-npm-1.6.2-67af09515f.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| diff --git a/dist/index.js b/dist/index.js | ||
| index 6b889a8c93e4c546dd2b1905c968ade143435134..8a63cf3cbc152d84864e1cec07da5c0883a98aef 100644 | ||
| --- a/dist/index.js | ||
| +++ b/dist/index.js | ||
| @@ -1,6 +1,2 @@ | ||
| 'use strict' | ||
| -if (process.env.NODE_ENV === 'production') { | ||
| - module.exports = require('./redux-toolkit.cjs.production.min.js') | ||
| -} else { | ||
| - module.exports = require('./redux-toolkit.cjs.development.js') | ||
| -} | ||
| \ No newline at end of file | ||
| +module.exports = require('./redux-toolkit.cjs.development.js') | ||
| diff --git a/dist/redux-toolkit.cjs.development.js b/dist/redux-toolkit.cjs.development.js | ||
| index bb433432ec76331e12d6b62e200f06530055cb16..9caf4051aa96bd14ee2890ef6c79bf5b0fb685c6 100644 | ||
| --- a/dist/redux-toolkit.cjs.development.js | ||
| +++ b/dist/redux-toolkit.cjs.development.js | ||
| @@ -1,3 +1,13 @@ | ||
| +var __define = (this && this.__define) || function (obj, key, value) { | ||
| + Object.defineProperty(obj, key, { | ||
| + value: value, | ||
| + enumerable: true, | ||
| + configurable: true, | ||
| + writable: true | ||
| + }); | ||
| + return obj[key]; | ||
| +}; | ||
| + | ||
| var __extends = (this && this.__extends) || (function () { | ||
| var extendStatics = function (d, b) { | ||
| extendStatics = Object.setPrototypeOf || | ||
| @@ -9,7 +19,7 @@ var __extends = (this && this.__extends) || (function () { | ||
| if (typeof b !== "function" && b !== null) | ||
| throw new TypeError("Class extends value " + String(b) + " is not a constructor or null"); | ||
| extendStatics(d, b); | ||
| - function __() { this.constructor = d; } | ||
| + function __() { __define(this, constructor, d); } | ||
| d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); | ||
| }; | ||
| })(); | ||
| @@ -316,14 +326,14 @@ var MiddlewareArray = /** @class */ (function (_super) { | ||
| enumerable: false, | ||
| configurable: true | ||
| }); | ||
| - MiddlewareArray.prototype.concat = function () { | ||
| + __define(MiddlewareArray.prototype, 'concat', function () { | ||
| var arr = []; | ||
| for (var _i = 0; _i < arguments.length; _i++) { | ||
| arr[_i] = arguments[_i]; | ||
| } | ||
| return _super.prototype.concat.apply(this, arr); | ||
| - }; | ||
| - MiddlewareArray.prototype.prepend = function () { | ||
| + }); | ||
| + __define(MiddlewareArray.prototype, 'prepend', function () { | ||
| var arr = []; | ||
| for (var _i = 0; _i < arguments.length; _i++) { | ||
| arr[_i] = arguments[_i]; | ||
| @@ -332,7 +342,7 @@ var MiddlewareArray = /** @class */ (function (_super) { | ||
| return new (MiddlewareArray.bind.apply(MiddlewareArray, __spreadArray([void 0], arr[0].concat(this))))(); | ||
| } | ||
| return new (MiddlewareArray.bind.apply(MiddlewareArray, __spreadArray([void 0], arr.concat(this))))(); | ||
| - }; | ||
| + }); | ||
| return MiddlewareArray; | ||
| }(Array)); | ||
| var EnhancerArray = /** @class */ (function (_super) { | ||
| @@ -353,14 +363,14 @@ var EnhancerArray = /** @class */ (function (_super) { | ||
| enumerable: false, | ||
| configurable: true | ||
| }); | ||
| - EnhancerArray.prototype.concat = function () { | ||
| + __define(EnhancerArray.prototype, 'concat', function () { | ||
| var arr = []; | ||
| for (var _i = 0; _i < arguments.length; _i++) { | ||
| arr[_i] = arguments[_i]; | ||
| } | ||
| return _super.prototype.concat.apply(this, arr); | ||
| - }; | ||
| - EnhancerArray.prototype.prepend = function () { | ||
| + }); | ||
| + __define(EnhancerArray.prototype, 'prepend', function () { | ||
| var arr = []; | ||
| for (var _i = 0; _i < arguments.length; _i++) { | ||
| arr[_i] = arguments[_i]; | ||
| @@ -369,7 +379,7 @@ var EnhancerArray = /** @class */ (function (_super) { | ||
| return new (EnhancerArray.bind.apply(EnhancerArray, __spreadArray([void 0], arr[0].concat(this))))(); | ||
| } | ||
| return new (EnhancerArray.bind.apply(EnhancerArray, __spreadArray([void 0], arr.concat(this))))(); | ||
| - }; | ||
| + }); | ||
| return EnhancerArray; | ||
| }(Array)); | ||
| function freezeDraftable(val) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| diff --git a/lib/common.js b/lib/common.js | ||
| index 336bc4d376d07306d6adf79b8e73cffd4dfff4f7..271d50d42a5a370440fd93de00072ddfdd2fcf4b 100644 | ||
| --- a/lib/common.js | ||
| +++ b/lib/common.js | ||
| @@ -1,7 +1,17 @@ | ||
| 'use strict' | ||
|
|
||
| const debug = require('debug')('nock.common') | ||
| -const timers = require('timers') | ||
| +/** | ||
| + * PATCH NOTES: | ||
| + * | ||
| + * Replace Node.js `timers` module with global timers, because Jest/Sinon fake timers do not work | ||
| + * with the Node.js timers module in the version we are using. | ||
| + * | ||
| + * This is resolved in `@sinon/fake-timers@11`, which is introduced in the upcoming `jest@30` | ||
| + * release. | ||
| + * | ||
| + * TODO: Remove this patch after updating to `jest@30`. | ||
| + */ | ||
| const url = require('url') | ||
| const util = require('util') | ||
|
|
||
| @@ -598,16 +608,16 @@ const intervals = [] | ||
| const immediates = [] | ||
|
|
||
| const wrapTimer = | ||
| - (timer, ids) => | ||
| + (timerName, ids) => | ||
| (...args) => { | ||
| - const id = timer(...args) | ||
| + const id = globalThis[timerName](...args) | ||
| ids.push(id) | ||
| return id | ||
| } | ||
|
|
||
| -const setTimeout = wrapTimer(timers.setTimeout, timeouts) | ||
| -const setInterval = wrapTimer(timers.setInterval, intervals) | ||
| -const setImmediate = wrapTimer(timers.setImmediate, immediates) | ||
| +const setTimeout = wrapTimer('setTimeout', timeouts) | ||
| +const setInterval = wrapTimer('setInterval', intervals) | ||
| +const setImmediate = wrapTimer('setImmediate', immediates) | ||
|
|
||
| function clearTimer(clear, ids) { | ||
| while (ids.length) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.