|
|
|
@ -6880,135 +6880,53 @@ |
|
|
|
|
"integrity": "sha512-tVkIU9JQw5fYPxLQgok/a7I6J1eEZ79svwQGpe2mb3jlVsPADOleefOnQBiS/takK7jQuNeswCUicMH1VWVziA==" |
|
|
|
|
}, |
|
|
|
|
"@remixproject/engine": { |
|
|
|
|
<<<<<<< .merge_file_DiBbcP |
|
|
|
|
"version": "0.3.3", |
|
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/engine/-/engine-0.3.3.tgz", |
|
|
|
|
"integrity": "sha512-0orGJhxHAFMUMokfDVq04yy0cvFknyrk9PcqvJw3KqChhusgkLw/J/KqJszywD9BmIjLgdc3n8vRtCmHICR3mA==", |
|
|
|
|
"integrity": "sha1-jEde0zAFQBj8C0s49f1FqbK9gIY=", |
|
|
|
|
"requires": { |
|
|
|
|
"@remixproject/plugin-api": "0.3.3", |
|
|
|
|
"@remixproject/plugin-utils": "0.3.3" |
|
|
|
|
}, |
|
|
|
|
"dependencies": { |
|
|
|
|
"@remixproject/plugin-api": { |
|
|
|
|
"version": "0.3.3", |
|
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/plugin-api/-/plugin-api-0.3.3.tgz", |
|
|
|
|
"integrity": "sha512-Wsic9cnTj/9B7dGKQEq+VTAwit2o7rtdVwJ+lcI68SbavhNHGo0IUexOZkxwGFL2THchWz2hjfrs80W10yle0A==", |
|
|
|
|
"requires": { |
|
|
|
|
"@remixproject/plugin-utils": "0.3.3" |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
"@remixproject/plugin-utils": { |
|
|
|
|
"version": "0.3.3", |
|
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/plugin-utils/-/plugin-utils-0.3.3.tgz", |
|
|
|
|
"integrity": "sha512-w1WCdS7bDmbaY83ybIjHzFW9TlQUV2Rt6Fw8hXGnT29ontD6mKoBWhoEPYzasMEHG47lmNzDjRToVPhQh54Q+w==", |
|
|
|
|
"requires": { |
|
|
|
|
"tslib": "2.0.1" |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
"tslib": { |
|
|
|
|
"version": "2.0.1", |
|
|
|
|
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", |
|
|
|
|
"integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==" |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
"@remixproject/engine-web": { |
|
|
|
|
"version": "0.3.3", |
|
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/engine-web/-/engine-web-0.3.3.tgz", |
|
|
|
|
"integrity": "sha512-GF+WHrZyT8OS9ApmAv6ujUfX/lfxbpfTYbYC0To/EznusrBYfm0tmem1xvmI4PJ5C1NOxz9j862S4I4AxWGOng==", |
|
|
|
|
"integrity": "sha1-ZQZD7museqljZNPHpuOwG7dgiZU=", |
|
|
|
|
"requires": { |
|
|
|
|
"@remixproject/engine": "0.3.3", |
|
|
|
|
"@remixproject/plugin-api": "0.3.3", |
|
|
|
|
"@remixproject/plugin-utils": "0.3.3" |
|
|
|
|
}, |
|
|
|
|
"dependencies": { |
|
|
|
|
"@remixproject/engine": { |
|
|
|
|
"version": "0.3.3", |
|
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/engine/-/engine-0.3.3.tgz", |
|
|
|
|
"integrity": "sha512-0orGJhxHAFMUMokfDVq04yy0cvFknyrk9PcqvJw3KqChhusgkLw/J/KqJszywD9BmIjLgdc3n8vRtCmHICR3mA==", |
|
|
|
|
"requires": { |
|
|
|
|
"@remixproject/plugin-api": "0.3.3", |
|
|
|
|
"@remixproject/plugin-utils": "0.3.3" |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
"@remixproject/plugin-api": { |
|
|
|
|
"version": "0.3.3", |
|
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/plugin-api/-/plugin-api-0.3.3.tgz", |
|
|
|
|
"integrity": "sha512-Wsic9cnTj/9B7dGKQEq+VTAwit2o7rtdVwJ+lcI68SbavhNHGo0IUexOZkxwGFL2THchWz2hjfrs80W10yle0A==", |
|
|
|
|
"requires": { |
|
|
|
|
"@remixproject/plugin-utils": "0.3.3" |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
"@remixproject/plugin-utils": { |
|
|
|
|
"version": "0.3.3", |
|
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/plugin-utils/-/plugin-utils-0.3.3.tgz", |
|
|
|
|
"integrity": "sha512-w1WCdS7bDmbaY83ybIjHzFW9TlQUV2Rt6Fw8hXGnT29ontD6mKoBWhoEPYzasMEHG47lmNzDjRToVPhQh54Q+w==", |
|
|
|
|
"requires": { |
|
|
|
|
"tslib": "2.0.1" |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
"tslib": { |
|
|
|
|
"version": "2.0.1", |
|
|
|
|
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", |
|
|
|
|
"integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==" |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
======= |
|
|
|
|
"version": "0.2.5", |
|
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/engine/-/engine-0.2.5.tgz", |
|
|
|
|
"integrity": "sha512-SLdS2s88+OARfDfumJMmvBH94BQgHrmzav00aZU3eal00bpOHuUaZ+Visn/rKFDUyxTsZBZ/EClV3ha/oDYNaQ==" |
|
|
|
|
>>>>>>> .merge_file_48u09z |
|
|
|
|
}, |
|
|
|
|
"@remixproject/plugin": { |
|
|
|
|
"version": "0.3.3", |
|
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/plugin/-/plugin-0.3.3.tgz", |
|
|
|
|
"integrity": "sha512-gSZdgBjb4y2N2+5kMfbJYjO2zH8b1pFd3xdY4ViL5vtt8l4lup+iOVidrGTv1lPPl7Snk+E8NQhRk8Snr6//mg==", |
|
|
|
|
"integrity": "sha1-yy+ifasg+IQ5CDJ2jmXRaRc8sAE=", |
|
|
|
|
"requires": { |
|
|
|
|
"@remixproject/plugin-api": "0.3.3", |
|
|
|
|
"@remixproject/plugin-utils": "0.3.3", |
|
|
|
|
"events": "3.2.0" |
|
|
|
|
}, |
|
|
|
|
"dependencies": { |
|
|
|
|
"@remixproject/plugin-api": { |
|
|
|
|
"version": "0.3.3", |
|
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/plugin-api/-/plugin-api-0.3.3.tgz", |
|
|
|
|
"integrity": "sha512-Wsic9cnTj/9B7dGKQEq+VTAwit2o7rtdVwJ+lcI68SbavhNHGo0IUexOZkxwGFL2THchWz2hjfrs80W10yle0A==", |
|
|
|
|
"requires": { |
|
|
|
|
"@remixproject/plugin-utils": "0.3.3" |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
"@remixproject/plugin-utils": { |
|
|
|
|
"version": "0.3.3", |
|
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/plugin-utils/-/plugin-utils-0.3.3.tgz", |
|
|
|
|
"integrity": "sha512-w1WCdS7bDmbaY83ybIjHzFW9TlQUV2Rt6Fw8hXGnT29ontD6mKoBWhoEPYzasMEHG47lmNzDjRToVPhQh54Q+w==", |
|
|
|
|
"requires": { |
|
|
|
|
"tslib": "2.0.1" |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
"events": { |
|
|
|
|
"version": "3.2.0", |
|
|
|
|
"resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz", |
|
|
|
|
"integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==" |
|
|
|
|
}, |
|
|
|
|
"tslib": { |
|
|
|
|
"version": "2.0.1", |
|
|
|
|
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", |
|
|
|
|
"integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==" |
|
|
|
|
"integrity": "sha1-k7h8GPjvzUICpGGuxN/AVWtjk3k=" |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
"@remixproject/plugin-api": { |
|
|
|
|
"version": "0.3.2", |
|
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/plugin-api/-/plugin-api-0.3.2.tgz", |
|
|
|
|
"integrity": "sha512-SR9NPv7hstTorUkna1LjdF5bEclNk0ejzGKmkzO3khCvw/Mii1H8lXo1W9fX1tmqpVqWYCdV/0hY5rnFnQAlSw==", |
|
|
|
|
"version": "0.3.3", |
|
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/plugin-api/-/plugin-api-0.3.3.tgz", |
|
|
|
|
"integrity": "sha1-jjutHY0IsBQ1g9F3Ko8XfrnfMHw=", |
|
|
|
|
"requires": { |
|
|
|
|
"@remixproject/plugin-utils": "0.3.2" |
|
|
|
|
"@remixproject/plugin-utils": "0.3.3" |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
"@remixproject/plugin-utils": { |
|
|
|
|
"version": "0.3.2", |
|
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/plugin-utils/-/plugin-utils-0.3.2.tgz", |
|
|
|
|
"integrity": "sha512-i7VQNU6XaigUgOoOHM0M379dAKLtKt83nHBSR2SZyt/397aQsBDuYg1Nwv4Y46S74FrZRKFRX9YGNZj1usB2IQ==", |
|
|
|
|
"version": "0.3.3", |
|
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/plugin-utils/-/plugin-utils-0.3.3.tgz", |
|
|
|
|
"integrity": "sha1-SBJncwtNIf9+xAQPogI53WChr5M=", |
|
|
|
|
"requires": { |
|
|
|
|
"tslib": "2.0.1" |
|
|
|
|
}, |
|
|
|
@ -7016,66 +6934,24 @@ |
|
|
|
|
"tslib": { |
|
|
|
|
"version": "2.0.1", |
|
|
|
|
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", |
|
|
|
|
"integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==" |
|
|
|
|
"integrity": "sha1-QQ6w0RPltjVkkO7HSWA3JbAhtD4=" |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
"@remixproject/plugin-webview": { |
|
|
|
|
"version": "0.3.3", |
|
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/plugin-webview/-/plugin-webview-0.3.3.tgz", |
|
|
|
|
"integrity": "sha512-2/O2hUgcTFFmuKYnHl65FW7n591lF1PLAmFUSzoUOezs0iAg8+IP1ydejVXFLWhZByLkiQezHu/kezA5g4cwaQ==", |
|
|
|
|
"integrity": "sha1-3x7RgdkD1ya0JTjfWsIp8cpQOqI=", |
|
|
|
|
"requires": { |
|
|
|
|
"@remixproject/plugin": "0.3.3", |
|
|
|
|
"@remixproject/plugin-api": "0.3.3", |
|
|
|
|
"@remixproject/plugin-utils": "0.3.3" |
|
|
|
|
}, |
|
|
|
|
"dependencies": { |
|
|
|
|
"@remixproject/plugin": { |
|
|
|
|
"version": "0.3.3", |
|
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/plugin/-/plugin-0.3.3.tgz", |
|
|
|
|
"integrity": "sha512-gSZdgBjb4y2N2+5kMfbJYjO2zH8b1pFd3xdY4ViL5vtt8l4lup+iOVidrGTv1lPPl7Snk+E8NQhRk8Snr6//mg==", |
|
|
|
|
"requires": { |
|
|
|
|
"@remixproject/plugin-api": "0.3.3", |
|
|
|
|
"@remixproject/plugin-utils": "0.3.3", |
|
|
|
|
"events": "3.2.0" |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
"@remixproject/plugin-api": { |
|
|
|
|
"version": "0.3.3", |
|
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/plugin-api/-/plugin-api-0.3.3.tgz", |
|
|
|
|
"integrity": "sha512-Wsic9cnTj/9B7dGKQEq+VTAwit2o7rtdVwJ+lcI68SbavhNHGo0IUexOZkxwGFL2THchWz2hjfrs80W10yle0A==", |
|
|
|
|
"requires": { |
|
|
|
|
"@remixproject/plugin-utils": "0.3.3" |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
"@remixproject/plugin-utils": { |
|
|
|
|
"version": "0.3.3", |
|
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/plugin-utils/-/plugin-utils-0.3.3.tgz", |
|
|
|
|
"integrity": "sha512-w1WCdS7bDmbaY83ybIjHzFW9TlQUV2Rt6Fw8hXGnT29ontD6mKoBWhoEPYzasMEHG47lmNzDjRToVPhQh54Q+w==", |
|
|
|
|
"requires": { |
|
|
|
|
"tslib": "2.0.1" |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
"events": { |
|
|
|
|
"version": "3.2.0", |
|
|
|
|
"resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz", |
|
|
|
|
"integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==" |
|
|
|
|
}, |
|
|
|
|
"tslib": { |
|
|
|
|
"version": "2.0.1", |
|
|
|
|
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", |
|
|
|
|
"integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==" |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
"@remixproject/plugin-ws": { |
|
|
|
|
"version": "0.3.3", |
|
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/plugin-ws/-/plugin-ws-0.3.3.tgz", |
|
|
|
|
<<<<<<< .merge_file_DiBbcP |
|
|
|
|
"integrity": "sha512-QHWv5sjzUIb+rsLyAcOV67tShx8fniJvxYglqURaBc9LXdz0j5QfwnDIGwJwvnkJqAsk3MnXizaIXMU7CvKuzw==", |
|
|
|
|
======= |
|
|
|
|
"integrity": "sha1-qxGVX9ut7uRG0FE+8gOnbyodNr8=", |
|
|
|
|
>>>>>>> .merge_file_48u09z |
|
|
|
|
"requires": { |
|
|
|
|
"@remixproject/plugin": "0.3.3", |
|
|
|
|
"@remixproject/plugin-api": "0.3.3", |
|
|
|
@ -16913,7 +16789,7 @@ |
|
|
|
|
"express-ws": { |
|
|
|
|
"version": "4.0.0", |
|
|
|
|
"resolved": "https://registry.npmjs.org/express-ws/-/express-ws-4.0.0.tgz", |
|
|
|
|
"integrity": "sha512-KEyUw8AwRET2iFjFsI1EJQrJ/fHeGiJtgpYgEWG3yDv4l/To/m3a2GaYfeGyB3lsWdvbesjF5XCMx+SVBgAAYw==", |
|
|
|
|
"integrity": "sha1-2r2NyXRRZBiQKkH+bjDtlJtNNsQ=", |
|
|
|
|
"requires": { |
|
|
|
|
"ws": "^5.2.0" |
|
|
|
|
}, |
|
|
|
@ -16921,7 +16797,7 @@ |
|
|
|
|
"ws": { |
|
|
|
|
"version": "5.2.2", |
|
|
|
|
"resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz", |
|
|
|
|
"integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==", |
|
|
|
|
"integrity": "sha1-3/7xSGa46NyRM1glFNG++vlumA8=", |
|
|
|
|
"requires": { |
|
|
|
|
"async-limiter": "~1.0.0" |
|
|
|
|
} |
|
|
|
@ -28292,6 +28168,7 @@ |
|
|
|
|
}, |
|
|
|
|
"dezalgo": { |
|
|
|
|
"version": "1.0.3", |
|
|
|
|
"resolved": false, |
|
|
|
|
"integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=", |
|
|
|
|
"requires": { |
|
|
|
|
"asap": "^2.0.0", |
|
|
|
@ -28920,6 +28797,7 @@ |
|
|
|
|
}, |
|
|
|
|
"normalize-git-url": { |
|
|
|
|
"version": "3.0.2", |
|
|
|
|
"resolved": false, |
|
|
|
|
"integrity": "sha1-jl8Uvgva7bc+ByADEKpBbCc1D8Q=" |
|
|
|
|
}, |
|
|
|
|
"normalize-package-data": { |
|
|
|
@ -28957,6 +28835,7 @@ |
|
|
|
|
}, |
|
|
|
|
"npm-install-checks": { |
|
|
|
|
"version": "3.0.0", |
|
|
|
|
"resolved": false, |
|
|
|
|
"integrity": "sha1-1K7N/VGlPjcjt7L5Oy7ijjB7wNc=", |
|
|
|
|
"requires": { |
|
|
|
|
"semver": "^2.3.0 || 3.x || 4 || 5" |
|
|
|
@ -29303,6 +29182,7 @@ |
|
|
|
|
}, |
|
|
|
|
"realize-package-specifier": { |
|
|
|
|
"version": "3.0.3", |
|
|
|
|
"resolved": false, |
|
|
|
|
"integrity": "sha1-0N74gpUrjeP2frpekRmWYScfQfQ=", |
|
|
|
|
"requires": { |
|
|
|
|
"dezalgo": "^1.0.1", |
|
|
|
@ -29839,6 +29719,7 @@ |
|
|
|
|
"dependencies": { |
|
|
|
|
"unique-slug": { |
|
|
|
|
"version": "2.0.0", |
|
|
|
|
"resolved": false, |
|
|
|
|
"integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=", |
|
|
|
|
"requires": { |
|
|
|
|
"imurmurhash": "^0.1.4" |
|
|
|
@ -36095,9 +35976,9 @@ |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
"remix-tabs": { |
|
|
|
|
"version": "1.0.52", |
|
|
|
|
"resolved": "https://registry.npmjs.org/remix-tabs/-/remix-tabs-1.0.52.tgz", |
|
|
|
|
"integrity": "sha512-ie3iZWW9SnurZ2GWgOAN7/IHBlPvT+0BIgnqHT0VdXMdb+sY5WmvabnZ/zUH34YnjKz07uGzQfOtw2lLqNDDTw==", |
|
|
|
|
"version": "1.0.53", |
|
|
|
|
"resolved": "https://registry.npmjs.org/remix-tabs/-/remix-tabs-1.0.53.tgz", |
|
|
|
|
"integrity": "sha512-kg6L9+n5MYPgj60WLY2TjHXRG2GClugvXxjcNn0rE24xEGjTw6n7aTiVMJxXgAJSC9kyeRlh01X/tD5S+6Kz9Q==", |
|
|
|
|
"dev": true, |
|
|
|
|
"requires": { |
|
|
|
|
"@fortawesome/fontawesome-svg-core": "^1.2.14", |
|
|
|
|