Merge remote-tracking branch 'origin/master'

This commit is contained in:
James Lyne 2021-12-09 18:38:13 +00:00
commit 78464ad937
2 changed files with 84 additions and 44 deletions

126
package-lock.json generated
View File

@ -39,7 +39,7 @@
"rimraf": "^3.0.2",
"rollup-plugin-analyzer": "^4.0",
"sass": "^1.43",
"ts-jest": "^27.0.7",
"ts-jest": "^27.1.1",
"ts-node": "^10.4.0",
"typescript": "^4.4",
"vite": "^2.7.1",
@ -4004,6 +4004,8 @@
"integrity": "sha512-l076A6o/PIgcyM24s0dWmDI/b8RQf41uWoJu9I0M71CtW/YSw5T5NUeXxs5lo2tFQD+O4CW4nBHJXx3OY5NpXg==",
"dev": true,
"hasInstallScript": true,
"optional": true,
"peer": true,
"bin": {
"esbuild": "bin/esbuild"
},
@ -4038,7 +4040,8 @@
"optional": true,
"os": [
"android"
]
],
"peer": true
},
"node_modules/esbuild-darwin-64": {
"version": "0.14.2",
@ -4051,7 +4054,8 @@
"optional": true,
"os": [
"darwin"
]
],
"peer": true
},
"node_modules/esbuild-darwin-arm64": {
"version": "0.14.2",
@ -4064,7 +4068,8 @@
"optional": true,
"os": [
"darwin"
]
],
"peer": true
},
"node_modules/esbuild-freebsd-64": {
"version": "0.14.2",
@ -4077,7 +4082,8 @@
"optional": true,
"os": [
"freebsd"
]
],
"peer": true
},
"node_modules/esbuild-freebsd-arm64": {
"version": "0.14.2",
@ -4090,7 +4096,8 @@
"optional": true,
"os": [
"freebsd"
]
],
"peer": true
},
"node_modules/esbuild-linux-32": {
"version": "0.14.2",
@ -4103,7 +4110,8 @@
"optional": true,
"os": [
"linux"
]
],
"peer": true
},
"node_modules/esbuild-linux-64": {
"version": "0.14.2",
@ -4116,7 +4124,8 @@
"optional": true,
"os": [
"linux"
]
],
"peer": true
},
"node_modules/esbuild-linux-arm": {
"version": "0.14.2",
@ -4129,7 +4138,8 @@
"optional": true,
"os": [
"linux"
]
],
"peer": true
},
"node_modules/esbuild-linux-arm64": {
"version": "0.14.2",
@ -4142,7 +4152,8 @@
"optional": true,
"os": [
"linux"
]
],
"peer": true
},
"node_modules/esbuild-linux-mips64le": {
"version": "0.14.2",
@ -4155,7 +4166,8 @@
"optional": true,
"os": [
"linux"
]
],
"peer": true
},
"node_modules/esbuild-linux-ppc64le": {
"version": "0.14.2",
@ -4168,7 +4180,8 @@
"optional": true,
"os": [
"linux"
]
],
"peer": true
},
"node_modules/esbuild-netbsd-64": {
"version": "0.14.2",
@ -4181,7 +4194,8 @@
"optional": true,
"os": [
"netbsd"
]
],
"peer": true
},
"node_modules/esbuild-openbsd-64": {
"version": "0.14.2",
@ -4194,7 +4208,8 @@
"optional": true,
"os": [
"openbsd"
]
],
"peer": true
},
"node_modules/esbuild-sunos-64": {
"version": "0.14.2",
@ -4207,7 +4222,8 @@
"optional": true,
"os": [
"sunos"
]
],
"peer": true
},
"node_modules/esbuild-windows-32": {
"version": "0.14.2",
@ -4220,7 +4236,8 @@
"optional": true,
"os": [
"win32"
]
],
"peer": true
},
"node_modules/esbuild-windows-64": {
"version": "0.14.2",
@ -4233,7 +4250,8 @@
"optional": true,
"os": [
"win32"
]
],
"peer": true
},
"node_modules/esbuild-windows-arm64": {
"version": "0.14.2",
@ -4246,7 +4264,8 @@
"optional": true,
"os": [
"win32"
]
],
"peer": true
},
"node_modules/escalade": {
"version": "3.1.1",
@ -10832,13 +10851,12 @@
}
},
"node_modules/ts-jest": {
"version": "27.1.0",
"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-27.1.0.tgz",
"integrity": "sha512-ZouWlP03JMtzfNHg0ZeDrxAESYGmVhWyHtIl2/01kBbXaMbTr4Vhv6/GeMxUed6GFg/4ycMo+yU6Eo9gI16xTQ==",
"version": "27.1.1",
"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-27.1.1.tgz",
"integrity": "sha512-Ds0VkB+cB+8g2JUmP/GKWndeZcCKrbe6jzolGrVWdqVUFByY/2KDHqxJ7yBSon7hDB1TA4PXxjfZ+JjzJisvgA==",
"dev": true,
"dependencies": {
"bs-logger": "0.x",
"esbuild": "~0.14.0",
"fast-json-stable-stringify": "2.x",
"jest-util": "^27.0.0",
"json5": "2.x",
@ -10857,6 +10875,7 @@
"@babel/core": ">=7.0.0-beta.0 <8",
"@types/jest": "^27.0.0",
"babel-jest": ">=27.0.0 <28",
"esbuild": "~0.14.0",
"jest": "^27.0.0",
"typescript": ">=3.8 <5.0"
},
@ -10869,6 +10888,9 @@
},
"babel-jest": {
"optional": true
},
"esbuild": {
"optional": true
}
}
},
@ -15194,6 +15216,8 @@
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.2.tgz",
"integrity": "sha512-l076A6o/PIgcyM24s0dWmDI/b8RQf41uWoJu9I0M71CtW/YSw5T5NUeXxs5lo2tFQD+O4CW4nBHJXx3OY5NpXg==",
"dev": true,
"optional": true,
"peer": true,
"requires": {
"esbuild-android-arm64": "0.14.2",
"esbuild-darwin-64": "0.14.2",
@ -15219,119 +15243,136 @@
"resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.2.tgz",
"integrity": "sha512-hEixaKMN3XXCkoe+0WcexO4CcBVU5DCSUT+7P8JZiWZCbAjSkc9b6Yz2X5DSfQmRCtI/cQRU6TfMYrMQ5NBfdw==",
"dev": true,
"optional": true
"optional": true,
"peer": true
},
"esbuild-darwin-64": {
"version": "0.14.2",
"resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.2.tgz",
"integrity": "sha512-Uq8t0cbJQkxkQdbUfOl2wZqZ/AtLZjvJulR1HHnc96UgyzG9YlCLSDMiqjM+NANEy7/zzvwKJsy3iNC9wwqLJA==",
"dev": true,
"optional": true
"optional": true,
"peer": true
},
"esbuild-darwin-arm64": {
"version": "0.14.2",
"resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.2.tgz",
"integrity": "sha512-619MSa17sr7YCIrUj88KzQu2ESA4jKYtIYfLU/smX6qNgxQt3Y/gzM4s6sgJ4fPQzirvmXgcHv1ZNQAs/Xh48A==",
"dev": true,
"optional": true
"optional": true,
"peer": true
},
"esbuild-freebsd-64": {
"version": "0.14.2",
"resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.2.tgz",
"integrity": "sha512-aP6FE/ZsChZpUV6F3HE3x1Pz0paoYXycJ7oLt06g0G9dhJKknPawXCqQg/WMyD+ldCEZfo7F1kavenPdIT/SGQ==",
"dev": true,
"optional": true
"optional": true,
"peer": true
},
"esbuild-freebsd-arm64": {
"version": "0.14.2",
"resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.2.tgz",
"integrity": "sha512-LSm98WTb1QIhyS83+Po0KTpZNdd2XpVpI9ua5rLWqKWbKeNRFwOsjeiuwBaRNc+O32s9oC2ZMefETxHBV6VNkQ==",
"dev": true,
"optional": true
"optional": true,
"peer": true
},
"esbuild-linux-32": {
"version": "0.14.2",
"resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.2.tgz",
"integrity": "sha512-8VxnNEyeUbiGflTKcuVc5JEPTqXfsx2O6ABwUbfS1Hp26lYPRPC7pKQK5Dxa0MBejGc50jy7YZae3EGQUQ8EkQ==",
"dev": true,
"optional": true
"optional": true,
"peer": true
},
"esbuild-linux-64": {
"version": "0.14.2",
"resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.2.tgz",
"integrity": "sha512-4bzMS2dNxOJoFIiHId4w+tqQzdnsch71JJV1qZnbnErSFWcR9lRgpSqWnTTFtv6XM+MvltRzSXC5wQ7AEBY6Hg==",
"dev": true,
"optional": true
"optional": true,
"peer": true
},
"esbuild-linux-arm": {
"version": "0.14.2",
"resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.2.tgz",
"integrity": "sha512-PaylahvMHhH8YMfJPMKEqi64qA0Su+d4FNfHKvlKes/2dUe4QxgbwXT9oLVgy8iJdcFMrO7By4R8fS8S0p8aVQ==",
"dev": true,
"optional": true
"optional": true,
"peer": true
},
"esbuild-linux-arm64": {
"version": "0.14.2",
"resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.2.tgz",
"integrity": "sha512-RlIVp0RwJrdtasDF1vTFueLYZ8WuFzxoQ1OoRFZOTyJHCGCNgh7xJIC34gd7B7+RT0CzLBB4LcM5n0LS+hIoww==",
"dev": true,
"optional": true
"optional": true,
"peer": true
},
"esbuild-linux-mips64le": {
"version": "0.14.2",
"resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.2.tgz",
"integrity": "sha512-Fdwrq2roFnO5oetIiUQQueZ3+5soCxBSJswg3MvYaXDomj47BN6oAWMZgLrFh1oVrtWrxSDLCJBenYdbm2s+qQ==",
"dev": true,
"optional": true
"optional": true,
"peer": true
},
"esbuild-linux-ppc64le": {
"version": "0.14.2",
"resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.2.tgz",
"integrity": "sha512-vxptskw8JfCDD9QqpRO0XnsM1osuWeRjPaXX1TwdveLogYsbdFtcuiuK/4FxGiNMUr1ojtnCS2rMPbY8puc5NA==",
"dev": true,
"optional": true
"optional": true,
"peer": true
},
"esbuild-netbsd-64": {
"version": "0.14.2",
"resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.2.tgz",
"integrity": "sha512-I8+LzYK5iSNpspS9eCV9sW67Rj8FgMHimGri4mKiGAmN0pNfx+hFX146rYtzGtewuxKtTsPywWteHx+hPRLDsw==",
"dev": true,
"optional": true
"optional": true,
"peer": true
},
"esbuild-openbsd-64": {
"version": "0.14.2",
"resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.2.tgz",
"integrity": "sha512-120HgMe9elidWUvM2E6mMf0csrGwx8sYDqUIJugyMy1oHm+/nT08bTAVXuwYG/rkMIqsEO9AlMxuYnwR6En/3Q==",
"dev": true,
"optional": true
"optional": true,
"peer": true
},
"esbuild-sunos-64": {
"version": "0.14.2",
"resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.2.tgz",
"integrity": "sha512-Q3xcf9Uyfra9UuCFxoLixVvdigo0daZaKJ97TL2KNA4bxRUPK18wwGUk3AxvgDQZpRmg82w9PnkaNYo7a+24ow==",
"dev": true,
"optional": true
"optional": true,
"peer": true
},
"esbuild-windows-32": {
"version": "0.14.2",
"resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.2.tgz",
"integrity": "sha512-TW7O49tPsrq+N1sW8mb3m24j/iDGa4xzAZH4wHWwoIzgtZAYPKC0hpIhufRRG/LA30bdMChO9pjJZ5mtcybtBQ==",
"dev": true,
"optional": true
"optional": true,
"peer": true
},
"esbuild-windows-64": {
"version": "0.14.2",
"resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.2.tgz",
"integrity": "sha512-Rym6ViMNmi1E2QuQMWy0AFAfdY0wGwZD73BnzlsQBX5hZBuy/L+Speh7ucUZ16gwsrMM9v86icZUDrSN/lNBKg==",
"dev": true,
"optional": true
"optional": true,
"peer": true
},
"esbuild-windows-arm64": {
"version": "0.14.2",
"resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.2.tgz",
"integrity": "sha512-ZrLbhr0vX5Em/P1faMnHucjVVWPS+m3tktAtz93WkMZLmbRJevhiW1y4CbulBd2z0MEdXZ6emDa1zFHq5O5bSA==",
"dev": true,
"optional": true
"optional": true,
"peer": true
},
"escalade": {
"version": "3.1.1",
@ -20339,13 +20380,12 @@
"dev": true
},
"ts-jest": {
"version": "27.1.0",
"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-27.1.0.tgz",
"integrity": "sha512-ZouWlP03JMtzfNHg0ZeDrxAESYGmVhWyHtIl2/01kBbXaMbTr4Vhv6/GeMxUed6GFg/4ycMo+yU6Eo9gI16xTQ==",
"version": "27.1.1",
"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-27.1.1.tgz",
"integrity": "sha512-Ds0VkB+cB+8g2JUmP/GKWndeZcCKrbe6jzolGrVWdqVUFByY/2KDHqxJ7yBSon7hDB1TA4PXxjfZ+JjzJisvgA==",
"dev": true,
"requires": {
"bs-logger": "0.x",
"esbuild": "~0.14.0",
"fast-json-stable-stringify": "2.x",
"jest-util": "^27.0.0",
"json5": "2.x",

View File

@ -45,7 +45,7 @@
"rimraf": "^3.0.2",
"rollup-plugin-analyzer": "^4.0",
"sass": "^1.43",
"ts-jest": "^27.0.7",
"ts-jest": "^27.1.1",
"ts-node": "^10.4.0",
"typescript": "^4.4",
"vite": "^2.7.1",