Merge pull request #12935 from MetaMask/Version-v10.8.0
Version v10.8.0 RCfeature/default_network_editable
Dan J Miller
3 years ago
committed by
GitHub
commit
bb064c32fb
|
After Width: | Height: | Size: 347 B |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 358 B |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 29 KiB |
@ -0,0 +1,16 @@ |
||||
/* eslint-disable import/unambiguous */ |
||||
module.exports = { |
||||
coverageDirectory: './jest-coverage/storybook', |
||||
coverageReporters: ['html', 'text-summary'], |
||||
// TODO: enable resetMocks
|
||||
// resetMocks: true,
|
||||
restoreMocks: true, |
||||
setupFiles: ['<rootDir>/test/setup.js', '<rootDir>/test/env.js'], |
||||
setupFilesAfterEnv: ['<rootDir>/test/jest/setup.js'], |
||||
testMatch: ['<rootDir>/ui/**/*stories.test.js'], |
||||
testTimeout: 2500, |
||||
transform: { |
||||
'^.+\\.[tj]sx?$': 'babel-jest', |
||||
'^.+\\.mdx$': '@storybook/addon-docs/jest-transform-mdx', |
||||
}, |
||||
}; |
||||
@ -0,0 +1,62 @@ |
||||
diff --git a/node_modules/@babel/runtime/helpers/extends.js b/node_modules/@babel/runtime/helpers/extends.js
|
||||
index eaf9547..d0474f5 100644
|
||||
--- a/node_modules/@babel/runtime/helpers/extends.js
|
||||
+++ b/node_modules/@babel/runtime/helpers/extends.js
|
||||
@@ -1,20 +1,5 @@
|
||||
function _extends() {
|
||||
- module.exports = _extends = Object.assign || function (target) {
|
||||
- for (var i = 1; i < arguments.length; i++) {
|
||||
- var source = arguments[i];
|
||||
-
|
||||
- for (var key in source) {
|
||||
- if (Object.prototype.hasOwnProperty.call(source, key)) {
|
||||
- target[key] = source[key];
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- return target;
|
||||
- };
|
||||
-
|
||||
- module.exports["default"] = module.exports, module.exports.__esModule = true;
|
||||
- return _extends.apply(this, arguments);
|
||||
+ return Object.assign(...arguments)
|
||||
}
|
||||
|
||||
module.exports = _extends;
|
||||
diff --git a/node_modules/@babel/runtime/helpers/getPrototypeOf.js b/node_modules/@babel/runtime/helpers/getPrototypeOf.js
|
||||
index a6916eb..e01b2d6 100644
|
||||
--- a/node_modules/@babel/runtime/helpers/getPrototypeOf.js
|
||||
+++ b/node_modules/@babel/runtime/helpers/getPrototypeOf.js
|
||||
@@ -1,9 +1,5 @@
|
||||
function _getPrototypeOf(o) {
|
||||
- module.exports = _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
|
||||
- return o.__proto__ || Object.getPrototypeOf(o);
|
||||
- };
|
||||
- module.exports["default"] = module.exports, module.exports.__esModule = true;
|
||||
- return _getPrototypeOf(o);
|
||||
+ return Object.getPrototypeOf(o);
|
||||
}
|
||||
|
||||
module.exports = _getPrototypeOf;
|
||||
diff --git a/node_modules/@babel/runtime/helpers/setPrototypeOf.js b/node_modules/@babel/runtime/helpers/setPrototypeOf.js
|
||||
index 415797b..63312f2 100644
|
||||
--- a/node_modules/@babel/runtime/helpers/setPrototypeOf.js
|
||||
+++ b/node_modules/@babel/runtime/helpers/setPrototypeOf.js
|
||||
@@ -1,12 +1,7 @@
|
||||
function _setPrototypeOf(o, p) {
|
||||
- module.exports = _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
|
||||
- o.__proto__ = p;
|
||||
- return o;
|
||||
- };
|
||||
-
|
||||
- module.exports["default"] = module.exports, module.exports.__esModule = true;
|
||||
- return _setPrototypeOf(o, p);
|
||||
-}
|
||||
+ o.__proto__ = p;
|
||||
+ return o;
|
||||
+};
|
||||
|
||||
module.exports = _setPrototypeOf;
|
||||
module.exports["default"] = module.exports, module.exports.__esModule = true;
|
||||
\ No newline at end of file
|
||||
@ -0,0 +1,13 @@ |
||||
diff --git a/node_modules/acorn/dist/acorn.js b/node_modules/acorn/dist/acorn.js
|
||||
index 0523f0e..9d3d5c2 100644
|
||||
--- a/node_modules/acorn/dist/acorn.js
|
||||
+++ b/node_modules/acorn/dist/acorn.js
|
||||
@@ -1835,7 +1835,7 @@
|
||||
if (checkClashes) {
|
||||
if (has(checkClashes, expr.name))
|
||||
{ this.raiseRecoverable(expr.start, "Argument name clash"); }
|
||||
- checkClashes[expr.name] = true;
|
||||
+ Object.defineProperty(checkClashes, expr.name, { value: true, writable: true, enumerable: true, configurable: true })
|
||||
}
|
||||
if (bindingType !== BIND_NONE && bindingType !== BIND_OUTSIDE) { this.declareName(expr.name, bindingType, expr.start); }
|
||||
break
|
||||
@ -0,0 +1,14 @@ |
||||
diff --git a/node_modules/colors/lib/extendStringPrototype.js b/node_modules/colors/lib/extendStringPrototype.js
|
||||
index 46fd386..c7d0fc5 100644
|
||||
--- a/node_modules/colors/lib/extendStringPrototype.js
|
||||
+++ b/node_modules/colors/lib/extendStringPrototype.js
|
||||
@@ -5,7 +5,8 @@ module['exports'] = function() {
|
||||
// Extends prototype of native string object to allow for "foo".red syntax
|
||||
//
|
||||
var addProperty = function(color, func) {
|
||||
- String.prototype.__defineGetter__(color, func);
|
||||
+ // remove prototype mutation so this plays well with LavaMoat
|
||||
+ // String.prototype.__defineGetter__(color, func);
|
||||
};
|
||||
|
||||
addProperty('strip', function() {
|
||||
@ -1,17 +1,18 @@ |
||||
diff --git a/node_modules/object.values/index.js b/node_modules/object.values/index.js
|
||||
index b8ba091..2dc8083 100644
|
||||
index abf0449..2dc8083 100644
|
||||
--- a/node_modules/object.values/index.js
|
||||
+++ b/node_modules/object.values/index.js
|
||||
@@ -1,17 +1,3 @@
|
||||
@@ -1,18 +1,3 @@
|
||||
'use strict';
|
||||
|
||||
-var define = require('define-properties');
|
||||
-var callBind = require('call-bind');
|
||||
-
|
||||
-var implementation = require('./implementation');
|
||||
-var getPolyfill = require('./polyfill');
|
||||
-var shim = require('./shim');
|
||||
-
|
||||
-var polyfill = getPolyfill();
|
||||
-var polyfill = callBind(getPolyfill(), Object);
|
||||
-
|
||||
-define(polyfill, {
|
||||
- getPolyfill: getPolyfill,
|
||||
@ -1,25 +1,29 @@ |
||||
diff --git a/node_modules/sass/sass.dart.js b/node_modules/sass/sass.dart.js
|
||||
index fedd867..fef6a8f 100644
|
||||
index 512d612..1374f5e 100644
|
||||
--- a/node_modules/sass/sass.dart.js
|
||||
+++ b/node_modules/sass/sass.dart.js
|
||||
@@ -16,6 +16,9 @@ self.scheduleImmediate = self.setImmediate
|
||||
@@ -16,6 +16,10 @@ self.scheduleImmediate = typeof setImmediate !== "undefined"
|
||||
// CommonJS globals.
|
||||
self.exports = exports;
|
||||
|
||||
+// realm bridge utility functions
|
||||
+exports.bridgeJson = (target) => JSON.parse(JSON.stringify(target))
|
||||
+exports.bridgeFn = (target) => ((...args) => target(...args))
|
||||
+
|
||||
// Node.js specific exports, check to see if they exist & or polyfilled
|
||||
|
||||
if (typeof process !== "undefined") {
|
||||
@@ -3616,10 +3619,6 @@ self.fs = require("fs");
|
||||
@@ -3700,13 +3704,6 @@ self.fs = require("fs");
|
||||
return C.PlainJavaScriptObject_methods;
|
||||
if (proto === Object.prototype)
|
||||
return C.PlainJavaScriptObject_methods;
|
||||
- if (typeof $constructor == "function") {
|
||||
- Object.defineProperty($constructor, J.JS_INTEROP_INTERCEPTOR_TAG(), {value: C.UnknownJavaScriptObject_methods, enumerable: false, writable: true, configurable: true});
|
||||
- t1 = $._JS_INTEROP_INTERCEPTOR_TAG;
|
||||
- if (t1 == null)
|
||||
- t1 = $._JS_INTEROP_INTERCEPTOR_TAG = init.getIsolateTag("_$dart_js");
|
||||
- Object.defineProperty($constructor, t1, {value: C.UnknownJavaScriptObject_methods, enumerable: false, writable: true, configurable: true});
|
||||
- return C.UnknownJavaScriptObject_methods;
|
||||
- }
|
||||
return C.UnknownJavaScriptObject_methods;
|
||||
},
|
||||
JS_INTEROP_INTERCEPTOR_TAG: function() {
|
||||
JSArray_JSArray$fixed: function($length, $E) {
|
||||
@ -0,0 +1,27 @@ |
||||
{ |
||||
"fee-market": { |
||||
"gasEstimateType": "fee-market", |
||||
"gasFeeEstimates": { |
||||
"low": { |
||||
"minWaitTimeEstimate": 180000, |
||||
"maxWaitTimeEstimate": 300000, |
||||
"suggestedMaxPriorityFeePerGas": "3", |
||||
"suggestedMaxFeePerGas": "53" |
||||
}, |
||||
"medium": { |
||||
"minWaitTimeEstimate": 15000, |
||||
"maxWaitTimeEstimate": 60000, |
||||
"suggestedMaxPriorityFeePerGas": "7", |
||||
"suggestedMaxFeePerGas": "70" |
||||
}, |
||||
"high": { |
||||
"minWaitTimeEstimate": 0, |
||||
"maxWaitTimeEstimate": 15000, |
||||
"suggestedMaxPriorityFeePerGas": "10", |
||||
"suggestedMaxFeePerGas": "100" |
||||
}, |
||||
"estimatedBaseFee": "50" |
||||
}, |
||||
"estimatedGasFeeTimeBounds": {} |
||||
} |
||||
} |
||||
@ -1,2 +1,2 @@ |
||||
export const METASWAP_BASE_URL = 'https://api.metaswap.codefi.network'; |
||||
export const METASWAP_API_V2_BASE_URL = 'https://api2.metaswap.codefi.network'; |
||||
export const METASWAP_BASE_URL = 'https://api2.metaswap.codefi.network'; |
||||
export const GAS_API_URL = 'https://gas-api.metaswap.codefi.network'; |
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue