diff --git a/src/Components/Blazor/Blazor/src/Rendering/WebAssemblyRenderer.cs b/src/Components/Blazor/Blazor/src/Rendering/WebAssemblyRenderer.cs
index 93941e4d3434f4d24ee06e933f36f48346e096ac..70da290ab3f7bbc05ae7879d1e6ba13f47c26617 100644
--- a/src/Components/Blazor/Blazor/src/Rendering/WebAssemblyRenderer.cs
+++ b/src/Components/Blazor/Blazor/src/Rendering/WebAssemblyRenderer.cs
@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Components.Rendering;
using Microsoft.JSInterop;
using Mono.WebAssembly.Interop;
using System;
+using System.Threading;
using System.Threading.Tasks;
namespace Microsoft.AspNetCore.Blazor.Rendering
@@ -31,9 +32,6 @@ namespace Microsoft.AspNetCore.Blazor.Rendering
_webAssemblyRendererId = RendererRegistry.Current.Add(this);
}
- internal void DispatchBrowserEvent(int componentId, int eventHandlerId, UIEventArgs eventArgs)
- => DispatchEvent(componentId, eventHandlerId, eventArgs);
-
/// <summary>
/// Attaches a new root component to the renderer,
/// causing it to be displayed in the specified DOM element.
diff --git a/src/Components/Blazor/Build/test/RazorIntegrationTestBase.cs b/src/Components/Blazor/Build/test/RazorIntegrationTestBase.cs
index c3f207e299a8fb227e6bff2d74411f6dc8dacdbd..ae1be48bf37705f43f25be4180b3d9f22213b839 100644
--- a/src/Components/Blazor/Build/test/RazorIntegrationTestBase.cs
+++ b/src/Components/Blazor/Build/test/RazorIntegrationTestBase.cs
@@ -377,7 +377,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
{
var renderer = new TestRenderer();
renderer.AttachComponent(component);
- var task = component.SetParametersAsync(ParameterCollection.Empty);
+ var task = renderer.InvokeAsync(() => component.SetParametersAsync(ParameterCollection.Empty));
// we will have to change this method if we add a test that does actual async work.
Assert.True(task.Status.HasFlag(TaskStatus.RanToCompletion) || task.Status.HasFlag(TaskStatus.Faulted));
if (task.IsFaulted)
@@ -434,7 +434,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
private class TestRenderer : Renderer
{
- public TestRenderer() : base(new TestServiceProvider())
+ public TestRenderer() : base(new TestServiceProvider(), CreateDefaultDispatcher())
{
}
diff --git a/src/Components/Browser.JS/src/package-lock.json b/src/Components/Browser.JS/src/package-lock.json
index 93ca3e202ddb4f5a5172a250f89e2be30e55b249..3272ef3e77bf9d6d604fefe713ebd5eb58cc9e80 100644
--- a/src/Components/Browser.JS/src/package-lock.json
+++ b/src/Components/Browser.JS/src/package-lock.json
@@ -16,7 +16,7 @@
"integrity": "sha512-Q/rSs/UDzw0iwhqZILzMMP0m/lTVNSQDS9aNkBTkt8aAAKAEMriCMTy0Ahx9xPuMTzFtyPRjNgEZfEkWUHajcg==",
"dev": true,
"requires": {
- "msgpack5": "4.2.0"
+ "msgpack5": "^4.0.2"
}
},
"@dotnet/jsinterop": {
@@ -31,7 +31,7 @@
"integrity": "sha512-6OaHAsknBA6M2gKszMZXunqFofGXCCk4UCXHMdzd3qtBpndSHuM2JgxBE9M3APyl/DlENt4FEe0C7mJwbcC/ZA==",
"dev": true,
"requires": {
- "@types/webassembly-js-api": "0.0.1"
+ "@types/webassembly-js-api": "*"
}
},
"@types/webassembly-js-api": {
@@ -49,8 +49,8 @@
"@webassemblyjs/helper-module-context": "1.5.12",
"@webassemblyjs/helper-wasm-bytecode": "1.5.12",
"@webassemblyjs/wast-parser": "1.5.12",
- "debug": "3.1.0",
- "mamacro": "0.0.3"
+ "debug": "^3.1.0",
+ "mamacro": "^0.0.3"
},
"dependencies": {
"debug": {
@@ -82,7 +82,7 @@
"integrity": "sha512-tJNUjttL5CxiiS/KLxT4/Zk0Nbl/poFhztFxktb46zoQEUWaGHR9ZJ0SnvE7DbFX5PY5JNJDMZ0Li4lm246fWw==",
"dev": true,
"requires": {
- "debug": "3.1.0"
+ "debug": "^3.1.0"
},
"dependencies": {
"debug": {
@@ -117,8 +117,8 @@
"integrity": "sha512-SCXR8hPI4JOG3cdy9HAO8W5/VQ68YXG/Hfs7qDf1cd64zWuMNshyEour5NYnLMVkrrtc0XzfVS/MdeV94woFHA==",
"dev": true,
"requires": {
- "debug": "3.1.0",
- "mamacro": "0.0.3"
+ "debug": "^3.1.0",
+ "mamacro": "^0.0.3"
},
"dependencies": {
"debug": {
@@ -148,7 +148,7 @@
"@webassemblyjs/helper-buffer": "1.5.12",
"@webassemblyjs/helper-wasm-bytecode": "1.5.12",
"@webassemblyjs/wasm-gen": "1.5.12",
- "debug": "3.1.0"
+ "debug": "^3.1.0"
},
"dependencies": {
"debug": {
@@ -168,7 +168,7 @@
"integrity": "sha512-F+PEv9QBzPi1ThLBouUJbuxhEr+Sy/oua1ftXFKHiaYYS5Z9tKPvK/hgCxlSdq+RY4MSG15jU2JYb/K5pkoybg==",
"dev": true,
"requires": {
- "ieee754": "1.1.12"
+ "ieee754": "^1.1.11"
}
},
"@webassemblyjs/leb128": {
@@ -177,7 +177,7 @@
"integrity": "sha512-cCOx/LVGiWyCwVrVlvGmTdnwHzIP4+zflLjGkZxWpYCpdNax9krVIJh1Pm7O86Ox/c5PrJpbvZU1cZLxndlPEw==",
"dev": true,
"requires": {
- "leb": "0.3.0"
+ "leb": "^0.3.0"
}
},
"@webassemblyjs/utf8": {
@@ -200,7 +200,7 @@
"@webassemblyjs/wasm-opt": "1.5.12",
"@webassemblyjs/wasm-parser": "1.5.12",
"@webassemblyjs/wast-printer": "1.5.12",
- "debug": "3.1.0"
+ "debug": "^3.1.0"
},
"dependencies": {
"debug": {
@@ -237,7 +237,7 @@
"@webassemblyjs/helper-buffer": "1.5.12",
"@webassemblyjs/wasm-gen": "1.5.12",
"@webassemblyjs/wasm-parser": "1.5.12",
- "debug": "3.1.0"
+ "debug": "^3.1.0"
},
"dependencies": {
"debug": {
@@ -276,8 +276,8 @@
"@webassemblyjs/helper-api-error": "1.5.12",
"@webassemblyjs/helper-code-frame": "1.5.12",
"@webassemblyjs/helper-fsm": "1.5.12",
- "long": "3.2.0",
- "mamacro": "0.0.3"
+ "long": "^3.2.0",
+ "mamacro": "^0.0.3"
}
},
"@webassemblyjs/wast-printer": {
@@ -288,7 +288,7 @@
"requires": {
"@webassemblyjs/ast": "1.5.12",
"@webassemblyjs/wast-parser": "1.5.12",
- "long": "3.2.0"
+ "long": "^3.2.0"
}
},
"acorn": {
@@ -303,7 +303,7 @@
"integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==",
"dev": true,
"requires": {
- "acorn": "5.7.1"
+ "acorn": "^5.0.0"
}
},
"ajv": {
@@ -312,10 +312,10 @@
"integrity": "sha512-pgZos1vgOHDiC7gKNbZW8eKvCnNXARv2oqrGQT7Hzbq5Azp7aZG6DJzADnkuSq7RH6qkXp4J/m68yPX/2uBHyQ==",
"dev": true,
"requires": {
- "fast-deep-equal": "2.0.1",
- "fast-json-stable-stringify": "2.0.0",
- "json-schema-traverse": "0.4.1",
- "uri-js": "4.2.2"
+ "fast-deep-equal": "^2.0.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.1"
}
},
"ajv-keywords": {
@@ -342,7 +342,7 @@
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
"dev": true,
"requires": {
- "color-convert": "1.9.2"
+ "color-convert": "^1.9.0"
}
},
"anymatch": {
@@ -351,8 +351,8 @@
"integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
"dev": true,
"requires": {
- "micromatch": "3.1.10",
- "normalize-path": "2.1.1"
+ "micromatch": "^3.1.4",
+ "normalize-path": "^2.1.1"
}
},
"aproba": {
@@ -391,9 +391,9 @@
"integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
"dev": true,
"requires": {
- "bn.js": "4.11.8",
- "inherits": "2.0.3",
- "minimalistic-assert": "1.0.1"
+ "bn.js": "^4.0.0",
+ "inherits": "^2.0.1",
+ "minimalistic-assert": "^1.0.0"
}
},
"assert": {
@@ -452,13 +452,13 @@
"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
"dev": true,
"requires": {
- "cache-base": "1.0.1",
- "class-utils": "0.3.6",
- "component-emitter": "1.2.1",
- "define-property": "1.0.0",
- "isobject": "3.0.1",
- "mixin-deep": "1.3.1",
- "pascalcase": "0.1.1"
+ "cache-base": "^1.0.1",
+ "class-utils": "^0.3.5",
+ "component-emitter": "^1.2.1",
+ "define-property": "^1.0.0",
+ "isobject": "^3.0.1",
+ "mixin-deep": "^1.2.0",
+ "pascalcase": "^0.1.1"
},
"dependencies": {
"define-property": {
@@ -467,7 +467,7 @@
"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
"dev": true,
"requires": {
- "is-descriptor": "1.0.2"
+ "is-descriptor": "^1.0.0"
}
},
"is-accessor-descriptor": {
@@ -476,7 +476,7 @@
"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
"dev": true,
"requires": {
- "kind-of": "6.0.2"
+ "kind-of": "^6.0.0"
}
},
"is-data-descriptor": {
@@ -485,7 +485,7 @@
"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
"dev": true,
"requires": {
- "kind-of": "6.0.2"
+ "kind-of": "^6.0.0"
}
},
"is-descriptor": {
@@ -494,9 +494,9 @@
"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
"dev": true,
"requires": {
- "is-accessor-descriptor": "1.0.0",
- "is-data-descriptor": "1.0.0",
- "kind-of": "6.0.2"
+ "is-accessor-descriptor": "^1.0.0",
+ "is-data-descriptor": "^1.0.0",
+ "kind-of": "^6.0.2"
}
}
}
@@ -525,8 +525,8 @@
"integrity": "sha512-FrMgLukB9jujvJ92p5TA0hcKIHtInVXXhxD7qgAuV7k0cbPt9USZmOYnhDXH6IsnGeIUglX42TSBV7Gn4q5sbQ==",
"dev": true,
"requires": {
- "readable-stream": "2.3.6",
- "safe-buffer": "5.1.2"
+ "readable-stream": "^2.3.5",
+ "safe-buffer": "^5.1.1"
}
},
"bluebird": {
@@ -547,7 +547,7 @@
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"dev": true,
"requires": {
- "balanced-match": "1.0.0",
+ "balanced-match": "^1.0.0",
"concat-map": "0.0.1"
}
},
@@ -557,16 +557,16 @@
"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
"dev": true,
"requires": {
- "arr-flatten": "1.1.0",
- "array-unique": "0.3.2",
- "extend-shallow": "2.0.1",
- "fill-range": "4.0.0",
- "isobject": "3.0.1",
- "repeat-element": "1.1.2",
- "snapdragon": "0.8.2",
- "snapdragon-node": "2.1.1",
- "split-string": "3.1.0",
- "to-regex": "3.0.2"
+ "arr-flatten": "^1.1.0",
+ "array-unique": "^0.3.2",
+ "extend-shallow": "^2.0.1",
+ "fill-range": "^4.0.0",
+ "isobject": "^3.0.1",
+ "repeat-element": "^1.1.2",
+ "snapdragon": "^0.8.1",
+ "snapdragon-node": "^2.0.1",
+ "split-string": "^3.0.2",
+ "to-regex": "^3.0.1"
},
"dependencies": {
"extend-shallow": {
@@ -575,7 +575,7 @@
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
- "is-extendable": "0.1.1"
+ "is-extendable": "^0.1.0"
}
}
}
@@ -592,12 +592,12 @@
"integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
"dev": true,
"requires": {
- "buffer-xor": "1.0.3",
- "cipher-base": "1.0.4",
- "create-hash": "1.2.0",
- "evp_bytestokey": "1.0.3",
- "inherits": "2.0.3",
- "safe-buffer": "5.1.2"
+ "buffer-xor": "^1.0.3",
+ "cipher-base": "^1.0.0",
+ "create-hash": "^1.1.0",
+ "evp_bytestokey": "^1.0.3",
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.0.1"
}
},
"browserify-cipher": {
@@ -606,9 +606,9 @@
"integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
"dev": true,
"requires": {
- "browserify-aes": "1.2.0",
- "browserify-des": "1.0.1",
- "evp_bytestokey": "1.0.3"
+ "browserify-aes": "^1.0.4",
+ "browserify-des": "^1.0.0",
+ "evp_bytestokey": "^1.0.0"
}
},
"browserify-des": {
@@ -617,9 +617,9 @@
"integrity": "sha512-zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw==",
"dev": true,
"requires": {
- "cipher-base": "1.0.4",
- "des.js": "1.0.0",
- "inherits": "2.0.3"
+ "cipher-base": "^1.0.1",
+ "des.js": "^1.0.0",
+ "inherits": "^2.0.1"
}
},
"browserify-rsa": {
@@ -628,8 +628,8 @@
"integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
"dev": true,
"requires": {
- "bn.js": "4.11.8",
- "randombytes": "2.0.6"
+ "bn.js": "^4.1.0",
+ "randombytes": "^2.0.1"
}
},
"browserify-sign": {
@@ -638,13 +638,13 @@
"integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
"dev": true,
"requires": {
- "bn.js": "4.11.8",
- "browserify-rsa": "4.0.1",
- "create-hash": "1.2.0",
- "create-hmac": "1.1.7",
- "elliptic": "6.4.0",
- "inherits": "2.0.3",
- "parse-asn1": "5.1.1"
+ "bn.js": "^4.1.1",
+ "browserify-rsa": "^4.0.0",
+ "create-hash": "^1.1.0",
+ "create-hmac": "^1.1.2",
+ "elliptic": "^6.0.0",
+ "inherits": "^2.0.1",
+ "parse-asn1": "^5.0.0"
}
},
"browserify-zlib": {
@@ -653,7 +653,7 @@
"integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
"dev": true,
"requires": {
- "pako": "1.0.6"
+ "pako": "~1.0.5"
}
},
"buffer": {
@@ -662,9 +662,9 @@
"integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
"dev": true,
"requires": {
- "base64-js": "1.3.0",
- "ieee754": "1.1.12",
- "isarray": "1.0.0"
+ "base64-js": "^1.0.2",
+ "ieee754": "^1.1.4",
+ "isarray": "^1.0.0"
}
},
"buffer-from": {
@@ -691,19 +691,19 @@
"integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
"dev": true,
"requires": {
- "bluebird": "3.5.1",
- "chownr": "1.0.1",
- "glob": "7.1.2",
- "graceful-fs": "4.1.11",
- "lru-cache": "4.1.3",
- "mississippi": "2.0.0",
- "mkdirp": "0.5.1",
- "move-concurrently": "1.0.1",
- "promise-inflight": "1.0.1",
- "rimraf": "2.6.2",
- "ssri": "5.3.0",
- "unique-filename": "1.1.0",
- "y18n": "4.0.0"
+ "bluebird": "^3.5.1",
+ "chownr": "^1.0.1",
+ "glob": "^7.1.2",
+ "graceful-fs": "^4.1.11",
+ "lru-cache": "^4.1.1",
+ "mississippi": "^2.0.0",
+ "mkdirp": "^0.5.1",
+ "move-concurrently": "^1.0.1",
+ "promise-inflight": "^1.0.1",
+ "rimraf": "^2.6.2",
+ "ssri": "^5.2.4",
+ "unique-filename": "^1.1.0",
+ "y18n": "^4.0.0"
}
},
"cache-base": {
@@ -712,15 +712,15 @@
"integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
"dev": true,
"requires": {
- "collection-visit": "1.0.0",
- "component-emitter": "1.2.1",
- "get-value": "2.0.6",
- "has-value": "1.0.0",
- "isobject": "3.0.1",
- "set-value": "2.0.0",
- "to-object-path": "0.3.0",
- "union-value": "1.0.0",
- "unset-value": "1.0.0"
+ "collection-visit": "^1.0.0",
+ "component-emitter": "^1.2.1",
+ "get-value": "^2.0.6",
+ "has-value": "^1.0.0",
+ "isobject": "^3.0.1",
+ "set-value": "^2.0.0",
+ "to-object-path": "^0.3.0",
+ "union-value": "^1.0.0",
+ "unset-value": "^1.0.0"
}
},
"camelcase": {
@@ -735,9 +735,9 @@
"integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
"dev": true,
"requires": {
- "ansi-styles": "3.2.1",
- "escape-string-regexp": "1.0.5",
- "supports-color": "5.4.0"
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
}
},
"chardet": {
@@ -752,19 +752,19 @@
"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
"dev": true,
"requires": {
- "anymatch": "2.0.0",
- "async-each": "1.0.1",
- "braces": "2.3.2",
- "fsevents": "1.2.4",
- "glob-parent": "3.1.0",
- "inherits": "2.0.3",
- "is-binary-path": "1.0.1",
- "is-glob": "4.0.0",
- "lodash.debounce": "4.0.8",
- "normalize-path": "2.1.1",
- "path-is-absolute": "1.0.1",
- "readdirp": "2.1.0",
- "upath": "1.1.0"
+ "anymatch": "^2.0.0",
+ "async-each": "^1.0.0",
+ "braces": "^2.3.0",
+ "fsevents": "^1.2.2",
+ "glob-parent": "^3.1.0",
+ "inherits": "^2.0.1",
+ "is-binary-path": "^1.0.0",
+ "is-glob": "^4.0.0",
+ "lodash.debounce": "^4.0.8",
+ "normalize-path": "^2.1.1",
+ "path-is-absolute": "^1.0.0",
+ "readdirp": "^2.0.0",
+ "upath": "^1.0.5"
}
},
"chownr": {
@@ -779,7 +779,7 @@
"integrity": "sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==",
"dev": true,
"requires": {
- "tslib": "1.9.2"
+ "tslib": "^1.9.0"
}
},
"cipher-base": {
@@ -788,8 +788,8 @@
"integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
"dev": true,
"requires": {
- "inherits": "2.0.3",
- "safe-buffer": "5.1.2"
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.0.1"
}
},
"class-utils": {
@@ -798,10 +798,10 @@
"integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
"dev": true,
"requires": {
- "arr-union": "3.1.0",
- "define-property": "0.2.5",
- "isobject": "3.0.1",
- "static-extend": "0.1.2"
+ "arr-union": "^3.1.0",
+ "define-property": "^0.2.5",
+ "isobject": "^3.0.0",
+ "static-extend": "^0.1.1"
},
"dependencies": {
"define-property": {
@@ -810,7 +810,7 @@
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
"dev": true,
"requires": {
- "is-descriptor": "0.1.6"
+ "is-descriptor": "^0.1.0"
}
}
}
@@ -821,7 +821,7 @@
"integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
"dev": true,
"requires": {
- "restore-cursor": "2.0.0"
+ "restore-cursor": "^2.0.0"
}
},
"cli-width": {
@@ -836,9 +836,9 @@
"integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
"dev": true,
"requires": {
- "string-width": "2.1.1",
- "strip-ansi": "4.0.0",
- "wrap-ansi": "2.1.0"
+ "string-width": "^2.1.1",
+ "strip-ansi": "^4.0.0",
+ "wrap-ansi": "^2.0.0"
}
},
"code-point-at": {
@@ -853,8 +853,8 @@
"integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
"dev": true,
"requires": {
- "map-visit": "1.0.0",
- "object-visit": "1.0.1"
+ "map-visit": "^1.0.0",
+ "object-visit": "^1.0.0"
}
},
"color-convert": {
@@ -902,10 +902,10 @@
"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
"dev": true,
"requires": {
- "buffer-from": "1.1.0",
- "inherits": "2.0.3",
- "readable-stream": "2.3.6",
- "typedarray": "0.0.6"
+ "buffer-from": "^1.0.0",
+ "inherits": "^2.0.3",
+ "readable-stream": "^2.2.2",
+ "typedarray": "^0.0.6"
}
},
"console-browserify": {
@@ -914,7 +914,7 @@
"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
"dev": true,
"requires": {
- "date-now": "0.1.4"
+ "date-now": "^0.1.4"
}
},
"constants-browserify": {
@@ -929,12 +929,12 @@
"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
"dev": true,
"requires": {
- "aproba": "1.2.0",
- "fs-write-stream-atomic": "1.0.10",
- "iferr": "0.1.5",
- "mkdirp": "0.5.1",
- "rimraf": "2.6.2",
- "run-queue": "1.0.3"
+ "aproba": "^1.1.1",
+ "fs-write-stream-atomic": "^1.0.8",
+ "iferr": "^0.1.5",
+ "mkdirp": "^0.5.1",
+ "rimraf": "^2.5.4",
+ "run-queue": "^1.0.0"
}
},
"copy-descriptor": {
@@ -955,8 +955,8 @@
"integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
"dev": true,
"requires": {
- "bn.js": "4.11.8",
- "elliptic": "6.4.0"
+ "bn.js": "^4.1.0",
+ "elliptic": "^6.0.0"
}
},
"create-hash": {
@@ -965,11 +965,11 @@
"integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
"dev": true,
"requires": {
- "cipher-base": "1.0.4",
- "inherits": "2.0.3",
- "md5.js": "1.3.4",
- "ripemd160": "2.0.2",
- "sha.js": "2.4.11"
+ "cipher-base": "^1.0.1",
+ "inherits": "^2.0.1",
+ "md5.js": "^1.3.4",
+ "ripemd160": "^2.0.1",
+ "sha.js": "^2.4.0"
}
},
"create-hmac": {
@@ -978,12 +978,12 @@
"integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
"dev": true,
"requires": {
- "cipher-base": "1.0.4",
- "create-hash": "1.2.0",
- "inherits": "2.0.3",
- "ripemd160": "2.0.2",
- "safe-buffer": "5.1.2",
- "sha.js": "2.4.11"
+ "cipher-base": "^1.0.3",
+ "create-hash": "^1.1.0",
+ "inherits": "^2.0.1",
+ "ripemd160": "^2.0.0",
+ "safe-buffer": "^5.0.1",
+ "sha.js": "^2.4.8"
}
},
"cross-spawn": {
@@ -992,11 +992,11 @@
"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
"dev": true,
"requires": {
- "nice-try": "1.0.4",
- "path-key": "2.0.1",
- "semver": "5.5.0",
- "shebang-command": "1.2.0",
- "which": "1.3.1"
+ "nice-try": "^1.0.4",
+ "path-key": "^2.0.1",
+ "semver": "^5.5.0",
+ "shebang-command": "^1.2.0",
+ "which": "^1.2.9"
}
},
"crypto-browserify": {
@@ -1005,17 +1005,17 @@
"integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
"dev": true,
"requires": {
- "browserify-cipher": "1.0.1",
- "browserify-sign": "4.0.4",
- "create-ecdh": "4.0.3",
- "create-hash": "1.2.0",
- "create-hmac": "1.1.7",
- "diffie-hellman": "5.0.3",
- "inherits": "2.0.3",
- "pbkdf2": "3.0.16",
- "public-encrypt": "4.0.2",
- "randombytes": "2.0.6",
- "randomfill": "1.0.4"
+ "browserify-cipher": "^1.0.0",
+ "browserify-sign": "^4.0.0",
+ "create-ecdh": "^4.0.0",
+ "create-hash": "^1.1.0",
+ "create-hmac": "^1.1.0",
+ "diffie-hellman": "^5.0.0",
+ "inherits": "^2.0.1",
+ "pbkdf2": "^3.0.3",
+ "public-encrypt": "^4.0.0",
+ "randombytes": "^2.0.0",
+ "randomfill": "^1.0.3"
}
},
"cyclist": {
@@ -1057,8 +1057,8 @@
"integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
"dev": true,
"requires": {
- "is-descriptor": "1.0.2",
- "isobject": "3.0.1"
+ "is-descriptor": "^1.0.2",
+ "isobject": "^3.0.1"
},
"dependencies": {
"is-accessor-descriptor": {
@@ -1067,7 +1067,7 @@
"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
"dev": true,
"requires": {
- "kind-of": "6.0.2"
+ "kind-of": "^6.0.0"
}
},
"is-data-descriptor": {
@@ -1076,7 +1076,7 @@
"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
"dev": true,
"requires": {
- "kind-of": "6.0.2"
+ "kind-of": "^6.0.0"
}
},
"is-descriptor": {
@@ -1085,9 +1085,9 @@
"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
"dev": true,
"requires": {
- "is-accessor-descriptor": "1.0.0",
- "is-data-descriptor": "1.0.0",
- "kind-of": "6.0.2"
+ "is-accessor-descriptor": "^1.0.0",
+ "is-data-descriptor": "^1.0.0",
+ "kind-of": "^6.0.2"
}
}
}
@@ -1098,8 +1098,8 @@
"integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
"dev": true,
"requires": {
- "inherits": "2.0.3",
- "minimalistic-assert": "1.0.1"
+ "inherits": "^2.0.1",
+ "minimalistic-assert": "^1.0.0"
}
},
"diffie-hellman": {
@@ -1108,9 +1108,9 @@
"integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
"dev": true,
"requires": {
- "bn.js": "4.11.8",
- "miller-rabin": "4.0.1",
- "randombytes": "2.0.6"
+ "bn.js": "^4.1.0",
+ "miller-rabin": "^4.0.0",
+ "randombytes": "^2.0.0"
}
},
"domain-browser": {
@@ -1125,10 +1125,10 @@
"integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==",
"dev": true,
"requires": {
- "end-of-stream": "1.4.1",
- "inherits": "2.0.3",
- "readable-stream": "2.3.6",
- "stream-shift": "1.0.0"
+ "end-of-stream": "^1.0.0",
+ "inherits": "^2.0.1",
+ "readable-stream": "^2.0.0",
+ "stream-shift": "^1.0.0"
}
},
"elliptic": {
@@ -1137,13 +1137,13 @@
"integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=",
"dev": true,
"requires": {
- "bn.js": "4.11.8",
- "brorand": "1.1.0",
- "hash.js": "1.1.4",
- "hmac-drbg": "1.0.1",
- "inherits": "2.0.3",
- "minimalistic-assert": "1.0.1",
- "minimalistic-crypto-utils": "1.0.1"
+ "bn.js": "^4.4.0",
+ "brorand": "^1.0.1",
+ "hash.js": "^1.0.0",
+ "hmac-drbg": "^1.0.0",
+ "inherits": "^2.0.1",
+ "minimalistic-assert": "^1.0.0",
+ "minimalistic-crypto-utils": "^1.0.0"
}
},
"emojis-list": {
@@ -1158,7 +1158,7 @@
"integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
"dev": true,
"requires": {
- "once": "1.4.0"
+ "once": "^1.4.0"
}
},
"enhanced-resolve": {
@@ -1167,9 +1167,9 @@
"integrity": "sha512-jox/62b2GofV1qTUQTMPEJSDIGycS43evqYzD/KVtEb9OCoki9cnacUPxCrZa7JfPzZSYOCZhu9O9luaMxAX8g==",
"dev": true,
"requires": {
- "graceful-fs": "4.1.11",
- "memory-fs": "0.4.1",
- "tapable": "1.0.0"
+ "graceful-fs": "^4.1.2",
+ "memory-fs": "^0.4.0",
+ "tapable": "^1.0.0"
}
},
"errno": {
@@ -1178,7 +1178,7 @@
"integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
"dev": true,
"requires": {
- "prr": "1.0.1"
+ "prr": "~1.0.1"
}
},
"escape-string-regexp": {
@@ -1193,8 +1193,8 @@
"integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
"dev": true,
"requires": {
- "esrecurse": "4.2.1",
- "estraverse": "4.2.0"
+ "esrecurse": "^4.1.0",
+ "estraverse": "^4.1.1"
}
},
"esrecurse": {
@@ -1203,7 +1203,7 @@
"integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
"dev": true,
"requires": {
- "estraverse": "4.2.0"
+ "estraverse": "^4.1.0"
}
},
"estraverse": {
@@ -1224,8 +1224,8 @@
"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
"dev": true,
"requires": {
- "md5.js": "1.3.4",
- "safe-buffer": "5.1.2"
+ "md5.js": "^1.3.4",
+ "safe-buffer": "^5.1.1"
}
},
"execa": {
@@ -1234,13 +1234,13 @@
"integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
"dev": true,
"requires": {
- "cross-spawn": "5.1.0",
- "get-stream": "3.0.0",
- "is-stream": "1.1.0",
- "npm-run-path": "2.0.2",
- "p-finally": "1.0.0",
- "signal-exit": "3.0.2",
- "strip-eof": "1.0.0"
+ "cross-spawn": "^5.0.1",
+ "get-stream": "^3.0.0",
+ "is-stream": "^1.1.0",
+ "npm-run-path": "^2.0.0",
+ "p-finally": "^1.0.0",
+ "signal-exit": "^3.0.0",
+ "strip-eof": "^1.0.0"
},
"dependencies": {
"cross-spawn": {
@@ -1249,9 +1249,9 @@
"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
"dev": true,
"requires": {
- "lru-cache": "4.1.3",
- "shebang-command": "1.2.0",
- "which": "1.3.1"
+ "lru-cache": "^4.0.1",
+ "shebang-command": "^1.2.0",
+ "which": "^1.2.9"
}
}
}
@@ -1262,13 +1262,13 @@
"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
"dev": true,
"requires": {
- "debug": "2.6.9",
- "define-property": "0.2.5",
- "extend-shallow": "2.0.1",
- "posix-character-classes": "0.1.1",
- "regex-not": "1.0.2",
- "snapdragon": "0.8.2",
- "to-regex": "3.0.2"
+ "debug": "^2.3.3",
+ "define-property": "^0.2.5",
+ "extend-shallow": "^2.0.1",
+ "posix-character-classes": "^0.1.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
},
"dependencies": {
"define-property": {
@@ -1277,7 +1277,7 @@
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
"dev": true,
"requires": {
- "is-descriptor": "0.1.6"
+ "is-descriptor": "^0.1.0"
}
},
"extend-shallow": {
@@ -1286,7 +1286,7 @@
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
- "is-extendable": "0.1.1"
+ "is-extendable": "^0.1.0"
}
}
}
@@ -1297,8 +1297,8 @@
"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
"dev": true,
"requires": {
- "assign-symbols": "1.0.0",
- "is-extendable": "1.0.1"
+ "assign-symbols": "^1.0.0",
+ "is-extendable": "^1.0.1"
},
"dependencies": {
"is-extendable": {
@@ -1307,7 +1307,7 @@
"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
"dev": true,
"requires": {
- "is-plain-object": "2.0.4"
+ "is-plain-object": "^2.0.4"
}
}
}
@@ -1318,9 +1318,9 @@
"integrity": "sha512-mpkfj0FEdxrIhOC04zk85X7StNtr0yXnG7zCb+8ikO8OJi2jsHh5YGoknNTyXgsbHOf1WOOcVU3kPFWT2WgCkQ==",
"dev": true,
"requires": {
- "chardet": "0.5.0",
- "iconv-lite": "0.4.23",
- "tmp": "0.0.33"
+ "chardet": "^0.5.0",
+ "iconv-lite": "^0.4.22",
+ "tmp": "^0.0.33"
}
},
"extglob": {
@@ -1329,14 +1329,14 @@
"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
"dev": true,
"requires": {
- "array-unique": "0.3.2",
- "define-property": "1.0.0",
- "expand-brackets": "2.1.4",
- "extend-shallow": "2.0.1",
- "fragment-cache": "0.2.1",
- "regex-not": "1.0.2",
- "snapdragon": "0.8.2",
- "to-regex": "3.0.2"
+ "array-unique": "^0.3.2",
+ "define-property": "^1.0.0",
+ "expand-brackets": "^2.1.4",
+ "extend-shallow": "^2.0.1",
+ "fragment-cache": "^0.2.1",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
},
"dependencies": {
"define-property": {
@@ -1345,7 +1345,7 @@
"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
"dev": true,
"requires": {
- "is-descriptor": "1.0.2"
+ "is-descriptor": "^1.0.0"
}
},
"extend-shallow": {
@@ -1354,7 +1354,7 @@
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
- "is-extendable": "0.1.1"
+ "is-extendable": "^0.1.0"
}
},
"is-accessor-descriptor": {
@@ -1363,7 +1363,7 @@
"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
"dev": true,
"requires": {
- "kind-of": "6.0.2"
+ "kind-of": "^6.0.0"
}
},
"is-data-descriptor": {
@@ -1372,7 +1372,7 @@
"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
"dev": true,
"requires": {
- "kind-of": "6.0.2"
+ "kind-of": "^6.0.0"
}
},
"is-descriptor": {
@@ -1381,9 +1381,9 @@
"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
"dev": true,
"requires": {
- "is-accessor-descriptor": "1.0.0",
- "is-data-descriptor": "1.0.0",
- "kind-of": "6.0.2"
+ "is-accessor-descriptor": "^1.0.0",
+ "is-data-descriptor": "^1.0.0",
+ "kind-of": "^6.0.2"
}
}
}
@@ -1406,7 +1406,7 @@
"integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
"dev": true,
"requires": {
- "escape-string-regexp": "1.0.5"
+ "escape-string-regexp": "^1.0.5"
}
},
"fill-range": {
@@ -1415,10 +1415,10 @@
"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
"dev": true,
"requires": {
- "extend-shallow": "2.0.1",
- "is-number": "3.0.0",
- "repeat-string": "1.6.1",
- "to-regex-range": "2.1.1"
+ "extend-shallow": "^2.0.1",
+ "is-number": "^3.0.0",
+ "repeat-string": "^1.6.1",
+ "to-regex-range": "^2.1.0"
},
"dependencies": {
"extend-shallow": {
@@ -1427,7 +1427,7 @@
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
- "is-extendable": "0.1.1"
+ "is-extendable": "^0.1.0"
}
}
}
@@ -1438,9 +1438,9 @@
"integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
"dev": true,
"requires": {
- "commondir": "1.0.1",
- "make-dir": "1.3.0",
- "pkg-dir": "2.0.0"
+ "commondir": "^1.0.1",
+ "make-dir": "^1.0.0",
+ "pkg-dir": "^2.0.0"
}
},
"find-up": {
@@ -1449,7 +1449,7 @@
"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
"dev": true,
"requires": {
- "locate-path": "2.0.0"
+ "locate-path": "^2.0.0"
}
},
"flush-write-stream": {
@@ -1458,8 +1458,8 @@
"integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
"dev": true,
"requires": {
- "inherits": "2.0.3",
- "readable-stream": "2.3.6"
+ "inherits": "^2.0.1",
+ "readable-stream": "^2.0.4"
}
},
"for-in": {
@@ -1474,7 +1474,7 @@
"integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
"dev": true,
"requires": {
- "map-cache": "0.2.2"
+ "map-cache": "^0.2.2"
}
},
"from2": {
@@ -1483,8 +1483,8 @@
"integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
"dev": true,
"requires": {
- "inherits": "2.0.3",
- "readable-stream": "2.3.6"
+ "inherits": "^2.0.1",
+ "readable-stream": "^2.0.0"
}
},
"fs-write-stream-atomic": {
@@ -1493,10 +1493,10 @@
"integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
"dev": true,
"requires": {
- "graceful-fs": "4.1.11",
- "iferr": "0.1.5",
- "imurmurhash": "0.1.4",
- "readable-stream": "2.3.6"
+ "graceful-fs": "^4.1.2",
+ "iferr": "^0.1.5",
+ "imurmurhash": "^0.1.4",
+ "readable-stream": "1 || 2"
}
},
"fs.realpath": {
@@ -1512,8 +1512,8 @@
"dev": true,
"optional": true,
"requires": {
- "nan": "2.10.0",
- "node-pre-gyp": "0.10.0"
+ "nan": "^2.9.2",
+ "node-pre-gyp": "^0.10.0"
},
"dependencies": {
"abbrev": {
@@ -1539,8 +1539,8 @@
"dev": true,
"optional": true,
"requires": {
- "delegates": "1.0.0",
- "readable-stream": "2.3.6"
+ "delegates": "^1.0.0",
+ "readable-stream": "^2.0.6"
}
},
"balanced-match": {
@@ -1553,7 +1553,7 @@
"bundled": true,
"dev": true,
"requires": {
- "balanced-match": "1.0.0",
+ "balanced-match": "^1.0.0",
"concat-map": "0.0.1"
}
},
@@ -1617,7 +1617,7 @@
"dev": true,
"optional": true,
"requires": {
- "minipass": "2.2.4"
+ "minipass": "^2.2.1"
}
},
"fs.realpath": {
@@ -1632,14 +1632,14 @@
"dev": true,
"optional": true,
"requires": {
- "aproba": "1.2.0",
- "console-control-strings": "1.1.0",
- "has-unicode": "2.0.1",
- "object-assign": "4.1.1",
- "signal-exit": "3.0.2",
- "string-width": "1.0.2",
- "strip-ansi": "3.0.1",
- "wide-align": "1.1.2"
+ "aproba": "^1.0.3",
+ "console-control-strings": "^1.0.0",
+ "has-unicode": "^2.0.0",
+ "object-assign": "^4.1.0",
+ "signal-exit": "^3.0.0",
+ "string-width": "^1.0.1",
+ "strip-ansi": "^3.0.1",
+ "wide-align": "^1.1.0"
}
},
"glob": {
@@ -1648,12 +1648,12 @@
"dev": true,
"optional": true,
"requires": {
- "fs.realpath": "1.0.0",
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
}
},
"has-unicode": {
@@ -1668,7 +1668,7 @@
"dev": true,
"optional": true,
"requires": {
- "safer-buffer": "2.1.2"
+ "safer-buffer": "^2.1.0"
}
},
"ignore-walk": {
@@ -1677,7 +1677,7 @@
"dev": true,
"optional": true,
"requires": {
- "minimatch": "3.0.4"
+ "minimatch": "^3.0.4"
}
},
"inflight": {
@@ -1686,8 +1686,8 @@
"dev": true,
"optional": true,
"requires": {
- "once": "1.4.0",
- "wrappy": "1.0.2"
+ "once": "^1.3.0",
+ "wrappy": "1"
}
},
"inherits": {
@@ -1706,7 +1706,7 @@
"bundled": true,
"dev": true,
"requires": {
- "number-is-nan": "1.0.1"
+ "number-is-nan": "^1.0.0"
}
},
"isarray": {
@@ -1720,7 +1720,7 @@
"bundled": true,
"dev": true,
"requires": {
- "brace-expansion": "1.1.11"
+ "brace-expansion": "^1.1.7"
}
},
"minimist": {
@@ -1733,8 +1733,8 @@
"bundled": true,
"dev": true,
"requires": {
- "safe-buffer": "5.1.1",
- "yallist": "3.0.2"
+ "safe-buffer": "^5.1.1",
+ "yallist": "^3.0.0"
}
},
"minizlib": {
@@ -1743,7 +1743,7 @@
"dev": true,
"optional": true,
"requires": {
- "minipass": "2.2.4"
+ "minipass": "^2.2.1"
}
},
"mkdirp": {
@@ -1766,9 +1766,9 @@
"dev": true,
"optional": true,
"requires": {
- "debug": "2.6.9",
- "iconv-lite": "0.4.21",
- "sax": "1.2.4"
+ "debug": "^2.1.2",
+ "iconv-lite": "^0.4.4",
+ "sax": "^1.2.4"
}
},
"node-pre-gyp": {
@@ -1777,16 +1777,16 @@
"dev": true,
"optional": true,
"requires": {
- "detect-libc": "1.0.3",
- "mkdirp": "0.5.1",
- "needle": "2.2.0",
- "nopt": "4.0.1",
- "npm-packlist": "1.1.10",
- "npmlog": "4.1.2",
- "rc": "1.2.7",
- "rimraf": "2.6.2",
- "semver": "5.5.0",
- "tar": "4.4.1"
+ "detect-libc": "^1.0.2",
+ "mkdirp": "^0.5.1",
+ "needle": "^2.2.0",
+ "nopt": "^4.0.1",
+ "npm-packlist": "^1.1.6",
+ "npmlog": "^4.0.2",
+ "rc": "^1.1.7",
+ "rimraf": "^2.6.1",
+ "semver": "^5.3.0",
+ "tar": "^4"
}
},
"nopt": {
@@ -1795,8 +1795,8 @@
"dev": true,
"optional": true,
"requires": {
- "abbrev": "1.1.1",
- "osenv": "0.1.5"
+ "abbrev": "1",
+ "osenv": "^0.1.4"
}
},
"npm-bundled": {
@@ -1811,8 +1811,8 @@
"dev": true,
"optional": true,
"requires": {
- "ignore-walk": "3.0.1",
- "npm-bundled": "1.0.3"
+ "ignore-walk": "^3.0.1",
+ "npm-bundled": "^1.0.1"
}
},
"npmlog": {
@@ -1821,10 +1821,10 @@
"dev": true,
"optional": true,
"requires": {
- "are-we-there-yet": "1.1.4",
- "console-control-strings": "1.1.0",
- "gauge": "2.7.4",
- "set-blocking": "2.0.0"
+ "are-we-there-yet": "~1.1.2",
+ "console-control-strings": "~1.1.0",
+ "gauge": "~2.7.3",
+ "set-blocking": "~2.0.0"
}
},
"number-is-nan": {
@@ -1843,7 +1843,7 @@
"bundled": true,
"dev": true,
"requires": {
- "wrappy": "1.0.2"
+ "wrappy": "1"
}
},
"os-homedir": {
@@ -1864,8 +1864,8 @@
"dev": true,
"optional": true,
"requires": {
- "os-homedir": "1.0.2",
- "os-tmpdir": "1.0.2"
+ "os-homedir": "^1.0.0",
+ "os-tmpdir": "^1.0.0"
}
},
"path-is-absolute": {
@@ -1886,10 +1886,10 @@
"dev": true,
"optional": true,
"requires": {
- "deep-extend": "0.5.1",
- "ini": "1.3.5",
- "minimist": "1.2.0",
- "strip-json-comments": "2.0.1"
+ "deep-extend": "^0.5.1",
+ "ini": "~1.3.0",
+ "minimist": "^1.2.0",
+ "strip-json-comments": "~2.0.1"
},
"dependencies": {
"minimist": {
@@ -1906,13 +1906,13 @@
"dev": true,
"optional": true,
"requires": {
- "core-util-is": "1.0.2",
- "inherits": "2.0.3",
- "isarray": "1.0.0",
- "process-nextick-args": "2.0.0",
- "safe-buffer": "5.1.1",
- "string_decoder": "1.1.1",
- "util-deprecate": "1.0.2"
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
}
},
"rimraf": {
@@ -1921,7 +1921,7 @@
"dev": true,
"optional": true,
"requires": {
- "glob": "7.1.2"
+ "glob": "^7.0.5"
}
},
"safe-buffer": {
@@ -1964,9 +1964,9 @@
"bundled": true,
"dev": true,
"requires": {
- "code-point-at": "1.1.0",
- "is-fullwidth-code-point": "1.0.0",
- "strip-ansi": "3.0.1"
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
}
},
"string_decoder": {
@@ -1975,7 +1975,7 @@
"dev": true,
"optional": true,
"requires": {
- "safe-buffer": "5.1.1"
+ "safe-buffer": "~5.1.0"
}
},
"strip-ansi": {
@@ -1983,7 +1983,7 @@
"bundled": true,
"dev": true,
"requires": {
- "ansi-regex": "2.1.1"
+ "ansi-regex": "^2.0.0"
}
},
"strip-json-comments": {
@@ -1998,13 +1998,13 @@
"dev": true,
"optional": true,
"requires": {
- "chownr": "1.0.1",
- "fs-minipass": "1.2.5",
- "minipass": "2.2.4",
- "minizlib": "1.1.0",
- "mkdirp": "0.5.1",
- "safe-buffer": "5.1.1",
- "yallist": "3.0.2"
+ "chownr": "^1.0.1",
+ "fs-minipass": "^1.2.5",
+ "minipass": "^2.2.4",
+ "minizlib": "^1.1.0",
+ "mkdirp": "^0.5.0",
+ "safe-buffer": "^5.1.1",
+ "yallist": "^3.0.2"
}
},
"util-deprecate": {
@@ -2019,7 +2019,7 @@
"dev": true,
"optional": true,
"requires": {
- "string-width": "1.0.2"
+ "string-width": "^1.0.2"
}
},
"wrappy": {
@@ -2058,12 +2058,12 @@
"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
"dev": true,
"requires": {
- "fs.realpath": "1.0.0",
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
}
},
"glob-parent": {
@@ -2072,8 +2072,8 @@
"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
"dev": true,
"requires": {
- "is-glob": "3.1.0",
- "path-dirname": "1.0.2"
+ "is-glob": "^3.1.0",
+ "path-dirname": "^1.0.0"
},
"dependencies": {
"is-glob": {
@@ -2082,7 +2082,7 @@
"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
"dev": true,
"requires": {
- "is-extglob": "2.1.1"
+ "is-extglob": "^2.1.0"
}
}
}
@@ -2111,9 +2111,9 @@
"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
"dev": true,
"requires": {
- "get-value": "2.0.6",
- "has-values": "1.0.0",
- "isobject": "3.0.1"
+ "get-value": "^2.0.6",
+ "has-values": "^1.0.0",
+ "isobject": "^3.0.0"
}
},
"has-values": {
@@ -2122,8 +2122,8 @@
"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
"dev": true,
"requires": {
- "is-number": "3.0.0",
- "kind-of": "4.0.0"
+ "is-number": "^3.0.0",
+ "kind-of": "^4.0.0"
},
"dependencies": {
"kind-of": {
@@ -2132,7 +2132,7 @@
"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -2143,8 +2143,8 @@
"integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
"dev": true,
"requires": {
- "inherits": "2.0.3",
- "safe-buffer": "5.1.2"
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.0.1"
}
},
"hash.js": {
@@ -2153,8 +2153,8 @@
"integrity": "sha512-A6RlQvvZEtFS5fLU43IDu0QUmBy+fDO9VMdTXvufKwIkt/rFfvICAViCax5fbDO4zdNzaC3/27ZhKUok5bAJyw==",
"dev": true,
"requires": {
- "inherits": "2.0.3",
- "minimalistic-assert": "1.0.1"
+ "inherits": "^2.0.3",
+ "minimalistic-assert": "^1.0.0"
}
},
"hmac-drbg": {
@@ -2163,9 +2163,9 @@
"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
"dev": true,
"requires": {
- "hash.js": "1.1.4",
- "minimalistic-assert": "1.0.1",
- "minimalistic-crypto-utils": "1.0.1"
+ "hash.js": "^1.0.3",
+ "minimalistic-assert": "^1.0.0",
+ "minimalistic-crypto-utils": "^1.0.1"
}
},
"https-browserify": {
@@ -2180,7 +2180,7 @@
"integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
"dev": true,
"requires": {
- "safer-buffer": "2.1.2"
+ "safer-buffer": ">= 2.1.2 < 3"
}
},
"ieee754": {
@@ -2201,8 +2201,8 @@
"integrity": "sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==",
"dev": true,
"requires": {
- "pkg-dir": "2.0.0",
- "resolve-cwd": "2.0.0"
+ "pkg-dir": "^2.0.0",
+ "resolve-cwd": "^2.0.0"
}
},
"imurmurhash": {
@@ -2223,8 +2223,8 @@
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"dev": true,
"requires": {
- "once": "1.4.0",
- "wrappy": "1.0.2"
+ "once": "^1.3.0",
+ "wrappy": "1"
}
},
"inherits": {
@@ -2239,19 +2239,19 @@
"integrity": "sha512-tISQWRwtcAgrz+SHPhTH7d3e73k31gsOy6i1csonLc0u1dVK/wYvuOnFeiWqC5OXFIYbmrIFInef31wbT8MEJg==",
"dev": true,
"requires": {
- "ansi-escapes": "3.1.0",
- "chalk": "2.4.1",
- "cli-cursor": "2.1.0",
- "cli-width": "2.2.0",
- "external-editor": "3.0.0",
- "figures": "2.0.0",
- "lodash": "4.17.10",
+ "ansi-escapes": "^3.0.0",
+ "chalk": "^2.0.0",
+ "cli-cursor": "^2.1.0",
+ "cli-width": "^2.0.0",
+ "external-editor": "^3.0.0",
+ "figures": "^2.0.0",
+ "lodash": "^4.3.0",
"mute-stream": "0.0.7",
- "run-async": "2.3.0",
- "rxjs": "6.2.1",
- "string-width": "2.1.1",
- "strip-ansi": "4.0.0",
- "through": "2.3.8"
+ "run-async": "^2.2.0",
+ "rxjs": "^6.1.0",
+ "string-width": "^2.1.0",
+ "strip-ansi": "^4.0.0",
+ "through": "^2.3.6"
}
},
"interpret": {
@@ -2272,7 +2272,7 @@
"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -2281,7 +2281,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -2292,7 +2292,7 @@
"integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
"dev": true,
"requires": {
- "binary-extensions": "1.11.0"
+ "binary-extensions": "^1.0.0"
}
},
"is-buffer": {
@@ -2307,7 +2307,7 @@
"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -2316,7 +2316,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -2327,9 +2327,9 @@
"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
"dev": true,
"requires": {
- "is-accessor-descriptor": "0.1.6",
- "is-data-descriptor": "0.1.4",
- "kind-of": "5.1.0"
+ "is-accessor-descriptor": "^0.1.6",
+ "is-data-descriptor": "^0.1.4",
+ "kind-of": "^5.0.0"
},
"dependencies": {
"kind-of": {
@@ -2364,7 +2364,7 @@
"integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
"dev": true,
"requires": {
- "is-extglob": "2.1.1"
+ "is-extglob": "^2.1.1"
}
},
"is-number": {
@@ -2373,7 +2373,7 @@
"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -2382,7 +2382,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -2393,7 +2393,7 @@
"integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
"dev": true,
"requires": {
- "is-number": "4.0.0"
+ "is-number": "^4.0.0"
},
"dependencies": {
"is-number": {
@@ -2410,7 +2410,7 @@
"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
"dev": true,
"requires": {
- "isobject": "3.0.1"
+ "isobject": "^3.0.1"
}
},
"is-promise": {
@@ -2479,7 +2479,7 @@
"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
"dev": true,
"requires": {
- "invert-kv": "1.0.0"
+ "invert-kv": "^1.0.0"
}
},
"leb": {
@@ -2500,9 +2500,9 @@
"integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
"dev": true,
"requires": {
- "big.js": "3.2.0",
- "emojis-list": "2.1.0",
- "json5": "0.5.1"
+ "big.js": "^3.1.3",
+ "emojis-list": "^2.0.0",
+ "json5": "^0.5.0"
}
},
"locate-path": {
@@ -2511,8 +2511,8 @@
"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
"dev": true,
"requires": {
- "p-locate": "2.0.0",
- "path-exists": "3.0.0"
+ "p-locate": "^2.0.0",
+ "path-exists": "^3.0.0"
}
},
"lodash": {
@@ -2539,8 +2539,8 @@
"integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
"dev": true,
"requires": {
- "pseudomap": "1.0.2",
- "yallist": "2.1.2"
+ "pseudomap": "^1.0.2",
+ "yallist": "^2.1.2"
}
},
"make-dir": {
@@ -2549,7 +2549,7 @@
"integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
"dev": true,
"requires": {
- "pify": "3.0.0"
+ "pify": "^3.0.0"
}
},
"mamacro": {
@@ -2570,7 +2570,7 @@
"integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
"dev": true,
"requires": {
- "object-visit": "1.0.1"
+ "object-visit": "^1.0.0"
}
},
"md5.js": {
@@ -2579,8 +2579,8 @@
"integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
"dev": true,
"requires": {
- "hash-base": "3.0.4",
- "inherits": "2.0.3"
+ "hash-base": "^3.0.0",
+ "inherits": "^2.0.1"
}
},
"mem": {
@@ -2589,7 +2589,7 @@
"integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
"dev": true,
"requires": {
- "mimic-fn": "1.2.0"
+ "mimic-fn": "^1.0.0"
}
},
"memory-fs": {
@@ -2598,8 +2598,8 @@
"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
"dev": true,
"requires": {
- "errno": "0.1.7",
- "readable-stream": "2.3.6"
+ "errno": "^0.1.3",
+ "readable-stream": "^2.0.1"
}
},
"micromatch": {
@@ -2608,19 +2608,19 @@
"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
"dev": true,
"requires": {
- "arr-diff": "4.0.0",
- "array-unique": "0.3.2",
- "braces": "2.3.2",
- "define-property": "2.0.2",
- "extend-shallow": "3.0.2",
- "extglob": "2.0.4",
- "fragment-cache": "0.2.1",
- "kind-of": "6.0.2",
- "nanomatch": "1.2.9",
- "object.pick": "1.3.0",
- "regex-not": "1.0.2",
- "snapdragon": "0.8.2",
- "to-regex": "3.0.2"
+ "arr-diff": "^4.0.0",
+ "array-unique": "^0.3.2",
+ "braces": "^2.3.1",
+ "define-property": "^2.0.2",
+ "extend-shallow": "^3.0.2",
+ "extglob": "^2.0.4",
+ "fragment-cache": "^0.2.1",
+ "kind-of": "^6.0.2",
+ "nanomatch": "^1.2.9",
+ "object.pick": "^1.3.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.2"
}
},
"miller-rabin": {
@@ -2629,8 +2629,8 @@
"integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
"dev": true,
"requires": {
- "bn.js": "4.11.8",
- "brorand": "1.1.0"
+ "bn.js": "^4.0.0",
+ "brorand": "^1.0.1"
}
},
"mimic-fn": {
@@ -2657,7 +2657,7 @@
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"dev": true,
"requires": {
- "brace-expansion": "1.1.11"
+ "brace-expansion": "^1.1.7"
}
},
"mississippi": {
@@ -2666,16 +2666,16 @@
"integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
"dev": true,
"requires": {
- "concat-stream": "1.6.2",
- "duplexify": "3.6.0",
- "end-of-stream": "1.4.1",
- "flush-write-stream": "1.0.3",
- "from2": "2.3.0",
- "parallel-transform": "1.1.0",
- "pump": "2.0.1",
- "pumpify": "1.5.1",
- "stream-each": "1.2.2",
- "through2": "2.0.3"
+ "concat-stream": "^1.5.0",
+ "duplexify": "^3.4.2",
+ "end-of-stream": "^1.1.0",
+ "flush-write-stream": "^1.0.0",
+ "from2": "^2.1.0",
+ "parallel-transform": "^1.1.0",
+ "pump": "^2.0.1",
+ "pumpify": "^1.3.3",
+ "stream-each": "^1.1.0",
+ "through2": "^2.0.0"
}
},
"mixin-deep": {
@@ -2684,8 +2684,8 @@
"integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
"dev": true,
"requires": {
- "for-in": "1.0.2",
- "is-extendable": "1.0.1"
+ "for-in": "^1.0.2",
+ "is-extendable": "^1.0.1"
},
"dependencies": {
"is-extendable": {
@@ -2694,7 +2694,7 @@
"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
"dev": true,
"requires": {
- "is-plain-object": "2.0.4"
+ "is-plain-object": "^2.0.4"
}
}
}
@@ -2722,12 +2722,12 @@
"integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
"dev": true,
"requires": {
- "aproba": "1.2.0",
- "copy-concurrently": "1.0.5",
- "fs-write-stream-atomic": "1.0.10",
- "mkdirp": "0.5.1",
- "rimraf": "2.6.2",
- "run-queue": "1.0.3"
+ "aproba": "^1.1.1",
+ "copy-concurrently": "^1.0.0",
+ "fs-write-stream-atomic": "^1.0.8",
+ "mkdirp": "^0.5.1",
+ "rimraf": "^2.5.4",
+ "run-queue": "^1.0.3"
}
},
"ms": {
@@ -2742,10 +2742,10 @@
"integrity": "sha512-tQkRlwO4f3/E8Kq5qm6PcVw+J+K4+U/XNqeD9Ebo1qVsrjkcKb2FfmdtuuIslw42CGT+K3ZVKAvKfSPp3QRplQ==",
"dev": true,
"requires": {
- "bl": "2.0.1",
- "inherits": "2.0.3",
- "readable-stream": "2.3.6",
- "safe-buffer": "5.1.2"
+ "bl": "^2.0.0",
+ "inherits": "^2.0.3",
+ "readable-stream": "^2.3.6",
+ "safe-buffer": "^5.1.2"
}
},
"mute-stream": {
@@ -2767,18 +2767,18 @@
"integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==",
"dev": true,
"requires": {
- "arr-diff": "4.0.0",
- "array-unique": "0.3.2",
- "define-property": "2.0.2",
- "extend-shallow": "3.0.2",
- "fragment-cache": "0.2.1",
- "is-odd": "2.0.0",
- "is-windows": "1.0.2",
- "kind-of": "6.0.2",
- "object.pick": "1.3.0",
- "regex-not": "1.0.2",
- "snapdragon": "0.8.2",
- "to-regex": "3.0.2"
+ "arr-diff": "^4.0.0",
+ "array-unique": "^0.3.2",
+ "define-property": "^2.0.2",
+ "extend-shallow": "^3.0.2",
+ "fragment-cache": "^0.2.1",
+ "is-odd": "^2.0.0",
+ "is-windows": "^1.0.2",
+ "kind-of": "^6.0.2",
+ "object.pick": "^1.3.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
}
},
"neo-async": {
@@ -2799,28 +2799,28 @@
"integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==",
"dev": true,
"requires": {
- "assert": "1.4.1",
- "browserify-zlib": "0.2.0",
- "buffer": "4.9.1",
- "console-browserify": "1.1.0",
- "constants-browserify": "1.0.0",
- "crypto-browserify": "3.12.0",
- "domain-browser": "1.2.0",
- "events": "1.1.1",
- "https-browserify": "1.0.0",
- "os-browserify": "0.3.0",
+ "assert": "^1.1.1",
+ "browserify-zlib": "^0.2.0",
+ "buffer": "^4.3.0",
+ "console-browserify": "^1.1.0",
+ "constants-browserify": "^1.0.0",
+ "crypto-browserify": "^3.11.0",
+ "domain-browser": "^1.1.1",
+ "events": "^1.0.0",
+ "https-browserify": "^1.0.0",
+ "os-browserify": "^0.3.0",
"path-browserify": "0.0.0",
- "process": "0.11.10",
- "punycode": "1.4.1",
- "querystring-es3": "0.2.1",
- "readable-stream": "2.3.6",
- "stream-browserify": "2.0.1",
- "stream-http": "2.8.3",
- "string_decoder": "1.1.1",
- "timers-browserify": "2.0.10",
+ "process": "^0.11.10",
+ "punycode": "^1.2.4",
+ "querystring-es3": "^0.2.0",
+ "readable-stream": "^2.3.3",
+ "stream-browserify": "^2.0.1",
+ "stream-http": "^2.7.2",
+ "string_decoder": "^1.0.0",
+ "timers-browserify": "^2.0.4",
"tty-browserify": "0.0.0",
- "url": "0.11.0",
- "util": "0.10.4",
+ "url": "^0.11.0",
+ "util": "^0.10.3",
"vm-browserify": "0.0.4"
},
"dependencies": {
@@ -2838,7 +2838,7 @@
"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
"dev": true,
"requires": {
- "remove-trailing-separator": "1.1.0"
+ "remove-trailing-separator": "^1.0.1"
}
},
"npm-run-path": {
@@ -2847,7 +2847,7 @@
"integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
"dev": true,
"requires": {
- "path-key": "2.0.1"
+ "path-key": "^2.0.0"
}
},
"number-is-nan": {
@@ -2862,9 +2862,9 @@
"integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
"dev": true,
"requires": {
- "copy-descriptor": "0.1.1",
- "define-property": "0.2.5",
- "kind-of": "3.2.2"
+ "copy-descriptor": "^0.1.0",
+ "define-property": "^0.2.5",
+ "kind-of": "^3.0.3"
},
"dependencies": {
"define-property": {
@@ -2873,7 +2873,7 @@
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
"dev": true,
"requires": {
- "is-descriptor": "0.1.6"
+ "is-descriptor": "^0.1.0"
}
},
"kind-of": {
@@ -2882,7 +2882,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -2893,7 +2893,7 @@
"integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
"dev": true,
"requires": {
- "isobject": "3.0.1"
+ "isobject": "^3.0.0"
}
},
"object.pick": {
@@ -2902,7 +2902,7 @@
"integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
"dev": true,
"requires": {
- "isobject": "3.0.1"
+ "isobject": "^3.0.1"
}
},
"once": {
@@ -2911,7 +2911,7 @@
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"dev": true,
"requires": {
- "wrappy": "1.0.2"
+ "wrappy": "1"
}
},
"onetime": {
@@ -2920,7 +2920,7 @@
"integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
"dev": true,
"requires": {
- "mimic-fn": "1.2.0"
+ "mimic-fn": "^1.0.0"
}
},
"os-browserify": {
@@ -2935,9 +2935,9 @@
"integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
"dev": true,
"requires": {
- "execa": "0.7.0",
- "lcid": "1.0.0",
- "mem": "1.1.0"
+ "execa": "^0.7.0",
+ "lcid": "^1.0.0",
+ "mem": "^1.1.0"
}
},
"os-tmpdir": {
@@ -2958,7 +2958,7 @@
"integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
"dev": true,
"requires": {
- "p-try": "1.0.0"
+ "p-try": "^1.0.0"
}
},
"p-locate": {
@@ -2967,7 +2967,7 @@
"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
"dev": true,
"requires": {
- "p-limit": "1.3.0"
+ "p-limit": "^1.1.0"
}
},
"p-try": {
@@ -2988,9 +2988,9 @@
"integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
"dev": true,
"requires": {
- "cyclist": "0.2.2",
- "inherits": "2.0.3",
- "readable-stream": "2.3.6"
+ "cyclist": "~0.2.2",
+ "inherits": "^2.0.3",
+ "readable-stream": "^2.1.5"
}
},
"parse-asn1": {
@@ -2999,11 +2999,11 @@
"integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
"dev": true,
"requires": {
- "asn1.js": "4.10.1",
- "browserify-aes": "1.2.0",
- "create-hash": "1.2.0",
- "evp_bytestokey": "1.0.3",
- "pbkdf2": "3.0.16"
+ "asn1.js": "^4.0.0",
+ "browserify-aes": "^1.0.0",
+ "create-hash": "^1.1.0",
+ "evp_bytestokey": "^1.0.0",
+ "pbkdf2": "^3.0.3"
}
},
"pascalcase": {
@@ -3048,11 +3048,11 @@
"integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
"dev": true,
"requires": {
- "create-hash": "1.2.0",
- "create-hmac": "1.1.7",
- "ripemd160": "2.0.2",
- "safe-buffer": "5.1.2",
- "sha.js": "2.4.11"
+ "create-hash": "^1.1.2",
+ "create-hmac": "^1.1.4",
+ "ripemd160": "^2.0.1",
+ "safe-buffer": "^5.0.1",
+ "sha.js": "^2.4.8"
}
},
"pify": {
@@ -3067,7 +3067,7 @@
"integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
"dev": true,
"requires": {
- "find-up": "2.1.0"
+ "find-up": "^2.1.0"
}
},
"posix-character-classes": {
@@ -3112,11 +3112,11 @@
"integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
"dev": true,
"requires": {
- "bn.js": "4.11.8",
- "browserify-rsa": "4.0.1",
- "create-hash": "1.2.0",
- "parse-asn1": "5.1.1",
- "randombytes": "2.0.6"
+ "bn.js": "^4.1.0",
+ "browserify-rsa": "^4.0.0",
+ "create-hash": "^1.1.0",
+ "parse-asn1": "^5.0.0",
+ "randombytes": "^2.0.1"
}
},
"pump": {
@@ -3125,8 +3125,8 @@
"integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
"dev": true,
"requires": {
- "end-of-stream": "1.4.1",
- "once": "1.4.0"
+ "end-of-stream": "^1.1.0",
+ "once": "^1.3.1"
}
},
"pumpify": {
@@ -3135,9 +3135,9 @@
"integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
"dev": true,
"requires": {
- "duplexify": "3.6.0",
- "inherits": "2.0.3",
- "pump": "2.0.1"
+ "duplexify": "^3.6.0",
+ "inherits": "^2.0.3",
+ "pump": "^2.0.0"
}
},
"punycode": {
@@ -3164,7 +3164,7 @@
"integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
"dev": true,
"requires": {
- "safe-buffer": "5.1.2"
+ "safe-buffer": "^5.1.0"
}
},
"randomfill": {
@@ -3173,8 +3173,8 @@
"integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
"dev": true,
"requires": {
- "randombytes": "2.0.6",
- "safe-buffer": "5.1.2"
+ "randombytes": "^2.0.5",
+ "safe-buffer": "^5.1.0"
}
},
"readable-stream": {
@@ -3183,13 +3183,13 @@
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
"dev": true,
"requires": {
- "core-util-is": "1.0.2",
- "inherits": "2.0.3",
- "isarray": "1.0.0",
- "process-nextick-args": "2.0.0",
- "safe-buffer": "5.1.2",
- "string_decoder": "1.1.1",
- "util-deprecate": "1.0.2"
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
}
},
"readdirp": {
@@ -3198,10 +3198,10 @@
"integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
"dev": true,
"requires": {
- "graceful-fs": "4.1.11",
- "minimatch": "3.0.4",
- "readable-stream": "2.3.6",
- "set-immediate-shim": "1.0.1"
+ "graceful-fs": "^4.1.2",
+ "minimatch": "^3.0.2",
+ "readable-stream": "^2.0.2",
+ "set-immediate-shim": "^1.0.1"
}
},
"regex-not": {
@@ -3210,8 +3210,8 @@
"integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
"dev": true,
"requires": {
- "extend-shallow": "3.0.2",
- "safe-regex": "1.1.0"
+ "extend-shallow": "^3.0.2",
+ "safe-regex": "^1.1.0"
}
},
"remove-trailing-separator": {
@@ -3250,7 +3250,7 @@
"integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
"dev": true,
"requires": {
- "resolve-from": "3.0.0"
+ "resolve-from": "^3.0.0"
}
},
"resolve-from": {
@@ -3271,8 +3271,8 @@
"integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
"dev": true,
"requires": {
- "onetime": "2.0.1",
- "signal-exit": "3.0.2"
+ "onetime": "^2.0.0",
+ "signal-exit": "^3.0.2"
}
},
"ret": {
@@ -3287,7 +3287,7 @@
"integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
"dev": true,
"requires": {
- "glob": "7.1.2"
+ "glob": "^7.0.5"
}
},
"ripemd160": {
@@ -3296,8 +3296,8 @@
"integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
"dev": true,
"requires": {
- "hash-base": "3.0.4",
- "inherits": "2.0.3"
+ "hash-base": "^3.0.0",
+ "inherits": "^2.0.1"
}
},
"run-async": {
@@ -3306,7 +3306,7 @@
"integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
"dev": true,
"requires": {
- "is-promise": "2.1.0"
+ "is-promise": "^2.1.0"
}
},
"run-queue": {
@@ -3315,7 +3315,7 @@
"integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
"dev": true,
"requires": {
- "aproba": "1.2.0"
+ "aproba": "^1.1.1"
}
},
"rxjs": {
@@ -3324,7 +3324,7 @@
"integrity": "sha512-OwMxHxmnmHTUpgO+V7dZChf3Tixf4ih95cmXjzzadULziVl/FKhHScGLj4goEw9weePVOH2Q0+GcCBUhKCZc/g==",
"dev": true,
"requires": {
- "tslib": "1.9.2"
+ "tslib": "^1.9.0"
}
},
"safe-buffer": {
@@ -3339,7 +3339,7 @@
"integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
"dev": true,
"requires": {
- "ret": "0.1.15"
+ "ret": "~0.1.10"
}
},
"safer-buffer": {
@@ -3354,8 +3354,8 @@
"integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
"dev": true,
"requires": {
- "ajv": "6.5.1",
- "ajv-keywords": "3.2.0"
+ "ajv": "^6.1.0",
+ "ajv-keywords": "^3.1.0"
}
},
"semver": {
@@ -3388,10 +3388,10 @@
"integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
"dev": true,
"requires": {
- "extend-shallow": "2.0.1",
- "is-extendable": "0.1.1",
- "is-plain-object": "2.0.4",
- "split-string": "3.1.0"
+ "extend-shallow": "^2.0.1",
+ "is-extendable": "^0.1.1",
+ "is-plain-object": "^2.0.3",
+ "split-string": "^3.0.1"
},
"dependencies": {
"extend-shallow": {
@@ -3400,7 +3400,7 @@
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
- "is-extendable": "0.1.1"
+ "is-extendable": "^0.1.0"
}
}
}
@@ -3417,8 +3417,8 @@
"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
"dev": true,
"requires": {
- "inherits": "2.0.3",
- "safe-buffer": "5.1.2"
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.0.1"
}
},
"shebang-command": {
@@ -3427,7 +3427,7 @@
"integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
"dev": true,
"requires": {
- "shebang-regex": "1.0.0"
+ "shebang-regex": "^1.0.0"
}
},
"shebang-regex": {
@@ -3448,14 +3448,14 @@
"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
"dev": true,
"requires": {
- "base": "0.11.2",
- "debug": "2.6.9",
- "define-property": "0.2.5",
- "extend-shallow": "2.0.1",
- "map-cache": "0.2.2",
- "source-map": "0.5.7",
- "source-map-resolve": "0.5.2",
- "use": "3.1.0"
+ "base": "^0.11.1",
+ "debug": "^2.2.0",
+ "define-property": "^0.2.5",
+ "extend-shallow": "^2.0.1",
+ "map-cache": "^0.2.2",
+ "source-map": "^0.5.6",
+ "source-map-resolve": "^0.5.0",
+ "use": "^3.1.0"
},
"dependencies": {
"define-property": {
@@ -3464,7 +3464,7 @@
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
"dev": true,
"requires": {
- "is-descriptor": "0.1.6"
+ "is-descriptor": "^0.1.0"
}
},
"extend-shallow": {
@@ -3473,7 +3473,7 @@
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
- "is-extendable": "0.1.1"
+ "is-extendable": "^0.1.0"
}
}
}
@@ -3484,9 +3484,9 @@
"integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
"dev": true,
"requires": {
- "define-property": "1.0.0",
- "isobject": "3.0.1",
- "snapdragon-util": "3.0.1"
+ "define-property": "^1.0.0",
+ "isobject": "^3.0.0",
+ "snapdragon-util": "^3.0.1"
},
"dependencies": {
"define-property": {
@@ -3495,7 +3495,7 @@
"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
"dev": true,
"requires": {
- "is-descriptor": "1.0.2"
+ "is-descriptor": "^1.0.0"
}
},
"is-accessor-descriptor": {
@@ -3504,7 +3504,7 @@
"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
"dev": true,
"requires": {
- "kind-of": "6.0.2"
+ "kind-of": "^6.0.0"
}
},
"is-data-descriptor": {
@@ -3513,7 +3513,7 @@
"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
"dev": true,
"requires": {
- "kind-of": "6.0.2"
+ "kind-of": "^6.0.0"
}
},
"is-descriptor": {
@@ -3522,9 +3522,9 @@
"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
"dev": true,
"requires": {
- "is-accessor-descriptor": "1.0.0",
- "is-data-descriptor": "1.0.0",
- "kind-of": "6.0.2"
+ "is-accessor-descriptor": "^1.0.0",
+ "is-data-descriptor": "^1.0.0",
+ "kind-of": "^6.0.2"
}
}
}
@@ -3535,7 +3535,7 @@
"integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.2.0"
},
"dependencies": {
"kind-of": {
@@ -3544,7 +3544,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -3567,11 +3567,11 @@
"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
"dev": true,
"requires": {
- "atob": "2.1.1",
- "decode-uri-component": "0.2.0",
- "resolve-url": "0.2.1",
- "source-map-url": "0.4.0",
- "urix": "0.1.0"
+ "atob": "^2.1.1",
+ "decode-uri-component": "^0.2.0",
+ "resolve-url": "^0.2.1",
+ "source-map-url": "^0.4.0",
+ "urix": "^0.1.0"
}
},
"source-map-url": {
@@ -3586,7 +3586,7 @@
"integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
"dev": true,
"requires": {
- "extend-shallow": "3.0.2"
+ "extend-shallow": "^3.0.0"
}
},
"ssri": {
@@ -3595,7 +3595,7 @@
"integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
"dev": true,
"requires": {
- "safe-buffer": "5.1.2"
+ "safe-buffer": "^5.1.1"
}
},
"static-extend": {
@@ -3604,8 +3604,8 @@
"integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
"dev": true,
"requires": {
- "define-property": "0.2.5",
- "object-copy": "0.1.0"
+ "define-property": "^0.2.5",
+ "object-copy": "^0.1.0"
},
"dependencies": {
"define-property": {
@@ -3614,7 +3614,7 @@
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
"dev": true,
"requires": {
- "is-descriptor": "0.1.6"
+ "is-descriptor": "^0.1.0"
}
}
}
@@ -3625,8 +3625,8 @@
"integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
"dev": true,
"requires": {
- "inherits": "2.0.3",
- "readable-stream": "2.3.6"
+ "inherits": "~2.0.1",
+ "readable-stream": "^2.0.2"
}
},
"stream-each": {
@@ -3635,8 +3635,8 @@
"integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==",
"dev": true,
"requires": {
- "end-of-stream": "1.4.1",
- "stream-shift": "1.0.0"
+ "end-of-stream": "^1.1.0",
+ "stream-shift": "^1.0.0"
}
},
"stream-http": {
@@ -3645,11 +3645,11 @@
"integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
"dev": true,
"requires": {
- "builtin-status-codes": "3.0.0",
- "inherits": "2.0.3",
- "readable-stream": "2.3.6",
- "to-arraybuffer": "1.0.1",
- "xtend": "4.0.1"
+ "builtin-status-codes": "^3.0.0",
+ "inherits": "^2.0.1",
+ "readable-stream": "^2.3.6",
+ "to-arraybuffer": "^1.0.0",
+ "xtend": "^4.0.0"
}
},
"stream-shift": {
@@ -3664,8 +3664,8 @@
"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
"dev": true,
"requires": {
- "is-fullwidth-code-point": "2.0.0",
- "strip-ansi": "4.0.0"
+ "is-fullwidth-code-point": "^2.0.0",
+ "strip-ansi": "^4.0.0"
}
},
"string_decoder": {
@@ -3674,7 +3674,7 @@
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"dev": true,
"requires": {
- "safe-buffer": "5.1.2"
+ "safe-buffer": "~5.1.0"
}
},
"strip-ansi": {
@@ -3683,7 +3683,7 @@
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"dev": true,
"requires": {
- "ansi-regex": "3.0.0"
+ "ansi-regex": "^3.0.0"
}
},
"strip-eof": {
@@ -3698,7 +3698,7 @@
"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"dev": true,
"requires": {
- "has-flag": "3.0.0"
+ "has-flag": "^3.0.0"
}
},
"tapable": {
@@ -3719,8 +3719,8 @@
"integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
"dev": true,
"requires": {
- "readable-stream": "2.3.6",
- "xtend": "4.0.1"
+ "readable-stream": "^2.1.5",
+ "xtend": "~4.0.1"
}
},
"timers-browserify": {
@@ -3729,7 +3729,7 @@
"integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
"dev": true,
"requires": {
- "setimmediate": "1.0.5"
+ "setimmediate": "^1.0.4"
}
},
"tmp": {
@@ -3738,7 +3738,7 @@
"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
"dev": true,
"requires": {
- "os-tmpdir": "1.0.2"
+ "os-tmpdir": "~1.0.2"
}
},
"to-arraybuffer": {
@@ -3753,7 +3753,7 @@
"integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -3762,7 +3762,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -3773,10 +3773,10 @@
"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
"dev": true,
"requires": {
- "define-property": "2.0.2",
- "extend-shallow": "3.0.2",
- "regex-not": "1.0.2",
- "safe-regex": "1.1.0"
+ "define-property": "^2.0.2",
+ "extend-shallow": "^3.0.2",
+ "regex-not": "^1.0.2",
+ "safe-regex": "^1.1.0"
}
},
"to-regex-range": {
@@ -3785,8 +3785,8 @@
"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
"dev": true,
"requires": {
- "is-number": "3.0.0",
- "repeat-string": "1.6.1"
+ "is-number": "^3.0.0",
+ "repeat-string": "^1.6.1"
}
},
"ts-loader": {
@@ -3795,11 +3795,11 @@
"integrity": "sha512-PvL6jgVEt4RurczrTOR8uI6uRmKRfRXiv3CyMRX8+MSQLlbedfbXtbJIdkhdpbqrsumb+Lc3qrxfmXHCmODyAg==",
"dev": true,
"requires": {
- "chalk": "2.4.1",
- "enhanced-resolve": "4.0.0",
- "loader-utils": "1.1.0",
- "micromatch": "3.1.10",
- "semver": "5.5.0"
+ "chalk": "^2.3.0",
+ "enhanced-resolve": "^4.0.0",
+ "loader-utils": "^1.0.2",
+ "micromatch": "^3.1.4",
+ "semver": "^5.0.1"
}
},
"tslib": {
@@ -3832,8 +3832,8 @@
"integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
"dev": true,
"requires": {
- "commander": "2.13.0",
- "source-map": "0.6.1"
+ "commander": "~2.13.0",
+ "source-map": "~0.6.1"
},
"dependencies": {
"source-map": {
@@ -3850,14 +3850,14 @@
"integrity": "sha512-hIQJ1yxAPhEA2yW/i7Fr+SXZVMp+VEI3d42RTHBgQd2yhp/1UdBcR3QEWPV5ahBxlqQDMEMTuTEvDHSFINfwSw==",
"dev": true,
"requires": {
- "cacache": "10.0.4",
- "find-cache-dir": "1.0.0",
- "schema-utils": "0.4.5",
- "serialize-javascript": "1.5.0",
- "source-map": "0.6.1",
- "uglify-es": "3.3.9",
- "webpack-sources": "1.1.0",
- "worker-farm": "1.6.0"
+ "cacache": "^10.0.4",
+ "find-cache-dir": "^1.0.0",
+ "schema-utils": "^0.4.5",
+ "serialize-javascript": "^1.4.0",
+ "source-map": "^0.6.1",
+ "uglify-es": "^3.3.4",
+ "webpack-sources": "^1.1.0",
+ "worker-farm": "^1.5.2"
},
"dependencies": {
"source-map": {
@@ -3874,10 +3874,10 @@
"integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
"dev": true,
"requires": {
- "arr-union": "3.1.0",
- "get-value": "2.0.6",
- "is-extendable": "0.1.1",
- "set-value": "0.4.3"
+ "arr-union": "^3.1.0",
+ "get-value": "^2.0.6",
+ "is-extendable": "^0.1.1",
+ "set-value": "^0.4.3"
},
"dependencies": {
"extend-shallow": {
@@ -3886,7 +3886,7 @@
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
- "is-extendable": "0.1.1"
+ "is-extendable": "^0.1.0"
}
},
"set-value": {
@@ -3895,10 +3895,10 @@
"integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
"dev": true,
"requires": {
- "extend-shallow": "2.0.1",
- "is-extendable": "0.1.1",
- "is-plain-object": "2.0.4",
- "to-object-path": "0.3.0"
+ "extend-shallow": "^2.0.1",
+ "is-extendable": "^0.1.1",
+ "is-plain-object": "^2.0.1",
+ "to-object-path": "^0.3.0"
}
}
}
@@ -3909,7 +3909,7 @@
"integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=",
"dev": true,
"requires": {
- "unique-slug": "2.0.0"
+ "unique-slug": "^2.0.0"
}
},
"unique-slug": {
@@ -3918,7 +3918,7 @@
"integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=",
"dev": true,
"requires": {
- "imurmurhash": "0.1.4"
+ "imurmurhash": "^0.1.4"
}
},
"unset-value": {
@@ -3927,8 +3927,8 @@
"integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
"dev": true,
"requires": {
- "has-value": "0.3.1",
- "isobject": "3.0.1"
+ "has-value": "^0.3.1",
+ "isobject": "^3.0.0"
},
"dependencies": {
"has-value": {
@@ -3937,9 +3937,9 @@
"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
"dev": true,
"requires": {
- "get-value": "2.0.6",
- "has-values": "0.1.4",
- "isobject": "2.1.0"
+ "get-value": "^2.0.3",
+ "has-values": "^0.1.4",
+ "isobject": "^2.0.0"
},
"dependencies": {
"isobject": {
@@ -3973,7 +3973,7 @@
"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
"dev": true,
"requires": {
- "punycode": "2.1.1"
+ "punycode": "^2.1.0"
}
},
"urix": {
@@ -4006,7 +4006,7 @@
"integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==",
"dev": true,
"requires": {
- "kind-of": "6.0.2"
+ "kind-of": "^6.0.2"
}
},
"util": {
@@ -4045,9 +4045,9 @@
"integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
"dev": true,
"requires": {
- "chokidar": "2.0.4",
- "graceful-fs": "4.1.11",
- "neo-async": "2.5.1"
+ "chokidar": "^2.0.2",
+ "graceful-fs": "^4.1.2",
+ "neo-async": "^2.5.0"
}
},
"webpack": {
@@ -4061,26 +4061,26 @@
"@webassemblyjs/wasm-edit": "1.5.12",
"@webassemblyjs/wasm-opt": "1.5.12",
"@webassemblyjs/wasm-parser": "1.5.12",
- "acorn": "5.7.1",
- "acorn-dynamic-import": "3.0.0",
- "ajv": "6.5.1",
- "ajv-keywords": "3.2.0",
- "chrome-trace-event": "1.0.0",
- "enhanced-resolve": "4.0.0",
- "eslint-scope": "3.7.1",
- "json-parse-better-errors": "1.0.2",
- "loader-runner": "2.3.0",
- "loader-utils": "1.1.0",
- "memory-fs": "0.4.1",
- "micromatch": "3.1.10",
- "mkdirp": "0.5.1",
- "neo-async": "2.5.1",
- "node-libs-browser": "2.1.0",
- "schema-utils": "0.4.5",
- "tapable": "1.0.0",
- "uglifyjs-webpack-plugin": "1.2.5",
- "watchpack": "1.6.0",
- "webpack-sources": "1.1.0"
+ "acorn": "^5.6.2",
+ "acorn-dynamic-import": "^3.0.0",
+ "ajv": "^6.1.0",
+ "ajv-keywords": "^3.1.0",
+ "chrome-trace-event": "^1.0.0",
+ "enhanced-resolve": "^4.0.0",
+ "eslint-scope": "^3.7.1",
+ "json-parse-better-errors": "^1.0.2",
+ "loader-runner": "^2.3.0",
+ "loader-utils": "^1.1.0",
+ "memory-fs": "~0.4.1",
+ "micromatch": "^3.1.8",
+ "mkdirp": "~0.5.0",
+ "neo-async": "^2.5.0",
+ "node-libs-browser": "^2.0.0",
+ "schema-utils": "^0.4.4",
+ "tapable": "^1.0.0",
+ "uglifyjs-webpack-plugin": "^1.2.4",
+ "watchpack": "^1.5.0",
+ "webpack-sources": "^1.0.1"
}
},
"webpack-cli": {
@@ -4089,17 +4089,17 @@
"integrity": "sha512-KnRLJ0BUaYRqrhAMb9dv3gzdmhmgIMKo0FmdsnmfqbPGtLnnZ6tORZAvmmKfr+A0VgiVpqC60Gv7Ofg0R2CHtQ==",
"dev": true,
"requires": {
- "chalk": "2.4.1",
- "cross-spawn": "6.0.5",
- "enhanced-resolve": "4.0.0",
- "global-modules-path": "2.1.0",
- "import-local": "1.0.0",
- "inquirer": "6.0.0",
- "interpret": "1.1.0",
- "loader-utils": "1.1.0",
- "supports-color": "5.4.0",
- "v8-compile-cache": "2.0.0",
- "yargs": "11.1.0"
+ "chalk": "^2.4.1",
+ "cross-spawn": "^6.0.5",
+ "enhanced-resolve": "^4.0.0",
+ "global-modules-path": "^2.1.0",
+ "import-local": "^1.0.0",
+ "inquirer": "^6.0.0",
+ "interpret": "^1.1.0",
+ "loader-utils": "^1.1.0",
+ "supports-color": "^5.4.0",
+ "v8-compile-cache": "^2.0.0",
+ "yargs": "^11.1.0"
}
},
"webpack-sources": {
@@ -4108,8 +4108,8 @@
"integrity": "sha512-aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==",
"dev": true,
"requires": {
- "source-list-map": "2.0.0",
- "source-map": "0.6.1"
+ "source-list-map": "^2.0.0",
+ "source-map": "~0.6.1"
},
"dependencies": {
"source-map": {
@@ -4126,7 +4126,7 @@
"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
"dev": true,
"requires": {
- "isexe": "2.0.0"
+ "isexe": "^2.0.0"
}
},
"which-module": {
@@ -4141,7 +4141,7 @@
"integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
"dev": true,
"requires": {
- "errno": "0.1.7"
+ "errno": "~0.1.7"
}
},
"wrap-ansi": {
@@ -4150,8 +4150,8 @@
"integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
"dev": true,
"requires": {
- "string-width": "1.0.2",
- "strip-ansi": "3.0.1"
+ "string-width": "^1.0.1",
+ "strip-ansi": "^3.0.1"
},
"dependencies": {
"ansi-regex": {
@@ -4166,7 +4166,7 @@
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"dev": true,
"requires": {
- "number-is-nan": "1.0.1"
+ "number-is-nan": "^1.0.0"
}
},
"string-width": {
@@ -4175,9 +4175,9 @@
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"dev": true,
"requires": {
- "code-point-at": "1.1.0",
- "is-fullwidth-code-point": "1.0.0",
- "strip-ansi": "3.0.1"
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
}
},
"strip-ansi": {
@@ -4186,7 +4186,7 @@
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"requires": {
- "ansi-regex": "2.1.1"
+ "ansi-regex": "^2.0.0"
}
}
}
@@ -4221,18 +4221,18 @@
"integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
"dev": true,
"requires": {
- "cliui": "4.1.0",
- "decamelize": "1.2.0",
- "find-up": "2.1.0",
- "get-caller-file": "1.0.2",
- "os-locale": "2.1.0",
- "require-directory": "2.1.1",
- "require-main-filename": "1.0.1",
- "set-blocking": "2.0.0",
- "string-width": "2.1.1",
- "which-module": "2.0.0",
- "y18n": "3.2.1",
- "yargs-parser": "9.0.2"
+ "cliui": "^4.0.0",
+ "decamelize": "^1.1.1",
+ "find-up": "^2.1.0",
+ "get-caller-file": "^1.0.1",
+ "os-locale": "^2.0.0",
+ "require-directory": "^2.1.1",
+ "require-main-filename": "^1.0.1",
+ "set-blocking": "^2.0.0",
+ "string-width": "^2.0.0",
+ "which-module": "^2.0.0",
+ "y18n": "^3.2.1",
+ "yargs-parser": "^9.0.2"
},
"dependencies": {
"y18n": {
@@ -4249,7 +4249,7 @@
"integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
"dev": true,
"requires": {
- "camelcase": "4.1.0"
+ "camelcase": "^4.1.0"
}
}
}
diff --git a/src/Components/Components/perf/RenderTreeDiffBuilderBenchmark.cs b/src/Components/Components/perf/RenderTreeDiffBuilderBenchmark.cs
index ffde079d5ae01d76967ba556e30fd446d83d5d39..cace1e79bcdd57be3499b9b9419265a6274b5e4d 100644
--- a/src/Components/Components/perf/RenderTreeDiffBuilderBenchmark.cs
+++ b/src/Components/Components/perf/RenderTreeDiffBuilderBenchmark.cs
@@ -87,7 +87,7 @@ namespace Microsoft.AspNetCore.Components.Performance
private class FakeRenderer : Renderer
{
public FakeRenderer()
- : base(new TestServiceProvider())
+ : base(new TestServiceProvider(), new RendererSynchronizationContext())
{
}
diff --git a/src/Components/Components/src/RenderHandle.cs b/src/Components/Components/src/RenderHandle.cs
index 880ac579d0fb542a41a31cff5c4470f632e7b953..f1637473570b4e26c33e91bcc391faa07c7c0a3b 100644
--- a/src/Components/Components/src/RenderHandle.cs
+++ b/src/Components/Components/src/RenderHandle.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.AspNetCore.Components.Rendering;
@@ -49,7 +49,13 @@ namespace Microsoft.AspNetCore.Components
/// </summary>
/// <param name="workItem">The work item to execute.</param>
public Task Invoke(Action workItem)
- => _renderer.Invoke(workItem);
+ {
+ if (_renderer == null)
+ {
+ throw new InvalidOperationException("The render handle is not yet assigned.");
+ }
+ return _renderer.Invoke(workItem);
+ }
/// <summary>
/// Executes the supplied work item on the renderer's
@@ -57,6 +63,12 @@ namespace Microsoft.AspNetCore.Components
/// </summary>
/// <param name="workItem">The work item to execute.</param>
public Task InvokeAsync(Func<Task> workItem)
- => _renderer.InvokeAsync(workItem);
+ {
+ if (_renderer == null)
+ {
+ throw new InvalidOperationException("The render handle is not yet assigned.");
+ }
+ return _renderer.InvokeAsync(workItem);
+ }
}
}
diff --git a/src/Components/Components/src/Rendering/HtmlRenderer.cs b/src/Components/Components/src/Rendering/HtmlRenderer.cs
index 315c287b818290575f9b6e8a1a9250386b098d22..14a6e7af2e216c0346ee296f3f0005eadc39daca 100644
--- a/src/Components/Components/src/Rendering/HtmlRenderer.cs
+++ b/src/Components/Components/src/Rendering/HtmlRenderer.cs
@@ -26,7 +26,8 @@ namespace Microsoft.AspNetCore.Components.Rendering
/// </summary>
/// <param name="serviceProvider">The <see cref="IServiceProvider"/> to use to instantiate components.</param>
/// <param name="htmlEncoder">A <see cref="Func{T, TResult}"/> that will HTML encode the given string.</param>
- public HtmlRenderer(IServiceProvider serviceProvider, Func<string, string> htmlEncoder) : base(serviceProvider)
+ public HtmlRenderer(IServiceProvider serviceProvider, Func<string, string> htmlEncoder, IDispatcher dispatcher)
+ : base(serviceProvider, dispatcher)
{
_htmlEncoder = htmlEncoder;
}
diff --git a/src/Components/Components/src/Rendering/IDispatcher.cs b/src/Components/Components/src/Rendering/IDispatcher.cs
new file mode 100644
index 0000000000000000000000000000000000000000..bd138ac22cf0851564e52043cfb987bd096b5d2b
--- /dev/null
+++ b/src/Components/Components/src/Rendering/IDispatcher.cs
@@ -0,0 +1,42 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Components.Rendering
+{
+ /// <summary>
+ /// Dispatches external actions to be executed on the context of a <see cref="Renderer"/>.
+ /// </summary>
+ public interface IDispatcher
+ {
+ /// <summary>
+ /// Invokes the given <see cref="Action"/> in the context of the associated <see cref="Renderer"/>.
+ /// </summary>
+ /// <param name="action">The action to execute.</param>
+ /// <returns>A <see cref="Task"/> that will be completed when the action has finished executing.</returns>
+ Task Invoke(Action action);
+
+ /// <summary>
+ /// Invokes the given <see cref="Func{TResult}"/> in the context of the associated <see cref="Renderer"/>.
+ /// </summary>
+ /// <param name="asyncAction">The asynchronous action to execute.</param>
+ /// <returns>A <see cref="Task"/> that will be completed when the action has finished executing.</returns>
+ Task InvokeAsync(Func<Task> asyncAction);
+
+ /// <summary>
+ /// Invokes the given <see cref="Func{TResult}"/> in the context of the associated <see cref="Renderer"/>.
+ /// </summary>
+ /// <param name="function">The function to execute.</param>
+ /// <returns>A <see cref="Task{TResult}"/> that will be completed when the function has finished executing.</returns>
+ Task<TResult> Invoke<TResult>(Func<TResult> function);
+
+ /// <summary>
+ /// Invokes the given <see cref="Func{TResult}"/> in the context of the associated <see cref="Renderer"/>.
+ /// </summary>
+ /// <param name="asyncAction">The asynchronous function to execute.</param>
+ /// <returns>A <see cref="Task{TResult}"/> that will be completed when the function has finished executing.</returns>
+ Task<TResult> InvokeAsync<TResult>(Func<Task<TResult>> asyncFunction);
+ }
+}
diff --git a/src/Components/Components/src/Rendering/Renderer.cs b/src/Components/Components/src/Rendering/Renderer.cs
index 3cf785801d585bcd4b2800e3de008d53d7e44e7a..3a84412492e634fbe7db1f632783e7714020200e 100644
--- a/src/Components/Components/src/Rendering/Renderer.cs
+++ b/src/Components/Components/src/Rendering/Renderer.cs
@@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Runtime.ExceptionServices;
+using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components.RenderTree;
@@ -20,28 +21,61 @@ namespace Microsoft.AspNetCore.Components.Rendering
private readonly Dictionary<int, ComponentState> _componentStateById = new Dictionary<int, ComponentState>();
private readonly RenderBatchBuilder _batchBuilder = new RenderBatchBuilder();
private readonly Dictionary<int, EventHandlerInvoker> _eventBindings = new Dictionary<int, EventHandlerInvoker>();
+ private IDispatcher _dispatcher;
private int _nextComponentId = 0; // TODO: change to 'long' when Mono .NET->JS interop supports it
private bool _isBatchInProgress;
private int _lastEventHandlerId = 0;
private List<Task> _pendingTasks;
- // We need to introduce locking as we don't know if we are executing
- // under a synchronization context that limits the ammount of concurrency
- // that can happen when async callbacks are executed.
- // As a result, we have to protect the _pendingTask list and the
- // _batchBuilder render queue from concurrent modifications.
- private object _asyncWorkLock = new object();
+ /// <summary>
+ /// Allows the caller to handle exceptions from the SynchronizationContext when one is available.
+ /// </summary>
+ public event UnhandledExceptionEventHandler UnhandledSynchronizationException
+ {
+ add
+ {
+ if (!(_dispatcher is RendererSynchronizationContext rendererSynchronizationContext))
+ {
+ return;
+ }
+ rendererSynchronizationContext.UnhandledException += value;
+ }
+ remove
+ {
+ if (!(_dispatcher is RendererSynchronizationContext rendererSynchronizationContext))
+ {
+ return;
+ }
+ rendererSynchronizationContext.UnhandledException -= value;
+ }
+ }
/// <summary>
/// Constructs an instance of <see cref="Renderer"/>.
/// </summary>
- /// <param name="serviceProvider">The <see cref="IServiceProvider"/> to be used when initialising components.</param>
+ /// <param name="serviceProvider">The <see cref="IServiceProvider"/> to be used when initializing components.</param>
public Renderer(IServiceProvider serviceProvider)
{
_componentFactory = new ComponentFactory(serviceProvider);
}
+ /// <summary>
+ /// Constructs an instance of <see cref="Renderer"/>.
+ /// </summary>
+ /// <param name="serviceProvider">The <see cref="IServiceProvider"/> to be used when initializing components.</param>
+ /// <param name="dispatcher">The <see cref="IDispatcher"/> to be for invoking user actions into the <see cref="Renderer"/> context.</param>
+ public Renderer(IServiceProvider serviceProvider, IDispatcher dispatcher) : this(serviceProvider)
+ {
+ _dispatcher = dispatcher;
+ }
+
+ /// <summary>
+ /// Creates an <see cref="IDispatcher"/> that can be used with one or more <see cref="Renderer"/>.
+ /// </summary>
+ /// <returns>The <see cref="IDispatcher"/>.</returns>
+ public static IDispatcher CreateDefaultDispatcher() => new RendererSynchronizationContext();
+
/// <summary>
/// Constructs a new component of the specified type.
/// </summary>
@@ -198,14 +232,11 @@ namespace Microsoft.AspNetCore.Components.Rendering
while (_pendingTasks.Count > 0)
{
Task pendingWork;
- lock (_asyncWorkLock)
- {
- // Create a Task that represents the remaining ongoing work for the rendering process
- pendingWork = Task.WhenAll(_pendingTasks);
+ // Create a Task that represents the remaining ongoing work for the rendering process
+ pendingWork = Task.WhenAll(_pendingTasks);
- // Clear all pending work.
- _pendingTasks.Clear();
- }
+ // Clear all pending work.
+ _pendingTasks.Clear();
// new work might be added before we check again as a result of waiting for all
// the child components to finish executing SetParametersAsync
@@ -238,6 +269,8 @@ namespace Microsoft.AspNetCore.Components.Rendering
/// <param name="eventArgs">Arguments to be passed to the event handler.</param>
public void DispatchEvent(int componentId, int eventHandlerId, UIEventArgs eventArgs)
{
+ EnsureSynchronizationContext();
+
if (_eventBindings.TryGetValue(eventHandlerId, out var binding))
{
// The event handler might request multiple renders in sequence. Capture them
@@ -266,9 +299,24 @@ namespace Microsoft.AspNetCore.Components.Rendering
/// <param name="workItem">The work item to execute.</param>
public virtual Task Invoke(Action workItem)
{
- // Base renderer has nothing to dispatch to, so execute directly
- workItem();
- return Task.CompletedTask;
+ // This is for example when we run on a system with a single thread, like WebAssembly.
+ if (_dispatcher == null)
+ {
+ workItem();
+ return Task.CompletedTask;
+ }
+
+ if (SynchronizationContext.Current == _dispatcher)
+ {
+ // This is an optimization for when the dispatcher is also a syncronization context, like in the default case.
+ // No need to dispatch. Avoid deadlock by invoking directly.
+ workItem();
+ return Task.CompletedTask;
+ }
+ else
+ {
+ return _dispatcher.Invoke(workItem);
+ }
}
/// <summary>
@@ -278,8 +326,23 @@ namespace Microsoft.AspNetCore.Components.Rendering
/// <param name="workItem">The work item to execute.</param>
public virtual Task InvokeAsync(Func<Task> workItem)
{
- // Base renderer has nothing to dispatch to, so execute directly
- return workItem();
+ // This is for example when we run on a system with a single thread, like WebAssembly.
+ if (_dispatcher == null)
+ {
+ workItem();
+ return Task.CompletedTask;
+ }
+
+ if (SynchronizationContext.Current == _dispatcher)
+ {
+ // This is an optimization for when the dispatcher is also a syncronization context, like in the default case.
+ // No need to dispatch. Avoid deadlock by invoking directly.
+ return workItem();
+ }
+ else
+ {
+ return _dispatcher.InvokeAsync(workItem);
+ }
}
internal void InstantiateChildComponentOnFrame(ref RenderTreeFrame frame, int parentComponentId)
@@ -323,10 +386,7 @@ namespace Microsoft.AspNetCore.Components.Rendering
{
return;
}
- lock (_asyncWorkLock)
- {
- _pendingTasks.Add(task);
- }
+ _pendingTasks.Add(task);
break;
}
}
@@ -351,6 +411,8 @@ namespace Microsoft.AspNetCore.Components.Rendering
/// <param name="renderFragment">A <see cref="RenderFragment"/> that will supply the updated UI contents.</param>
protected internal virtual void AddToRenderQueue(int componentId, RenderFragment renderFragment)
{
+ EnsureSynchronizationContext();
+
var componentState = GetOptionalComponentState(componentId);
if (componentState == null)
{
@@ -359,11 +421,8 @@ namespace Microsoft.AspNetCore.Components.Rendering
return;
}
- lock (_asyncWorkLock)
- {
- _batchBuilder.ComponentRenderQueue.Enqueue(
- new RenderQueueEntry(componentState, renderFragment));
- }
+ _batchBuilder.ComponentRenderQueue.Enqueue(
+ new RenderQueueEntry(componentState, renderFragment));
if (!_isBatchInProgress)
{
@@ -371,6 +430,22 @@ namespace Microsoft.AspNetCore.Components.Rendering
}
}
+ private void EnsureSynchronizationContext()
+ {
+ // When the IDispatcher is a synchronization context
+ // Render operations are not thread-safe, so they need to be serialized.
+ // Plus, any other logic that mutates state accessed during rendering also
+ // needs not to run concurrently with rendering so should be dispatched to
+ // the renderer's sync context.
+ if (_dispatcher is SynchronizationContext synchronizationContext && SynchronizationContext.Current != synchronizationContext)
+ {
+ throw new InvalidOperationException(
+ "The current thread is not associated with the renderer's synchronization context. " +
+ "Use Invoke() or InvokeAsync() to switch execution to the renderer's synchronization " +
+ "context when triggering rendering or modifying any state accessed during rendering.");
+ }
+ }
+
private ComponentState GetRequiredComponentState(int componentId)
=> _componentStateById.TryGetValue(componentId, out var componentState)
? componentState
@@ -389,8 +464,9 @@ namespace Microsoft.AspNetCore.Components.Rendering
try
{
// Process render queue until empty
- while (TryDequeueRenderQueueEntry(out var nextToRender))
+ while (_batchBuilder.ComponentRenderQueue.Count > 0)
{
+ var nextToRender = _batchBuilder.ComponentRenderQueue.Dequeue();
RenderInExistingBatch(nextToRender);
}
@@ -406,23 +482,6 @@ namespace Microsoft.AspNetCore.Components.Rendering
}
}
- private bool TryDequeueRenderQueueEntry(out RenderQueueEntry entry)
- {
- lock (_asyncWorkLock)
- {
- if (_batchBuilder.ComponentRenderQueue.Count > 0)
- {
- entry = _batchBuilder.ComponentRenderQueue.Dequeue();
- return true;
- }
- else
- {
- entry = default;
- return false;
- }
- }
- }
-
private void InvokeRenderCompletedCalls(ArrayRange<RenderTreeDiff> updatedComponents)
{
var array = updatedComponents.Array;
diff --git a/src/Components/Server/src/Circuits/CircuitSynchronizationContext.cs b/src/Components/Components/src/Rendering/RendererSynchronizationContext.cs
similarity index 95%
rename from src/Components/Server/src/Circuits/CircuitSynchronizationContext.cs
rename to src/Components/Components/src/Rendering/RendererSynchronizationContext.cs
index ec8abe354c5eb15848f693557bdca17024cbf372..a6a4e1aea10da31e93eb306a15b8c4750e06efaf 100644
--- a/src/Components/Server/src/Circuits/CircuitSynchronizationContext.cs
+++ b/src/Components/Components/src/Rendering/RendererSynchronizationContext.cs
@@ -6,10 +6,10 @@ using System.Diagnostics;
using System.Threading;
using System.Threading.Tasks;
-namespace Microsoft.AspNetCore.Components.Server.Circuits
+namespace Microsoft.AspNetCore.Components.Rendering
{
[DebuggerDisplay("{_state,nq}")]
- internal class CircuitSynchronizationContext : SynchronizationContext
+ internal class RendererSynchronizationContext : SynchronizationContext, IDispatcher
{
private static readonly ContextCallback ExecutionContextThunk = (object state) =>
{
@@ -27,12 +27,12 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
public event UnhandledExceptionEventHandler UnhandledException;
- public CircuitSynchronizationContext()
+ public RendererSynchronizationContext()
: this(new State())
{
}
- private CircuitSynchronizationContext(State state)
+ private RendererSynchronizationContext(State state)
{
_state = state;
}
@@ -158,7 +158,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
// shallow copy
public override SynchronizationContext CreateCopy()
{
- return new CircuitSynchronizationContext(_state);
+ return new RendererSynchronizationContext(_state);
}
private Task Enqueue(Task antecedant, SendOrPostCallback d, object state)
@@ -259,7 +259,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
private class WorkItem
{
- public CircuitSynchronizationContext SynchronizationContext;
+ public RendererSynchronizationContext SynchronizationContext;
public ExecutionContext ExecutionContext;
public SendOrPostCallback Callback;
public object State;
diff --git a/src/Components/Components/test/CascadingParameterStateTest.cs b/src/Components/Components/test/CascadingParameterStateTest.cs
index 9e66a2c35b35df2c8e482b5b4cbba1feb0d5f808..490a713cd82e4096d9cd9e1ca1f72547ebf12e9d 100644
--- a/src/Components/Components/test/CascadingParameterStateTest.cs
+++ b/src/Components/Components/test/CascadingParameterStateTest.cs
@@ -373,7 +373,8 @@ namespace Microsoft.AspNetCore.Components.Test
static CascadingValue<T> CreateCascadingValueComponent<T>(T value, string name = null)
{
var supplier = new CascadingValue<T>();
- supplier.Configure(new RenderHandle(new TestRenderer(), 0));
+ var renderer = new TestRenderer();
+ supplier.Configure(new RenderHandle(renderer, 0));
var supplierParams = new Dictionary<string, object>
{
@@ -385,7 +386,7 @@ namespace Microsoft.AspNetCore.Components.Test
supplierParams.Add("Name", name);
}
- supplier.SetParameters(supplierParams);
+ renderer.Invoke(() => supplier.SetParametersAsync(ParameterCollection.FromDictionary(supplierParams)));
return supplier;
}
diff --git a/src/Components/Components/test/CascadingParameterTest.cs b/src/Components/Components/test/CascadingParameterTest.cs
index 46711f060624e1a9781500e5379a2a1d06f084db..f898fcb8ebe067dbcf041eeff326334515abe830 100644
--- a/src/Components/Components/test/CascadingParameterTest.cs
+++ b/src/Components/Components/test/CascadingParameterTest.cs
@@ -1,12 +1,11 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.RenderTree;
-using Microsoft.AspNetCore.Components.Test.Helpers;
using System;
using System.Linq;
using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.AspNetCore.Components.Test.Helpers;
using Xunit;
namespace Microsoft.AspNetCore.Components.Test
diff --git a/src/Components/Components/test/LayoutTest.cs b/src/Components/Components/test/LayoutTest.cs
index 1a8054345bdf57136f152520a76818b455a76e70..9439068bd8a1f24150a0f8ae43c7875516eaad08 100644
--- a/src/Components/Components/test/LayoutTest.cs
+++ b/src/Components/Components/test/LayoutTest.cs
@@ -28,10 +28,10 @@ namespace Microsoft.AspNetCore.Components.Test
public void DisplaysComponentInsideLayout()
{
// Arrange/Act
- _layoutDisplayComponent.SetParameters(new Dictionary<string, object>
+ _renderer.Invoke(() => _layoutDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary<string, object>
{
{ LayoutDisplay.NameOfPage, typeof(ComponentWithLayout) }
- });
+ })));
// Assert
var batch = _renderer.Batches.Single();
@@ -85,10 +85,10 @@ namespace Microsoft.AspNetCore.Components.Test
public void DisplaysComponentInsideNestedLayout()
{
// Arrange/Act
- _layoutDisplayComponent.SetParameters(new Dictionary<string, object>
+ _renderer.Invoke(() => _layoutDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary<string, object>
{
{ LayoutDisplay.NameOfPage, typeof(ComponentWithNestedLayout) }
- });
+ })));
// Assert
var batch = _renderer.Batches.Single();
@@ -112,16 +112,16 @@ namespace Microsoft.AspNetCore.Components.Test
public void CanChangeDisplayedPageWithSameLayout()
{
// Arrange
- _layoutDisplayComponent.SetParameters(new Dictionary<string, object>
+ _renderer.Invoke(() => _layoutDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary<string, object>
{
{ LayoutDisplay.NameOfPage, typeof(ComponentWithLayout) }
- });
+ })));
// Act
- _layoutDisplayComponent.SetParameters(new Dictionary<string, object>
+ _renderer.Invoke(() => _layoutDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary<string, object>
{
{ LayoutDisplay.NameOfPage, typeof(DifferentComponentWithLayout) }
- });
+ })));
// Assert
Assert.Equal(2, _renderer.Batches.Count);
@@ -163,16 +163,16 @@ namespace Microsoft.AspNetCore.Components.Test
public void CanChangeDisplayedPageWithDifferentLayout()
{
// Arrange
- _layoutDisplayComponent.SetParameters(new Dictionary<string, object>
+ _renderer.Invoke(() => _layoutDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary<string, object>
{
{ LayoutDisplay.NameOfPage, typeof(ComponentWithLayout) }
- });
+ })));
// Act
- _layoutDisplayComponent.SetParameters(new Dictionary<string, object>
+ _renderer.Invoke(() => _layoutDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary<string, object>
{
{ LayoutDisplay.NameOfPage, typeof(ComponentWithNestedLayout) }
- });
+ })));
// Assert
Assert.Equal(2, _renderer.Batches.Count);
diff --git a/src/Components/Components/test/RenderTreeBuilderTest.cs b/src/Components/Components/test/RenderTreeBuilderTest.cs
index 9a44251c301a98d4d8854a0d5d39aad94ca680b0..2f18b2d84870f7421165d74073a8e47bba668090 100644
--- a/src/Components/Components/test/RenderTreeBuilderTest.cs
+++ b/src/Components/Components/test/RenderTreeBuilderTest.cs
@@ -1057,7 +1057,7 @@ namespace Microsoft.AspNetCore.Components.Test
private class TestRenderer : Renderer
{
- public TestRenderer() : base(new TestServiceProvider())
+ public TestRenderer() : base(new TestServiceProvider(), new RendererSynchronizationContext())
{
}
diff --git a/src/Components/Components/test/RenderTreeDiffBuilderTest.cs b/src/Components/Components/test/RenderTreeDiffBuilderTest.cs
index e97170616a3057312789daedf9f8ca264eaa4cf1..0f7f986dd601217fd3d8cb649644a232a227310e 100644
--- a/src/Components/Components/test/RenderTreeDiffBuilderTest.cs
+++ b/src/Components/Components/test/RenderTreeDiffBuilderTest.cs
@@ -1527,7 +1527,7 @@ namespace Microsoft.AspNetCore.Components.Test
private class FakeRenderer : Renderer
{
- public FakeRenderer() : base(new TestServiceProvider())
+ public FakeRenderer() : base(new TestServiceProvider(), new RendererSynchronizationContext())
{
}
diff --git a/src/Components/Components/test/RendererTest.cs b/src/Components/Components/test/RendererTest.cs
index 86de53bf6e11a44bf0d5b181082e4e3a49f5a683..f63600ad278444380bb5dbe3e31b6e1f4cdfe953 100644
--- a/src/Components/Components/test/RendererTest.cs
+++ b/src/Components/Components/test/RendererTest.cs
@@ -5,6 +5,7 @@ using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
+using System.Runtime.ExceptionServices;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components.Rendering;
using Microsoft.AspNetCore.Components.RenderTree;
@@ -15,6 +16,10 @@ namespace Microsoft.AspNetCore.Components.Test
{
public class RendererTest
{
+ private const string EventActionsName = nameof(NestedAsyncComponent.EventActions);
+ private const string WhatToRenderName = nameof(NestedAsyncComponent.WhatToRender);
+ private const string LogName = nameof(NestedAsyncComponent.Log);
+
[Fact]
public void CanRenderTopLevelComponents()
{
@@ -171,7 +176,7 @@ namespace Microsoft.AspNetCore.Components.Test
// Act
var componentId = renderer.AssignRootComponentId(component);
- await renderer.RenderRootComponentAsync(componentId);
+ await renderer.InvokeAsync(() => renderer.RenderRootComponentAsync(componentId));
// Assert
Assert.Equal(5, renderer.Batches.Count);
@@ -221,9 +226,9 @@ namespace Microsoft.AspNetCore.Components.Test
// Act/Assert
var componentId = renderer.AssignRootComponentId(component);
var log = new ConcurrentQueue<(int id, NestedAsyncComponent.EventType @event)>();
- await renderer.RenderRootComponentAsync(componentId, ParameterCollection.FromDictionary(new Dictionary<string, object>
+ await renderer.InvokeAsync(() => renderer.RenderRootComponentAsync(componentId, ParameterCollection.FromDictionary(new Dictionary<string, object>
{
- [nameof(NestedAsyncComponent.EventActions)] = new Dictionary<int, IList<NestedAsyncComponent.ExecutionAction>>
+ [EventActionsName] = new Dictionary<int, IList<NestedAsyncComponent.ExecutionAction>>
{
[0] = new List<NestedAsyncComponent.ExecutionAction>
{
@@ -240,13 +245,13 @@ namespace Microsoft.AspNetCore.Components.Test
NestedAsyncComponent.ExecutionAction.On(1, NestedAsyncComponent.EventType.OnParametersSetAsyncAsync, async: true),
}
},
- [nameof(NestedAsyncComponent.WhatToRender)] = new Dictionary<int, Func<NestedAsyncComponent, RenderFragment>>
+ [WhatToRenderName] = new Dictionary<int, Func<NestedAsyncComponent, RenderFragment>>
{
[0] = CreateRenderFactory(new[] { 1 }),
[1] = CreateRenderFactory(Array.Empty<int>())
},
- [nameof(NestedAsyncComponent.Log)] = log
- }));
+ [LogName] = log
+ })));
var logForParent = log.Where(l => l.id == 0).ToArray();
var logForChild = log.Where(l => l.id == 1).ToArray();
@@ -265,9 +270,9 @@ namespace Microsoft.AspNetCore.Components.Test
// Act/Assert
var componentId = renderer.AssignRootComponentId(component);
var log = new ConcurrentQueue<(int id, NestedAsyncComponent.EventType @event)>();
- await renderer.RenderRootComponentAsync(componentId, ParameterCollection.FromDictionary(new Dictionary<string, object>
+ await renderer.InvokeAsync(() => renderer.RenderRootComponentAsync(componentId, ParameterCollection.FromDictionary(new Dictionary<string, object>
{
- [nameof(NestedAsyncComponent.EventActions)] = new Dictionary<int, IList<NestedAsyncComponent.ExecutionAction>>
+ [EventActionsName] = new Dictionary<int, IList<NestedAsyncComponent.ExecutionAction>>
{
[0] = new List<NestedAsyncComponent.ExecutionAction>
{
@@ -284,13 +289,13 @@ namespace Microsoft.AspNetCore.Components.Test
NestedAsyncComponent.ExecutionAction.On(1, NestedAsyncComponent.EventType.OnParametersSetAsyncAsync),
}
},
- [nameof(NestedAsyncComponent.WhatToRender)] = new Dictionary<int, Func<NestedAsyncComponent, RenderFragment>>
+ [WhatToRenderName] = new Dictionary<int, Func<NestedAsyncComponent, RenderFragment>>
{
[0] = CreateRenderFactory(new[] { 1 }),
[1] = CreateRenderFactory(Array.Empty<int>())
},
- [nameof(NestedAsyncComponent.Log)] = log
- }));
+ [LogName] = log
+ })));
var logForParent = log.Where(l => l.id == 0).ToArray();
var logForChild = log.Where(l => l.id == 1).ToArray();
@@ -309,9 +314,9 @@ namespace Microsoft.AspNetCore.Components.Test
// Act/Assert
var componentId = renderer.AssignRootComponentId(component);
var log = new ConcurrentQueue<(int id, NestedAsyncComponent.EventType @event)>();
- await renderer.RenderRootComponentAsync(componentId, ParameterCollection.FromDictionary(new Dictionary<string, object>
+ await renderer.InvokeAsync(() => renderer.RenderRootComponentAsync(componentId, ParameterCollection.FromDictionary(new Dictionary<string, object>
{
- [nameof(NestedAsyncComponent.EventActions)] = new Dictionary<int, IList<NestedAsyncComponent.ExecutionAction>>
+ [EventActionsName] = new Dictionary<int, IList<NestedAsyncComponent.ExecutionAction>>
{
[0] = new List<NestedAsyncComponent.ExecutionAction>
{
@@ -328,13 +333,13 @@ namespace Microsoft.AspNetCore.Components.Test
NestedAsyncComponent.ExecutionAction.On(1, NestedAsyncComponent.EventType.OnParametersSetAsyncAsync),
}
},
- [nameof(NestedAsyncComponent.WhatToRender)] = new Dictionary<int, Func<NestedAsyncComponent, RenderFragment>>
+ [WhatToRenderName] = new Dictionary<int, Func<NestedAsyncComponent, RenderFragment>>
{
[0] = CreateRenderFactory(new[] { 1 }),
[1] = CreateRenderFactory(Array.Empty<int>())
},
- [nameof(NestedAsyncComponent.Log)] = log
- }));
+ [LogName] = log
+ })));
var logForParent = log.Where(l => l.id == 0).ToArray();
var logForChild = log.Where(l => l.id == 1).ToArray();
@@ -353,9 +358,9 @@ namespace Microsoft.AspNetCore.Components.Test
// Act/Assert
var componentId = renderer.AssignRootComponentId(component);
var log = new ConcurrentQueue<(int id, NestedAsyncComponent.EventType @event)>();
- await renderer.RenderRootComponentAsync(componentId, ParameterCollection.FromDictionary(new Dictionary<string, object>
+ await renderer.InvokeAsync(() => renderer.RenderRootComponentAsync(componentId, ParameterCollection.FromDictionary(new Dictionary<string, object>
{
- [nameof(NestedAsyncComponent.EventActions)] = new Dictionary<int, IList<NestedAsyncComponent.ExecutionAction>>
+ [EventActionsName] = new Dictionary<int, IList<NestedAsyncComponent.ExecutionAction>>
{
[0] = new List<NestedAsyncComponent.ExecutionAction>
{
@@ -386,15 +391,15 @@ namespace Microsoft.AspNetCore.Components.Test
NestedAsyncComponent.ExecutionAction.On(3, NestedAsyncComponent.EventType.OnParametersSetAsyncAsync, async:true),
}
},
- [nameof(NestedAsyncComponent.WhatToRender)] = new Dictionary<int, Func<NestedAsyncComponent, RenderFragment>>
+ [WhatToRenderName] = new Dictionary<int, Func<NestedAsyncComponent, RenderFragment>>
{
[0] = CreateRenderFactory(new[] { 1, 2 }),
[1] = CreateRenderFactory(new[] { 3 }),
[2] = CreateRenderFactory(Array.Empty<int>()),
[3] = CreateRenderFactory(Array.Empty<int>())
},
- [nameof(NestedAsyncComponent.Log)] = log
- }));
+ [LogName] = log
+ })));
var logForParent = log.Where(l => l.id == 0).ToArray();
var logForFirstChild = log.Where(l => l.id == 1).ToArray();
@@ -553,10 +558,7 @@ namespace Microsoft.AspNetCore.Components.Test
var eventArgs = new UIEventArgs();
// Act/Assert
- var ex = Assert.Throws<InvalidOperationException>(() =>
- {
- renderer.DispatchEvent(componentId, eventHandlerId, eventArgs);
- });
+ var ex = Assert.Throws<InvalidOperationException>(() => renderer.DispatchEvent(componentId, eventHandlerId, eventArgs));
Assert.Equal($"The component of type {typeof(TestComponent).FullName} cannot receive " +
$"events because it does not implement {typeof(IHandleEvent).FullName}.", ex.Message);
}
@@ -568,10 +570,7 @@ namespace Microsoft.AspNetCore.Components.Test
var renderer = new TestRenderer();
// Act/Assert
- Assert.Throws<ArgumentException>(() =>
- {
- renderer.DispatchEvent(123, 0, new UIEventArgs());
- });
+ Assert.Throws<ArgumentException>(() => renderer.DispatchEvent(123, 0, new UIEventArgs()));
}
[Fact]
@@ -766,8 +765,9 @@ namespace Microsoft.AspNetCore.Components.Test
Assert.Equal(new[] { 1, 3 }, renderer.Batches[1].DisposedComponentIDs);
// Act/Assert: If a disposed component requests a render, it's a no-op
- ((FakeComponent)childComponent3).RenderHandle.Render(builder
- => throw new NotImplementedException("Should not be invoked"));
+ var renderHandle = ((FakeComponent)childComponent3).RenderHandle;
+ renderHandle.Invoke(() => renderHandle.Render(builder
+ => throw new NotImplementedException("Should not be invoked")));
Assert.Equal(2, renderer.Batches.Count);
}
@@ -798,10 +798,7 @@ namespace Microsoft.AspNetCore.Components.Test
component.TriggerRender();
// Act/Assert 2: Can no longer fire the original event, but can fire the new event
- Assert.Throws<ArgumentException>(() =>
- {
- renderer.DispatchEvent(componentId, origEventHandlerId, args: null);
- });
+ Assert.Throws<ArgumentException>(() => renderer.DispatchEvent(componentId, origEventHandlerId, args: null));
Assert.Equal(1, eventCount);
Assert.Equal(0, newEventCount);
renderer.DispatchEvent(componentId, origEventHandlerId + 1, args: null);
@@ -834,10 +831,7 @@ namespace Microsoft.AspNetCore.Components.Test
component.TriggerRender();
// Act/Assert 2: Can no longer fire the original event
- Assert.Throws<ArgumentException>(() =>
- {
- renderer.DispatchEvent(componentId, origEventHandlerId, args: null);
- });
+ Assert.Throws<ArgumentException>(() => renderer.DispatchEvent(componentId, origEventHandlerId, args: null));
Assert.Equal(1, eventCount);
}
@@ -883,10 +877,7 @@ namespace Microsoft.AspNetCore.Components.Test
component.TriggerRender();
// Act/Assert 2: Can no longer fire the original event
- Assert.Throws<ArgumentException>(() =>
- {
- renderer.DispatchEvent(eventHandlerId, eventHandlerId, args: null);
- });
+ Assert.Throws<ArgumentException>(() => renderer.DispatchEvent(eventHandlerId, eventHandlerId, args: null));
Assert.Equal(1, eventCount);
}
@@ -916,10 +907,7 @@ namespace Microsoft.AspNetCore.Components.Test
component.TriggerRender();
// Act/Assert 2: Can no longer fire the original event
- Assert.Throws<ArgumentException>(() =>
- {
- renderer.DispatchEvent(componentId, origEventHandlerId, args: null);
- });
+ Assert.Throws<ArgumentException>(() => renderer.DispatchEvent(componentId, origEventHandlerId, args: null));
Assert.Equal(1, eventCount);
}
@@ -1009,10 +997,7 @@ namespace Microsoft.AspNetCore.Components.Test
var component = new TestComponent(builder => { });
// Act/Assert
- var ex = Assert.Throws<InvalidOperationException>(() =>
- {
- component.TriggerRender();
- });
+ var ex = Assert.Throws<InvalidOperationException>(() => component.TriggerRender());
Assert.Equal("The render handle is not yet assigned.", ex.Message);
}
@@ -1317,7 +1302,7 @@ namespace Microsoft.AspNetCore.Components.Test
}
[Fact]
- public async Task CanTriggerEventHandlerDisposedInEarlierPendingBatch()
+ public async Task CanTriggerEventHandlerDisposedInEarlierPendingBatchAsync()
{
// This represents the scenario where the same event handler is being triggered
// rapidly, such as an input event while typing. It only applies to asynchronous
@@ -1458,7 +1443,7 @@ namespace Microsoft.AspNetCore.Components.Test
private class NoOpRenderer : Renderer
{
- public NoOpRenderer() : base(new TestServiceProvider())
+ public NoOpRenderer() : base(new TestServiceProvider(), new RendererSynchronizationContext())
{
}
@@ -1491,7 +1476,20 @@ namespace Microsoft.AspNetCore.Components.Test
}
public void TriggerRender()
- => _renderHandle.Render(_renderFragment);
+ {
+ var t = _renderHandle.Invoke(() => _renderHandle.Render(_renderFragment));
+ // This should always be run synchronously
+ Assert.True(t.IsCompleted);
+ if (t.IsFaulted)
+ {
+ var exception = t.Exception.Flatten().InnerException;
+ while (exception is AggregateException e)
+ {
+ exception = e.InnerException;
+ }
+ ExceptionDispatchInfo.Capture(exception).Throw();
+ }
+ }
public bool Disposed { get; private set; }
@@ -1674,10 +1672,10 @@ namespace Microsoft.AspNetCore.Components.Test
{
foreach (var renderHandle in _renderHandles)
{
- renderHandle.Render(builder =>
+ renderHandle.Invoke(() => renderHandle.Render(builder =>
{
builder.AddContent(0, $"Hello from {nameof(MultiRendererComponent)}");
- });
+ }));
}
}
}
diff --git a/src/Components/Components/test/Rendering/HtmlRendererTests.cs b/src/Components/Components/test/Rendering/HtmlRendererTests.cs
index 184f1188676b45e71c708acba9f744b4c68b196b..18bcfec6bde53574a5ecd644c27df7555f39e57f 100644
--- a/src/Components/Components/test/Rendering/HtmlRendererTests.cs
+++ b/src/Components/Components/test/Rendering/HtmlRendererTests.cs
@@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
+using System.Runtime.ExceptionServices;
using System.Text.Encodings.Web;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components.RenderTree;
@@ -19,16 +20,17 @@ namespace Microsoft.AspNetCore.Components.Rendering
public void RenderComponent_CanRenderEmptyElement()
{
// Arrange
+ var dispatcher = Renderer.CreateDefaultDispatcher();
var expectedHtml = new[] { "<", "p", ">", "</", "p", ">" };
var serviceProvider = new ServiceCollection().AddSingleton(new RenderFragment(rtb =>
{
rtb.OpenElement(0, "p");
rtb.CloseElement();
})).BuildServiceProvider();
- var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder);
+ var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder, dispatcher);
// Act
- var result = htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty);
+ var result = GetResult(dispatcher.Invoke(() => htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty)));
// Assert
Assert.Equal(expectedHtml, result);
@@ -38,6 +40,7 @@ namespace Microsoft.AspNetCore.Components.Rendering
public void RenderComponent_CanRenderSimpleComponent()
{
// Arrange
+ var dispatcher = Renderer.CreateDefaultDispatcher();
var expectedHtml = new[] { "<", "p", ">", "Hello world!", "</", "p", ">" };
var serviceProvider = new ServiceCollection().AddSingleton(new RenderFragment(rtb =>
{
@@ -45,10 +48,10 @@ namespace Microsoft.AspNetCore.Components.Rendering
rtb.AddContent(1, "Hello world!");
rtb.CloseElement();
})).BuildServiceProvider();
- var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder);
+ var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder, dispatcher);
// Act
- var result = htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty);
+ var result = GetResult(dispatcher.Invoke(() => htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty)));
// Assert
Assert.Equal(expectedHtml, result);
@@ -58,6 +61,7 @@ namespace Microsoft.AspNetCore.Components.Rendering
public void RenderComponent_HtmlEncodesContent()
{
// Arrange
+ var dispatcher = Renderer.CreateDefaultDispatcher();
var expectedHtml = new[] { "<", "p", ">", "<Hello world!>", "</", "p", ">" };
var serviceProvider = new ServiceCollection().AddSingleton(new RenderFragment(rtb =>
{
@@ -65,10 +69,10 @@ namespace Microsoft.AspNetCore.Components.Rendering
rtb.AddContent(1, "<Hello world!>");
rtb.CloseElement();
})).BuildServiceProvider();
- var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder);
+ var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder, dispatcher);
// Act
- var result = htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty);
+ var result = GetResult(dispatcher.Invoke(() => htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty)));
// Assert
Assert.Equal(expectedHtml, result);
@@ -79,6 +83,7 @@ namespace Microsoft.AspNetCore.Components.Rendering
public void RenderComponent_DoesNotEncodeMarkup()
{
// Arrange
+ var dispatcher = Renderer.CreateDefaultDispatcher();
var expectedHtml = new[] { "<", "p", ">", "<span>Hello world!</span>", "</", "p", ">" };
var serviceProvider = new ServiceCollection().AddSingleton(new RenderFragment(rtb =>
{
@@ -86,10 +91,10 @@ namespace Microsoft.AspNetCore.Components.Rendering
rtb.AddMarkupContent(1, "<span>Hello world!</span>");
rtb.CloseElement();
})).BuildServiceProvider();
- var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder);
+ var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder, dispatcher);
// Act
- var result = htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty);
+ var result = GetResult(dispatcher.Invoke(() => htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty)));
// Assert
Assert.Equal(expectedHtml, result);
@@ -100,6 +105,7 @@ namespace Microsoft.AspNetCore.Components.Rendering
public void RenderComponent_CanRenderWithAttributes()
{
// Arrange
+ var dispatcher = Renderer.CreateDefaultDispatcher();
var expectedHtml = new[] { "<", "p", " ", "class", "=", "\"", "lead", "\"", ">", "Hello world!", "</", "p", ">" };
var serviceProvider = new ServiceCollection().AddSingleton(new RenderFragment(rtb =>
{
@@ -109,10 +115,10 @@ namespace Microsoft.AspNetCore.Components.Rendering
rtb.CloseElement();
})).BuildServiceProvider();
- var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder);
+ var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder, dispatcher);
// Act
- var result = htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty);
+ var result = GetResult(dispatcher.Invoke(() => htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty)));
// Assert
Assert.Equal(expectedHtml, result);
@@ -122,6 +128,7 @@ namespace Microsoft.AspNetCore.Components.Rendering
public void RenderComponent_HtmlEncodesAttributeValues()
{
// Arrange
+ var dispatcher = Renderer.CreateDefaultDispatcher();
var expectedHtml = new[] { "<", "p", " ", "class", "=", "\"", "<lead", "\"", ">", "Hello world!", "</", "p", ">" };
var serviceProvider = new ServiceCollection().AddSingleton(new RenderFragment(rtb =>
{
@@ -131,10 +138,10 @@ namespace Microsoft.AspNetCore.Components.Rendering
rtb.CloseElement();
})).BuildServiceProvider();
- var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder);
+ var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder, dispatcher);
// Act
- var result = htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty);
+ var result = GetResult(dispatcher.Invoke(() => htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty)));
// Assert
Assert.Equal(expectedHtml, result);
@@ -144,6 +151,7 @@ namespace Microsoft.AspNetCore.Components.Rendering
public void RenderComponent_CanRenderBooleanAttributes()
{
// Arrange
+ var dispatcher = Renderer.CreateDefaultDispatcher();
var expectedHtml = new[] { "<", "input", " ", "disabled", " />" };
var serviceProvider = new ServiceCollection().AddSingleton(new RenderFragment(rtb =>
{
@@ -152,10 +160,10 @@ namespace Microsoft.AspNetCore.Components.Rendering
rtb.CloseElement();
})).BuildServiceProvider();
- var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder);
+ var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder, dispatcher);
// Act
- var result = htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty);
+ var result = GetResult(dispatcher.Invoke(() => htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty)));
// Assert
Assert.Equal(expectedHtml, result);
@@ -165,6 +173,7 @@ namespace Microsoft.AspNetCore.Components.Rendering
public void RenderComponent_DoesNotRenderBooleanAttributesWhenValueIsFalse()
{
// Arrange
+ var dispatcher = Renderer.CreateDefaultDispatcher();
var expectedHtml = new[] { "<", "input", " />" };
var serviceProvider = new ServiceCollection().AddSingleton(new RenderFragment(rtb =>
{
@@ -173,10 +182,10 @@ namespace Microsoft.AspNetCore.Components.Rendering
rtb.CloseElement();
})).BuildServiceProvider();
- var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder);
+ var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder, dispatcher);
// Act
- var result = htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty);
+ var result = GetResult(dispatcher.Invoke(() => htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty)));
// Assert
Assert.Equal(expectedHtml, result);
@@ -186,6 +195,7 @@ namespace Microsoft.AspNetCore.Components.Rendering
public void RenderComponent_CanRenderWithChildren()
{
// Arrange
+ var dispatcher = Renderer.CreateDefaultDispatcher();
var expectedHtml = new[] { "<", "p", ">", "<", "span", ">", "Hello world!", "</", "span", ">", "</", "p", ">" };
var serviceProvider = new ServiceCollection().AddSingleton(new RenderFragment(rtb =>
{
@@ -196,10 +206,10 @@ namespace Microsoft.AspNetCore.Components.Rendering
rtb.CloseElement();
})).BuildServiceProvider();
- var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder);
+ var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder, dispatcher);
// Act
- var result = htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty);
+ var result = GetResult(dispatcher.Invoke(() => htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty)));
// Assert
Assert.Equal(expectedHtml, result);
@@ -209,6 +219,7 @@ namespace Microsoft.AspNetCore.Components.Rendering
public void RenderComponent_CanRenderWithMultipleChildren()
{
// Arrange
+ var dispatcher = Renderer.CreateDefaultDispatcher();
var expectedHtml = new[] { "<", "p", ">",
"<", "span", ">", "Hello world!", "</", "span", ">",
"<", "span", ">", "Bye Bye world!", "</", "span", ">",
@@ -226,10 +237,10 @@ namespace Microsoft.AspNetCore.Components.Rendering
rtb.CloseElement();
})).BuildServiceProvider();
- var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder);
+ var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder, dispatcher);
// Act
- var result = htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty);
+ var result = GetResult(dispatcher.Invoke(() => htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty)));
// Assert
Assert.Equal(expectedHtml, result);
@@ -239,6 +250,7 @@ namespace Microsoft.AspNetCore.Components.Rendering
public void RenderComponent_CanRenderComponentWithChildrenComponents()
{
// Arrange
+ var dispatcher = Renderer.CreateDefaultDispatcher();
var expectedHtml = new[] {
"<", "p", ">", "<", "span", ">", "Hello world!", "</", "span", ">", "</", "p", ">",
"<", "span", ">", "Child content!", "</", "span", ">"
@@ -255,10 +267,10 @@ namespace Microsoft.AspNetCore.Components.Rendering
rtb.CloseComponent();
})).BuildServiceProvider();
- var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder);
+ var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder, dispatcher);
// Act
- var result = htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty);
+ var result = GetResult(dispatcher.Invoke(() => htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty)));
// Assert
Assert.Equal(expectedHtml, result);
@@ -268,6 +280,7 @@ namespace Microsoft.AspNetCore.Components.Rendering
public void RenderComponent_ComponentReferenceNoops()
{
// Arrange
+ var dispatcher = Renderer.CreateDefaultDispatcher();
var expectedHtml = new[] {
"<", "p", ">", "<", "span", ">", "Hello world!", "</", "span", ">", "</", "p", ">",
"<", "span", ">", "Child content!", "</", "span", ">"
@@ -285,10 +298,10 @@ namespace Microsoft.AspNetCore.Components.Rendering
rtb.CloseComponent();
})).BuildServiceProvider();
- var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder);
+ var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder, dispatcher);
// Act
- var result = htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty);
+ var result = GetResult(dispatcher.Invoke(() => htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty)));
// Assert
Assert.Equal(expectedHtml, result);
@@ -298,6 +311,7 @@ namespace Microsoft.AspNetCore.Components.Rendering
public void RenderComponent_CanPassParameters()
{
// Arrange
+ var dispatcher = Renderer.CreateDefaultDispatcher();
var expectedHtml = new[] {
"<", "p", ">", "<", "input", " ", "value", "=", "\"", "5", "\"", " />", "</", "p", ">" };
@@ -315,16 +329,16 @@ namespace Microsoft.AspNetCore.Components.Rendering
.AddSingleton(new Func<ParameterCollection, RenderFragment>(Content))
.BuildServiceProvider();
- var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder);
+ var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder, dispatcher);
Action<UIChangeEventArgs> change = (UIChangeEventArgs changeArgs) => throw new InvalidOperationException();
// Act
- var result = htmlRenderer.RenderComponent<ComponentWithParameters>(
+ var result = GetResult(dispatcher.Invoke(() => htmlRenderer.RenderComponent<ComponentWithParameters>(
new ParameterCollection(new[] {
RenderTreeFrame.Element(0,string.Empty),
RenderTreeFrame.Attribute(1,"update",change),
RenderTreeFrame.Attribute(2,"value",5)
- }, 0));
+ }, 0))));
// Assert
Assert.Equal(expectedHtml, result);
@@ -334,6 +348,7 @@ namespace Microsoft.AspNetCore.Components.Rendering
public void RenderComponent_CanRenderComponentWithRenderFragmentContent()
{
// Arrange
+ var dispatcher = Renderer.CreateDefaultDispatcher();
var expectedHtml = new[] {
"<", "p", ">", "<", "span", ">", "Hello world!", "</", "span", ">", "</", "p", ">" };
var serviceProvider = new ServiceCollection().AddSingleton(new RenderFragment(rtb =>
@@ -347,10 +362,10 @@ namespace Microsoft.AspNetCore.Components.Rendering
rtb.CloseElement();
})).BuildServiceProvider();
- var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder);
+ var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder, dispatcher);
// Act
- var result = htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty);
+ var result = GetResult(dispatcher.Invoke(() => htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty)));
// Assert
Assert.Equal(expectedHtml, result);
@@ -360,6 +375,7 @@ namespace Microsoft.AspNetCore.Components.Rendering
public void RenderComponent_ElementRefsNoops()
{
// Arrange
+ var dispatcher = Renderer.CreateDefaultDispatcher();
var expectedHtml = new[] {
"<", "p", ">", "<", "span", ">", "Hello world!", "</", "span", ">", "</", "p", ">" };
var serviceProvider = new ServiceCollection().AddSingleton(new RenderFragment(rtb =>
@@ -374,15 +390,29 @@ namespace Microsoft.AspNetCore.Components.Rendering
rtb.CloseElement();
})).BuildServiceProvider();
- var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder);
+ var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder, dispatcher);
// Act
- var result = htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty);
+ var result = GetResult(dispatcher.Invoke(() => htmlRenderer.RenderComponent<TestComponent>(ParameterCollection.Empty)));
// Assert
Assert.Equal(expectedHtml, result);
}
+ private IEnumerable<string> GetResult(Task<IEnumerable<string>> task)
+ {
+ Assert.True(task.IsCompleted);
+ if (task.IsCompletedSuccessfully)
+ {
+ return task.Result;
+ }
+ else
+ {
+ ExceptionDispatchInfo.Capture(task.Exception).Throw();
+ throw new InvalidOperationException("We will never hit this line");
+ }
+ }
+
private class ComponentWithParameters : IComponent
{
public RenderHandle RenderHandle { get; private set; }
@@ -406,17 +436,18 @@ namespace Microsoft.AspNetCore.Components.Rendering
public async Task CanRender_AsyncComponent()
{
// Arrange
+ var dispatcher = Renderer.CreateDefaultDispatcher();
var expectedHtml = new[] {
"<", "p", ">", "20", "</", "p", ">" };
var serviceProvider = new ServiceCollection().AddSingleton<AsyncComponent>().BuildServiceProvider();
- var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder);
+ var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder, dispatcher);
// Act
- var result = await htmlRenderer.RenderComponentAsync<AsyncComponent>(ParameterCollection.FromDictionary(new Dictionary<string, object>
+ var result = await dispatcher.InvokeAsync(() => htmlRenderer.RenderComponentAsync<AsyncComponent>(ParameterCollection.FromDictionary(new Dictionary<string, object>
{
["Value"] = 10
- }));
+ })));
// Assert
Assert.Equal(expectedHtml, result);
@@ -426,6 +457,7 @@ namespace Microsoft.AspNetCore.Components.Rendering
public async Task CanRender_NestedAsyncComponents()
{
// Arrange
+ var dispatcher = Renderer.CreateDefaultDispatcher();
var expectedHtml = new[] {
"<", "p", ">", "20", "</", "p", ">",
"<", "p", ">", "80", "</", "p", ">"
@@ -433,14 +465,14 @@ namespace Microsoft.AspNetCore.Components.Rendering
var serviceProvider = new ServiceCollection().AddSingleton<AsyncComponent>().BuildServiceProvider();
- var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder);
+ var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder, dispatcher);
// Act
- var result = await htmlRenderer.RenderComponentAsync<NestedAsyncComponent>(ParameterCollection.FromDictionary(new Dictionary<string, object>
+ var result = await dispatcher.InvokeAsync(() => htmlRenderer.RenderComponentAsync<NestedAsyncComponent>(ParameterCollection.FromDictionary(new Dictionary<string, object>
{
["Nested"] = false,
["Value"] = 10
- }));
+ })));
// Assert
Assert.Equal(expectedHtml, result);
diff --git a/src/Components/Server/test/Circuits/CircuitSynchronizationContextTest.cs b/src/Components/Components/test/Rendering/RendererSynchronizationContextTests.cs
similarity index 91%
rename from src/Components/Server/test/Circuits/CircuitSynchronizationContextTest.cs
rename to src/Components/Components/test/Rendering/RendererSynchronizationContextTests.cs
index db785ac92fac8e0b369d80a0f0e8ad83f52ef3b6..cba0d236ef746e54c20719a43434446ffb557923 100644
--- a/src/Components/Server/test/Circuits/CircuitSynchronizationContextTest.cs
+++ b/src/Components/Components/test/Rendering/RendererSynchronizationContextTests.cs
@@ -1,17 +1,15 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
using System;
+using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
+using System.Text;
using System.Threading;
using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components.Server.Circuits;
using Xunit;
-namespace Microsoft.AspNetCore.Components.Server
+namespace Microsoft.AspNetCore.Components.Rendering
{
- public class CircuitSynchronizationContextTest
+ public class RendererSynchronizationContextTest
{
// Nothing should exceed the timeout in a successful run of the the tests, this is just here to catch
// failures.
@@ -21,7 +19,7 @@ namespace Microsoft.AspNetCore.Components.Server
public void Post_CanRunSynchronously_WhenNotBusy()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
var thread = Thread.CurrentThread;
Thread capturedThread = null;
@@ -39,7 +37,7 @@ namespace Microsoft.AspNetCore.Components.Server
public void Post_CanRunSynchronously_WhenNotBusy_Exception()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
// Act & Assert
Assert.Throws<InvalidTimeZoneException>(() => context.Post((_) =>
@@ -52,7 +50,7 @@ namespace Microsoft.AspNetCore.Components.Server
public async Task Post_CanRunAsynchronously_WhenBusy()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
var thread = Thread.CurrentThread;
Thread capturedThread = null;
@@ -92,7 +90,7 @@ namespace Microsoft.AspNetCore.Components.Server
public async Task Post_CanRunAsynchronously_CaptureExecutionContext()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
// CultureInfo uses the execution context.
CultureInfo.CurrentCulture = new CultureInfo("en-GB");
@@ -147,7 +145,7 @@ namespace Microsoft.AspNetCore.Components.Server
public async Task Post_CanRunAsynchronously_WhenBusy_Exception()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
Exception exception = null;
context.UnhandledException += (sender, e) =>
@@ -189,7 +187,7 @@ namespace Microsoft.AspNetCore.Components.Server
public async Task Post_BackgroundWorkItem_CanProcessMoreItemsInline()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
Thread capturedThread = null;
var e1 = new ManualResetEventSlim();
@@ -251,7 +249,7 @@ namespace Microsoft.AspNetCore.Components.Server
public void Post_CapturesContext()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
var e1 = new ManualResetEventSlim();
@@ -281,7 +279,7 @@ namespace Microsoft.AspNetCore.Components.Server
public void Send_CanRunSynchronously()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
var thread = Thread.CurrentThread;
Thread capturedThread = null;
@@ -299,7 +297,7 @@ namespace Microsoft.AspNetCore.Components.Server
public void Send_CanRunSynchronously_Exception()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
// Act & Assert
Assert.Throws<InvalidTimeZoneException>(() => context.Send((_) =>
@@ -312,7 +310,7 @@ namespace Microsoft.AspNetCore.Components.Server
public async Task Send_BlocksWhenOtherWorkRunning()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
var e1 = new ManualResetEventSlim();
var e2 = new ManualResetEventSlim();
@@ -359,7 +357,7 @@ namespace Microsoft.AspNetCore.Components.Server
public void Send_CapturesContext()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
var e1 = new ManualResetEventSlim();
@@ -390,7 +388,7 @@ namespace Microsoft.AspNetCore.Components.Server
public async Task Invoke_Void_CanRunSynchronously_WhenNotBusy()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
var thread = Thread.CurrentThread;
Thread capturedThread = null;
@@ -409,7 +407,7 @@ namespace Microsoft.AspNetCore.Components.Server
public async Task Invoke_Void_CanRunAsynchronously_WhenBusy()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
var thread = Thread.CurrentThread;
Thread capturedThread = null;
@@ -449,7 +447,7 @@ namespace Microsoft.AspNetCore.Components.Server
public async Task Invoke_Void_CanRethrowExceptions()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
// Act
var task = context.Invoke(() =>
@@ -465,7 +463,7 @@ namespace Microsoft.AspNetCore.Components.Server
public async Task Invoke_T_CanRunSynchronously_WhenNotBusy()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
var thread = Thread.CurrentThread;
// Act
@@ -482,7 +480,7 @@ namespace Microsoft.AspNetCore.Components.Server
public async Task Invoke_T_CanRunAsynchronously_WhenBusy()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
var thread = Thread.CurrentThread;
var e1 = new ManualResetEventSlim();
@@ -520,7 +518,7 @@ namespace Microsoft.AspNetCore.Components.Server
public async Task Invoke_T_CanRethrowExceptions()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
// Act
var task = context.Invoke<string>(() =>
@@ -536,7 +534,7 @@ namespace Microsoft.AspNetCore.Components.Server
public async Task InvokeAsync_Void_CanRunSynchronously_WhenNotBusy()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
var thread = Thread.CurrentThread;
Thread capturedThread = null;
@@ -556,7 +554,7 @@ namespace Microsoft.AspNetCore.Components.Server
public async Task InvokeAsync_Void_CanRunAsynchronously_WhenBusy()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
var thread = Thread.CurrentThread;
Thread capturedThread = null;
@@ -597,7 +595,7 @@ namespace Microsoft.AspNetCore.Components.Server
public async Task InvokeAsync_Void_CanRethrowExceptions()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
// Act
var task = context.InvokeAsync(() =>
@@ -613,7 +611,7 @@ namespace Microsoft.AspNetCore.Components.Server
public async Task InvokeAsync_T_CanRunSynchronously_WhenNotBusy()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
var thread = Thread.CurrentThread;
// Act
@@ -630,7 +628,7 @@ namespace Microsoft.AspNetCore.Components.Server
public async Task InvokeAsync_T_CanRunAsynchronously_WhenBusy()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
var thread = Thread.CurrentThread;
var e1 = new ManualResetEventSlim();
@@ -668,7 +666,7 @@ namespace Microsoft.AspNetCore.Components.Server
public async Task InvokeAsync_T_CanRethrowExceptions()
{
// Arrange
- var context = new CircuitSynchronizationContext();
+ var context = new RendererSynchronizationContext();
// Act
var task = context.InvokeAsync<string>(() =>
diff --git a/src/Components/Server/src/Circuits/CircuitHost.cs b/src/Components/Server/src/Circuits/CircuitHost.cs
index 434904cbc512f07d811d39dee9647cb39567c0e4..9e4366c180fedbf4779a898c36fdc3a863a87bfd 100644
--- a/src/Components/Server/src/Circuits/CircuitHost.cs
+++ b/src/Components/Server/src/Circuits/CircuitHost.cs
@@ -55,7 +55,6 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
RemoteRenderer renderer,
Action<IComponentsApplicationBuilder> configure,
IJSRuntime jsRuntime,
- CircuitSynchronizationContext synchronizationContext,
CircuitHandler[] circuitHandlers)
{
_scope = scope ?? throw new ArgumentNullException(nameof(scope));
@@ -64,7 +63,6 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
Renderer = renderer ?? throw new ArgumentNullException(nameof(renderer));
_configure = configure ?? throw new ArgumentNullException(nameof(configure));
JSRuntime = jsRuntime ?? throw new ArgumentNullException(nameof(jsRuntime));
- SynchronizationContext = synchronizationContext ?? throw new ArgumentNullException(nameof(synchronizationContext));
Services = scope.ServiceProvider;
@@ -72,7 +70,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
_circuitHandlers = circuitHandlers;
Renderer.UnhandledException += Renderer_UnhandledException;
- SynchronizationContext.UnhandledException += SynchronizationContext_UnhandledException;
+ Renderer.UnhandledSynchronizationException += SynchronizationContext_UnhandledException;
}
public string CircuitId { get; } = Guid.NewGuid().ToString();
@@ -89,11 +87,9 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
public IServiceProvider Services { get; }
- public CircuitSynchronizationContext SynchronizationContext { get; }
-
public async Task InitializeAsync(CancellationToken cancellationToken)
{
- await SynchronizationContext.InvokeAsync(async () =>
+ await Renderer.InvokeAsync(async () =>
{
SetCurrentCircuitHost(this);
@@ -127,10 +123,9 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
try
{
- await SynchronizationContext.Invoke(() =>
+ await Renderer.Invoke(() =>
{
SetCurrentCircuitHost(this);
-
DotNetDispatcher.BeginInvoke(callId, assemblyName, methodIdentifier, dotNetObjectId, argsJson);
});
}
@@ -142,7 +137,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
public async ValueTask DisposeAsync()
{
- await SynchronizationContext.InvokeAsync(async () =>
+ await Renderer.InvokeAsync(async () =>
{
for (var i = 0; i < _circuitHandlers.Length; i++)
{
diff --git a/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs b/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs
index 3a8b1b56ce5aec07cf82e381e84e42f5c2d389ff..7e91d230a2def48491922e4c02d7d1eea6766d6b 100644
--- a/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs
+++ b/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs
@@ -5,6 +5,7 @@ using System;
using System.Linq;
using Microsoft.AspNetCore.Components.Browser;
using Microsoft.AspNetCore.Components.Browser.Rendering;
+using Microsoft.AspNetCore.Components.Rendering;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.SignalR;
using Microsoft.Extensions.DependencyInjection;
@@ -41,8 +42,13 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
var scope = _scopeFactory.CreateScope();
var jsRuntime = new RemoteJSRuntime(client);
var rendererRegistry = new RendererRegistry();
- var synchronizationContext = new CircuitSynchronizationContext();
- var renderer = new RemoteRenderer(scope.ServiceProvider, rendererRegistry, jsRuntime, client, synchronizationContext);
+ var dispatcher = Renderer.CreateDefaultDispatcher();
+ var renderer = new RemoteRenderer(
+ scope.ServiceProvider,
+ rendererRegistry,
+ jsRuntime,
+ client,
+ dispatcher);
var circuitHandlers = scope.ServiceProvider.GetServices<CircuitHandler>()
.OrderBy(h => h.Order)
@@ -55,7 +61,6 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
renderer,
config,
jsRuntime,
- synchronizationContext,
circuitHandlers);
// Initialize per-circuit data that services need
diff --git a/src/Components/Server/src/Circuits/RemoteRenderer.cs b/src/Components/Server/src/Circuits/RemoteRenderer.cs
index b81673f8ca9cc7f2c432e8eabdc41d8a5968b468..f40da44b2f69ece447320dc5a34ad2ade043d00f 100644
--- a/src/Components/Server/src/Circuits/RemoteRenderer.cs
+++ b/src/Components/Server/src/Circuits/RemoteRenderer.cs
@@ -23,7 +23,6 @@ namespace Microsoft.AspNetCore.Components.Browser.Rendering
private readonly IClientProxy _client;
private readonly IJSRuntime _jsRuntime;
private readonly RendererRegistry _rendererRegistry;
- private readonly SynchronizationContext _syncContext;
private readonly ConcurrentDictionary<long, AutoCancelTaskCompletionSource<object>> _pendingRenders
= new ConcurrentDictionary<long, AutoCancelTaskCompletionSource<object>>();
private long _nextRenderId = 1;
@@ -46,13 +45,12 @@ namespace Microsoft.AspNetCore.Components.Browser.Rendering
RendererRegistry rendererRegistry,
IJSRuntime jsRuntime,
IClientProxy client,
- SynchronizationContext syncContext)
- : base(serviceProvider)
+ IDispatcher dispatcher)
+ : base(serviceProvider, dispatcher)
{
_rendererRegistry = rendererRegistry;
_jsRuntime = jsRuntime;
_client = client;
- _syncContext = syncContext ?? throw new ArgumentNullException(nameof(syncContext));
_id = _rendererRegistry.Add(this);
}
@@ -64,7 +62,7 @@ namespace Microsoft.AspNetCore.Components.Browser.Rendering
/// <typeparam name="TComponent">The type of the component.</typeparam>
/// <param name="domElementSelector">A CSS selector that uniquely identifies a DOM element.</param>
public void AddComponent<TComponent>(string domElementSelector)
- where TComponent: IComponent
+ where TComponent : IComponent
{
AddComponent(typeof(TComponent), domElementSelector);
}
@@ -90,36 +88,6 @@ namespace Microsoft.AspNetCore.Components.Browser.Rendering
RenderRootComponent(componentId);
}
- /// <inheritdoc />
- public override Task Invoke(Action workItem)
- {
- if (SynchronizationContext.Current == _syncContext)
- {
- // No need to dispatch. Avoid deadlock by invoking directly.
- return base.Invoke(workItem);
- }
- else
- {
- var syncContext = (CircuitSynchronizationContext)_syncContext;
- return syncContext.Invoke(workItem);
- }
- }
-
- /// <inheritdoc />
- public override Task InvokeAsync(Func<Task> workItem)
- {
- if (SynchronizationContext.Current == _syncContext)
- {
- // No need to dispatch. Avoid deadlock by invoking directly.
- return base.InvokeAsync(workItem);
- }
- else
- {
- var syncContext = (CircuitSynchronizationContext)_syncContext;
- return syncContext.InvokeAsync(workItem);
- }
- }
-
/// <inheritdoc />
protected override void Dispose(bool disposing)
{
@@ -127,23 +95,6 @@ namespace Microsoft.AspNetCore.Components.Browser.Rendering
_rendererRegistry.TryRemove(_id);
}
- protected override void AddToRenderQueue(int componentId, RenderFragment renderFragment)
- {
- // Render operations are not thread-safe, so they need to be serialized.
- // Plus, any other logic that mutates state accessed during rendering also
- // needs not to run concurrently with rendering so should be dispatched to
- // the renderer's sync context.
- if (SynchronizationContext.Current != _syncContext)
- {
- throw new RemoteRendererException(
- "The current thread is not associated with the renderer's synchronization context. " +
- "Use Invoke() or InvokeAsync() to switch execution to the renderer's synchronization " +
- "context when triggering rendering or modifying any state accessed during rendering.");
- }
-
- base.AddToRenderQueue(componentId, renderFragment);
- }
-
/// <inheritdoc />
protected override Task UpdateDisplayAsync(in RenderBatch batch)
{
diff --git a/src/Components/Server/test/Circuits/CircuitHostTest.cs b/src/Components/Server/test/Circuits/CircuitHostTest.cs
index ae25162015cd6973983db4fcf39ee0f303978c02..0b8685c9aa86572ac70ccfeeb94f0fc89932979f 100644
--- a/src/Components/Server/test/Circuits/CircuitHostTest.cs
+++ b/src/Components/Server/test/Circuits/CircuitHostTest.cs
@@ -129,7 +129,6 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
var clientProxy = Mock.Of<IClientProxy>();
var renderRegistry = new RendererRegistry();
var jsRuntime = Mock.Of<IJSRuntime>();
- var syncContext = new CircuitSynchronizationContext();
remoteRenderer = remoteRenderer ?? GetRemoteRenderer();
handlers = handlers ?? Array.Empty<CircuitHandler>();
@@ -141,8 +140,6 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
remoteRenderer,
configure: _ => { },
jsRuntime: jsRuntime,
- synchronizationContext:
- syncContext,
handlers);
}
@@ -152,14 +149,13 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
Mock.Of<IServiceProvider>(),
new RendererRegistry(),
Mock.Of<IJSRuntime>(),
- Mock.Of<IClientProxy>(),
- new CircuitSynchronizationContext());
+ Mock.Of<IClientProxy>());
}
private class TestRemoteRenderer : RemoteRenderer
{
- public TestRemoteRenderer(IServiceProvider serviceProvider, RendererRegistry rendererRegistry, IJSRuntime jsRuntime, IClientProxy client, SynchronizationContext syncContext)
- : base(serviceProvider, rendererRegistry, jsRuntime, client, syncContext)
+ public TestRemoteRenderer(IServiceProvider serviceProvider, RendererRegistry rendererRegistry, IJSRuntime jsRuntime, IClientProxy client)
+ : base(serviceProvider, rendererRegistry, jsRuntime, client, CreateDefaultDispatcher())
{
}
diff --git a/src/Components/Server/test/Circuits/RenderBatchWriterTest.cs b/src/Components/Server/test/Circuits/RenderBatchWriterTest.cs
index 14305a58341fcb27c30fd3a0a98899553f143a77..0edf120433ecf8e0c3960b64de1eda10cb6c9188 100644
--- a/src/Components/Server/test/Circuits/RenderBatchWriterTest.cs
+++ b/src/Components/Server/test/Circuits/RenderBatchWriterTest.cs
@@ -373,7 +373,7 @@ namespace Microsoft.AspNetCore.Components.Server
class FakeRenderer : Renderer
{
public FakeRenderer()
- : base(new ServiceCollection().BuildServiceProvider())
+ : base(new ServiceCollection().BuildServiceProvider(), new RendererSynchronizationContext())
{
}
diff --git a/src/Components/Shared/test/AutoRenderComponent.cs b/src/Components/Shared/test/AutoRenderComponent.cs
index 7051d65e65a29dff08c93e091b2d18c6d382096f..1e8bdd499609979b062c901b8200befc4cf5f637 100644
--- a/src/Components/Shared/test/AutoRenderComponent.cs
+++ b/src/Components/Shared/test/AutoRenderComponent.cs
@@ -1,9 +1,12 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+using System;
+using System.Runtime.ExceptionServices;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.RenderTree;
+using Xunit;
namespace Microsoft.AspNetCore.Components.Test.Helpers
{
@@ -23,8 +26,22 @@ namespace Microsoft.AspNetCore.Components.Test.Helpers
return Task.CompletedTask;
}
+ // We do it this way so that we don't have to be doing renderer.Invoke on each and every test.
public void TriggerRender()
- => _renderHandle.Render(BuildRenderTree);
+ {
+ var t = _renderHandle.Invoke(() => _renderHandle.Render(BuildRenderTree));
+ // This should always be run synchronously
+ Assert.True(t.IsCompleted);
+ if (t.IsFaulted)
+ {
+ var exception = t.Exception.Flatten().InnerException;
+ while (exception is AggregateException e)
+ {
+ exception = e.InnerException;
+ }
+ ExceptionDispatchInfo.Capture(exception).Throw();
+ }
+ }
protected abstract void BuildRenderTree(RenderTreeBuilder builder);
}
diff --git a/src/Components/Shared/test/TestRenderer.cs b/src/Components/Shared/test/TestRenderer.cs
index 7dd8c9249abb1b8e2343ba5669189d574f48695f..7efeb51e56a8bcdf85251bd9c2b61f9cc183caed 100644
--- a/src/Components/Shared/test/TestRenderer.cs
+++ b/src/Components/Shared/test/TestRenderer.cs
@@ -4,19 +4,25 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Runtime.ExceptionServices;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Rendering;
+using Xunit;
namespace Microsoft.AspNetCore.Components.Test.Helpers
{
public class TestRenderer : Renderer
{
- public TestRenderer(): this(new TestServiceProvider())
+ public TestRenderer() : this(new TestServiceProvider())
{
}
- public TestRenderer(IServiceProvider serviceProvider) : base(serviceProvider)
+ public TestRenderer(IDispatcher dispatcher) : base(new TestServiceProvider(), dispatcher)
+ {
+ }
+
+ public TestRenderer(IServiceProvider serviceProvider) : base(serviceProvider, new RendererSynchronizationContext())
{
}
@@ -29,16 +35,29 @@ namespace Microsoft.AspNetCore.Components.Test.Helpers
=> base.AssignRootComponentId(component);
public new void RenderRootComponent(int componentId)
- => base.RenderRootComponent(componentId);
+ => Invoke(() => base.RenderRootComponent(componentId));
public new Task RenderRootComponentAsync(int componentId)
- => base.RenderRootComponentAsync(componentId);
+ => InvokeAsync(() => base.RenderRootComponentAsync(componentId));
public new Task RenderRootComponentAsync(int componentId, ParameterCollection parameters)
- => base.RenderRootComponentAsync(componentId, parameters);
+ => InvokeAsync(() => base.RenderRootComponentAsync(componentId, parameters));
public new void DispatchEvent(int componentId, int eventHandlerId, UIEventArgs args)
- => base.DispatchEvent(componentId, eventHandlerId, args);
+ {
+ var t = Invoke(() => base.DispatchEvent(componentId, eventHandlerId, args));
+ // This should always be run synchronously
+ Assert.True(t.IsCompleted);
+ if (t.IsFaulted)
+ {
+ var exception = t.Exception.Flatten().InnerException;
+ while (exception is AggregateException e)
+ {
+ exception = e.InnerException;
+ }
+ ExceptionDispatchInfo.Capture(exception).Throw();
+ }
+ }
public T InstantiateComponent<T>() where T : IComponent
=> (T)InstantiateComponent(typeof(T));
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/ServerComponentRenderingTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/ServerComponentRenderingTest.cs
index 42825811716b632812dd684bee619617c16b2f4d..a1873ca9c8c2fb4a68ccd714dd0bfe2ba25eddae 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/ServerComponentRenderingTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/ServerComponentRenderingTest.cs
@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
using Microsoft.AspNetCore.Components.E2ETest.Tests;
using OpenQA.Selenium;
+using System;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;
@@ -32,7 +33,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
appElement.FindElement(By.Id("run-without-dispatch")).Click();
WaitAssert.Contains(
- $"{typeof(RemoteRendererException).FullName}: The current thread is not associated with the renderer's synchronization context",
+ $"{typeof(InvalidOperationException).FullName}: The current thread is not associated with the renderer's synchronization context",
() => result.Text);
}
}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperComponentExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperComponentExtensions.cs
index dd45a466883fe0672af49f7cc99ddcf5c96b56eb..e6af6078c9922496214d1d5b6b0a60532063dc74 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperComponentExtensions.cs
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperComponentExtensions.cs
@@ -51,12 +51,13 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures
var serviceProvider = htmlHelper.ViewContext.HttpContext.RequestServices;
var encoder = serviceProvider.GetRequiredService<HtmlEncoder>();
- using (var htmlRenderer = new HtmlRenderer(serviceProvider, encoder.Encode))
+ var dispatcher = Renderer.CreateDefaultDispatcher();
+ using (var htmlRenderer = new HtmlRenderer(serviceProvider, encoder.Encode, dispatcher))
{
- var result = await htmlRenderer.RenderComponentAsync<TComponent>(
+ var result = await dispatcher.InvokeAsync(() => htmlRenderer.RenderComponentAsync<TComponent>(
parameters == null ?
ParameterCollection.Empty :
- ParameterCollection.FromDictionary(HtmlHelper.ObjectToDictionary(parameters)));
+ ParameterCollection.FromDictionary(HtmlHelper.ObjectToDictionary(parameters))));
return new ComponentHtmlContent(result);
}