From c40c7863639dbe99ce81f0de06752d2e53407ff7 Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Thu, 29 Jun 2023 13:52:34 +0200 Subject: [PATCH 01/85] build: update `purs`, update `spago`, upgrade package-set --- flake.nix | 8 ++++---- nix/default.nix | 2 +- packages.dhall | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 0617a244e6..2fdb67d7e8 100644 --- a/flake.nix +++ b/flake.nix @@ -240,25 +240,25 @@ spago = final: prev: { easy-ps = prev.easy-ps // { spago = prev.easy-ps.spago.overrideAttrs (_: rec { - version = "0.20.7"; + version = "0.21.0"; src = if final.stdenv.isDarwin then final.fetchurl { url = "https://github.com/purescript/spago/releases/download/${version}/macOS.tar.gz"; - sha256 = "0s5zgz4kqglsavyh7h70zmn16vayg30alp42w3nx0zwaqkp79xla"; + sha256 = "19c0kdg7gk1c7v00lnkcsxidffab84d50d6l6vgrjy4i86ilhzd5"; } else final.fetchurl { url = "https://github.com/purescript/spago/releases/download/${version}/Linux.tar.gz"; - sha256 = "0bh15dr1fg306kifqipnakv3rxab7hjfpcfzabw7vmg0gsfx8xka"; + sha256 = "1klczy04vwn5b39cnxflcqzap0d5kysp4dsw73i95xm5m7s37049"; }; }); }; }; runtime = - ( + final: prev: let inherit (prev) system; diff --git a/nix/default.nix b/nix/default.nix index 6330ad85a1..ac278b4449 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -25,7 +25,7 @@ let inherit (pkgs) system; - purs = pkgs.easy-ps.purs-0_14_9; + purs = pkgs.easy-ps.purs-0_15_4; spagoPkgs = import spagoPackages { inherit pkgs; }; diff --git a/packages.dhall b/packages.dhall index ab77a74388..e9dbf7665d 100644 --- a/packages.dhall +++ b/packages.dhall @@ -105,8 +105,8 @@ in upstream ------------------------------- -} let upstream = - https://github.com/purescript/package-sets/releases/download/psc-0.14.5-20220224/packages.dhall - sha256:67cc3d4f0e8fb72bb1413ba94ddd72a3ceb0783eb725e3b22ad7568b3b581163 + https://github.com/purescript/package-sets/releases/download/psc-0.15.4-20230105/packages.dhall + sha256:3e9fbc9ba03e9a1fcfd895f65e2d50ee2f5e86c4cd273f3d5c841b655a0e1bda let additions = { aeson = From 5d0d3160804bc099b81d9a068ebb42cb42b3a4c9 Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Thu, 29 Jun 2023 16:05:42 +0200 Subject: [PATCH 02/85] build: update `medea` and `sequences` deps, remove `math` --- packages.dhall | 9 ++++----- spago.dhall | 1 - src/Internal/Types/Interval.purs | 2 +- test/Utils.purs | 3 --- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/packages.dhall b/packages.dhall index e9dbf7665d..adbf6f358a 100644 --- a/packages.dhall +++ b/packages.dhall @@ -183,8 +183,8 @@ let additions = , "unfoldable" , "unsafe-coerce" ] - , repo = "https://github.com/hdgarrood/purescript-sequences" - , version = "v3.0.2" + , repo = "https://github.com/garganscript/purescript-sequences" + , version = "cae456c1a7463785ad33981a93e7a9cb5fc7872c" } , properties = { dependencies = [ "prelude", "console" ] @@ -243,8 +243,8 @@ let additions = , "unordered-collections" , "unsafe-coerce" ] - , repo = "https://github.com/juspay/medea-ps.git" - , version = "8b215851959aa8bbf33e6708df6bd683c89d1a5a" + , repo = "https://github.com/errfrom/medea-ps.git" + , version = "00981e4ce7249808413a6db8d88d849bbe85245a" } , purescript-toppokki = { dependencies = @@ -276,4 +276,3 @@ let additions = } in (upstream // additions) - with parsing.version = "v7.0.1" diff --git a/spago.dhall b/spago.dhall index 6059312650..b7ca7cfcd5 100644 --- a/spago.dhall +++ b/spago.dhall @@ -41,7 +41,6 @@ You can edit this file as you like. , "js-date" , "lattice" , "lists" - , "math" , "maybe" , "medea" , "media-types" diff --git a/src/Internal/Types/Interval.purs b/src/Internal/Types/Interval.purs index 6f13edd7cd..16a331cd01 100644 --- a/src/Internal/Types/Interval.purs +++ b/src/Internal/Types/Interval.purs @@ -132,11 +132,11 @@ import Data.List (List(Nil), (:)) import Data.Maybe (Maybe(Just, Nothing), fromJust, maybe) import Data.Newtype (class Newtype, unwrap, wrap) import Data.NonEmpty ((:|)) +import Data.Number (trunc, (%)) as Math import Data.Show.Generic (genericShow) import Data.Tuple (uncurry) import Data.Tuple.Nested (type (/\), (/\)) import Foreign.Object (Object) -import Math (trunc, (%)) as Math import Partial.Unsafe (unsafePartial) import Prim.TypeError (class Warn, Text) import Test.QuickCheck (class Arbitrary, arbitrary) diff --git a/test/Utils.purs b/test/Utils.purs index 01278d474b..1425d95be4 100644 --- a/test/Utils.purs +++ b/test/Utils.purs @@ -34,7 +34,6 @@ import Control.Monad.Error.Class ) import Control.Monad.Except.Trans (ExceptT, runExceptT) import Control.MonadPlus (class MonadPlus) -import Control.MonadZero (class MonadZero) import Control.Plus (class Plus) import Ctl.Internal.Test.TestPlanM (TestPlanM) import Data.DateTime.Instant (unInstant) @@ -72,8 +71,6 @@ derive newtype instance monadThrowValidationM :: derive newtype instance monadErrorValidationM :: MonadError ValidationError ValidationM --- note: MonadZero is being deprecated -derive newtype instance monadZeroValidationM :: MonadZero ValidationM derive newtype instance monadPlusValidationM :: MonadPlus ValidationM instance altValidationM :: Alt ValidationM where alt (ValidationM first) (ValidationM second) = case runExceptT first of From dcc6a7cbef5f42931b2dd403a080d0906bf59c35 Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Thu, 29 Jun 2023 16:26:40 +0200 Subject: [PATCH 03/85] build: update `bignumber` dependency, fix `flake.nix` --- flake.nix | 2 +- packages.dhall | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 2fdb67d7e8..8b6b9d4e02 100644 --- a/flake.nix +++ b/flake.nix @@ -258,7 +258,7 @@ }; }; runtime = - + ( final: prev: let inherit (prev) system; diff --git a/packages.dhall b/packages.dhall index adbf6f358a..489533a0f7 100644 --- a/packages.dhall +++ b/packages.dhall @@ -160,8 +160,8 @@ let additions = , "prelude" , "tuples" ] - , repo = "https://github.com/mlabs-haskell/purescript-bignumber" - , version = "705923edd892a3397b90d28ce7db9a7181dcd599" + , repo = "https://github.com/errfrom/purescript-bignumber" + , version = "9b3179ad07428d189e42a7a205aab9c7c4849d4a" } , sequences = { dependencies = From 87606c057fc1f132988a8b5bc51ed5f6bf2e17e6 Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Thu, 29 Jun 2023 17:56:55 +0200 Subject: [PATCH 04/85] build: update `aeson` dependency --- packages.dhall | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages.dhall b/packages.dhall index 489533a0f7..c98d7f1649 100644 --- a/packages.dhall +++ b/packages.dhall @@ -145,8 +145,8 @@ let additions = , "uint" , "untagged-union" ] - , repo = "https://github.com/mlabs-haskell/purescript-aeson.git" - , version = "bfd8f4dcd0522a076320f9dc710c24817438e02e" + , repo = "https://github.com/errfrom/purescript-aeson.git" + , version = "f092a1fc9b0ecc2445accf5bf0aad10e6eade89b" } , bignumber = { dependencies = From 36c0ce2e70c8c4bae3aae83d03399922d65375d4 Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Fri, 30 Jun 2023 13:05:32 +0200 Subject: [PATCH 05/85] build: update `noble-secp256k1` dependency --- packages.dhall | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages.dhall b/packages.dhall index c98d7f1649..8385f98007 100644 --- a/packages.dhall +++ b/packages.dhall @@ -270,8 +270,8 @@ let additions = , "unsafe-coerce" ] , repo = - "https://github.com/mlabs-haskell/purescript-noble-secp256k1.git" - , version = "710c15c48c5afae5e0623664d982a587ff2bd177" + "https://github.com/errfrom/purescript-noble-secp256k1.git" + , version = "9fc5db67e2b6e8b027c415e4dd1625c3f1d8b623" } } From cc5dc895826e251a6ffc01900c305c0460a43f1f Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Fri, 30 Jun 2023 13:30:24 +0200 Subject: [PATCH 06/85] build: update `toppokki` dependency --- packages.dhall | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages.dhall b/packages.dhall index 8385f98007..e937395da1 100644 --- a/packages.dhall +++ b/packages.dhall @@ -256,8 +256,8 @@ let additions = , "node-buffer" , "node-fs-aff" ] - , repo = "https://github.com/firefrorefiddle/purescript-toppokki" - , version = "6983e07bf0aa55ab779bcef12df3df339a2b5bd9" + , repo = "https://github.com/errfrom/purescript-toppokki" + , version = "b043e9342463df76972d05981ac4ec25316834bf" } , noble-secp256k1 = { dependencies = From 1f2f31e958f90fc94d834fc7a2fd5e719d3dd3d4 Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Fri, 30 Jun 2023 14:21:57 +0200 Subject: [PATCH 07/85] build: use esm exports, fix aeson instances for `Plutus.AssocMap` --- examples/AlwaysMints.js | 2 +- examples/AlwaysSucceeds.js | 2 +- examples/ECDSA.js | 2 +- examples/ExUnits.js | 2 +- examples/IncludeDatum.js | 2 +- examples/KeyWallet/Internal/Cip30HtmlForm.js | 58 +- .../KeyWallet/Internal/Pkh2PkhHtmlForm.js | 58 +- examples/Lose7Ada.js | 2 +- examples/MintsMultipleTokens.js | 6 +- examples/MultipleRedeemers.js | 6 +- examples/OneShotMinting.js | 2 +- examples/OtherTypeTextEnvelope.js | 2 +- examples/PlutusV2/InlineDatum.js | 2 +- examples/PlutusV2/OneShotMinting.js | 2 +- examples/PlutusV2/Scripts/AlwaysMints.js | 2 +- examples/PlutusV2/Scripts/AlwaysSucceeds.js | 2 +- examples/Schnorr.js | 2 +- src/Contract/Test/Utils.js | 8 +- src/Internal/ApplyArgs.js | 38 +- src/Internal/BalanceTx/UtxoMinAda.js | 25 +- src/Internal/Base64.js | 24 +- src/Internal/Cardano/Types/Transaction.purs | 36 +- src/Internal/Deserialization/BigInt.js | 4 +- src/Internal/Deserialization/FromBytes.js | 16 +- src/Internal/Deserialization/Keys.js | 72 ++- src/Internal/Deserialization/Language.js | 20 +- src/Internal/Deserialization/NativeScript.js | 65 ++- src/Internal/Deserialization/PlutusData.js | 70 ++- src/Internal/Deserialization/Transaction.js | 518 ++++++++++------- src/Internal/Deserialization/UnspentOutput.js | 54 +- src/Internal/Deserialization/WitnessSet.js | 68 ++- src/Internal/FfiHelpers.js | 64 +- src/Internal/Hashing.js | 47 +- src/Internal/JsWebSocket.js | 168 +++--- src/Internal/Metadata/ToMetadata.purs | 6 - src/Internal/Plutip/PortCheck.js | 48 +- src/Internal/Plutip/Spawn.js | 30 +- src/Internal/Plutip/Utils.js | 6 +- src/Internal/Plutus/Types/AssocMap.purs | 15 +- src/Internal/QueryM/UniqueId.js | 6 +- src/Internal/Serialization.js | 546 +++++++++++------- src/Internal/Serialization/Address.js | 169 +++--- src/Internal/Serialization/AuxiliaryData.js | 57 +- src/Internal/Serialization/BigInt.js | 16 +- src/Internal/Serialization/Hash.js | 66 ++- src/Internal/Serialization/Keys.js | 14 +- src/Internal/Serialization/MinFee.js | 24 +- src/Internal/Serialization/NativeScript.js | 49 +- src/Internal/Serialization/PlutusData.js | 74 ++- src/Internal/Serialization/PlutusScript.js | 12 +- src/Internal/Serialization/ToBytes.js | 4 +- src/Internal/Serialization/WitnessSet.js | 101 +++- src/Internal/Test/E2E/Feedback.js | 4 +- src/Internal/Test/E2E/Feedback/Browser.js | 24 +- src/Internal/Test/E2E/Route.js | 112 ++-- src/Internal/Test/E2E/Runner.js | 20 +- src/Internal/Test/E2E/Wallets.js | 10 +- src/Internal/Types/BigNum.js | 63 +- src/Internal/Types/ByteArray.js | 133 +++-- src/Internal/Types/Int.js | 9 +- src/Internal/Types/TokenName.js | 20 +- src/Internal/Wallet.js | 68 ++- src/Internal/Wallet/Bip32.js | 42 +- src/Internal/Wallet/Cip30.js | 82 ++- src/Internal/Wallet/Cip30/SignData.js | 122 ++-- src/Internal/Wallet/Cip30Mock.js | 90 +-- test/ApplyArgs.js | 2 +- test/Wallet/Cip30/SignData.js | 114 ++-- 68 files changed, 2091 insertions(+), 1518 deletions(-) diff --git a/examples/AlwaysMints.js b/examples/AlwaysMints.js index 3ab8b58f30..49601ff1cc 100644 --- a/examples/AlwaysMints.js +++ b/examples/AlwaysMints.js @@ -11,4 +11,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { "utf8" ); } -exports.alwaysMints = script; +export {script as alwaysMints}; diff --git a/examples/AlwaysSucceeds.js b/examples/AlwaysSucceeds.js index 4ba6671b78..edc58cb330 100644 --- a/examples/AlwaysSucceeds.js +++ b/examples/AlwaysSucceeds.js @@ -12,4 +12,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { ); } -exports.alwaysSucceeds = script; +export {script as alwaysSucceeds}; diff --git a/examples/ECDSA.js b/examples/ECDSA.js index 5115d95ecc..c3cb277e27 100644 --- a/examples/ECDSA.js +++ b/examples/ECDSA.js @@ -11,4 +11,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { "utf8" ); } -exports.validateECDSA = script; +export {script as validateECDSA}; diff --git a/examples/ExUnits.js b/examples/ExUnits.js index b0d16cf908..157ecde3d0 100644 --- a/examples/ExUnits.js +++ b/examples/ExUnits.js @@ -12,4 +12,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { ); } -exports.exUnits = script; +export {script as exUnits}; diff --git a/examples/IncludeDatum.js b/examples/IncludeDatum.js index 5ce016be7c..a66b971c0a 100644 --- a/examples/IncludeDatum.js +++ b/examples/IncludeDatum.js @@ -12,4 +12,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { ); } -exports.includeDatum = script; +export {script as includeDatum}; diff --git a/examples/KeyWallet/Internal/Cip30HtmlForm.js b/examples/KeyWallet/Internal/Cip30HtmlForm.js index ab840e979d..e0a8f878fa 100644 --- a/examples/KeyWallet/Internal/Cip30HtmlForm.js +++ b/examples/KeyWallet/Internal/Cip30HtmlForm.js @@ -38,35 +38,39 @@ code { `; -exports.logError = error => () => { - console.log(error); -}; +export function logError(error) { + return () => { + console.log(error); + }; +} -exports.mkForm = handler => () => { - window.document.body.insertAdjacentHTML("beforeend", form); - const formEl = window.document.querySelector("form"); - const fieldsEl = window.document.querySelector("fieldset"); - const resultEl = window.document.querySelector("code"); - formEl.addEventListener("submit", event => { - event.preventDefault(); - resultEl.replaceChildren(); +export function mkForm(handler) { + return () => { + window.document.body.insertAdjacentHTML("beforeend", form); + const formEl = window.document.querySelector("form"); + const fieldsEl = window.document.querySelector("fieldset"); + const resultEl = window.document.querySelector("code"); + formEl.addEventListener("submit", event => { + event.preventDefault(); + resultEl.replaceChildren(); - const data = new FormData(formEl); - const input = Object.fromEntries(data); - fieldsEl.setAttribute("disabled", "disabled"); + const data = new FormData(formEl); + const input = Object.fromEntries(data); + fieldsEl.setAttribute("disabled", "disabled"); - const log = color => text => () => { - const line = document.createElement("div"); - line.style.color = color; - line.textContent = text; - resultEl.append(line); - }; + const log = color => text => () => { + const line = document.createElement("div"); + line.style.color = color; + line.textContent = text; + resultEl.append(line); + }; - const unlock = () => { - fieldsEl.setAttribute("disabled", "disabled"); - fieldsEl.removeAttribute("disabled"); - }; + const unlock = () => { + fieldsEl.setAttribute("disabled", "disabled"); + fieldsEl.removeAttribute("disabled"); + }; - handler(input)(log)(unlock)(); - }); -}; + handler(input)(log)(unlock)(); + }); + }; +} diff --git a/examples/KeyWallet/Internal/Pkh2PkhHtmlForm.js b/examples/KeyWallet/Internal/Pkh2PkhHtmlForm.js index 62ecf2176d..5fa0eff2ca 100644 --- a/examples/KeyWallet/Internal/Pkh2PkhHtmlForm.js +++ b/examples/KeyWallet/Internal/Pkh2PkhHtmlForm.js @@ -40,35 +40,39 @@ code { `; -exports.logError = error => () => { - console.log(error); -}; +export function logError(error) { + return () => { + console.log(error); + }; +} -exports.mkForm = handler => () => { - window.document.body.insertAdjacentHTML("beforeend", form); - const formEl = window.document.querySelector("form"); - const fieldsEl = window.document.querySelector("fieldset"); - const resultEl = window.document.querySelector("code"); - formEl.addEventListener("submit", event => { - event.preventDefault(); - resultEl.replaceChildren(); +export function mkForm(handler) { + return () => { + window.document.body.insertAdjacentHTML("beforeend", form); + const formEl = window.document.querySelector("form"); + const fieldsEl = window.document.querySelector("fieldset"); + const resultEl = window.document.querySelector("code"); + formEl.addEventListener("submit", event => { + event.preventDefault(); + resultEl.replaceChildren(); - const data = new FormData(formEl); - const input = Object.fromEntries(data); - fieldsEl.setAttribute("disabled", "disabled"); + const data = new FormData(formEl); + const input = Object.fromEntries(data); + fieldsEl.setAttribute("disabled", "disabled"); - const log = color => text => () => { - const line = document.createElement("div"); - line.style.color = color; - line.textContent = text; - resultEl.append(line); - }; + const log = color => text => () => { + const line = document.createElement("div"); + line.style.color = color; + line.textContent = text; + resultEl.append(line); + }; - const unlock = () => { - fieldsEl.setAttribute("disabled", "disabled"); - fieldsEl.removeAttribute("disabled"); - }; + const unlock = () => { + fieldsEl.setAttribute("disabled", "disabled"); + fieldsEl.removeAttribute("disabled"); + }; - handler(input)(log)(unlock)(); - }); -}; + handler(input)(log)(unlock)(); + }); + }; +} diff --git a/examples/Lose7Ada.js b/examples/Lose7Ada.js index f2e299ed71..160a30565b 100644 --- a/examples/Lose7Ada.js +++ b/examples/Lose7Ada.js @@ -12,4 +12,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { ); } -exports.alwaysFails = script; +export {script as alwaysFails}; diff --git a/examples/MintsMultipleTokens.js b/examples/MintsMultipleTokens.js index 74ad17f73a..3c31afceea 100644 --- a/examples/MintsMultipleTokens.js +++ b/examples/MintsMultipleTokens.js @@ -19,6 +19,6 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { redeemerInt3 = readScript("redeemer3"); } -exports.redeemerInt1 = redeemerInt1; -exports.redeemerInt2 = redeemerInt2; -exports.redeemerInt3 = redeemerInt3; +export {redeemerInt1}; +export {redeemerInt2}; +export {redeemerInt3}; diff --git a/examples/MultipleRedeemers.js b/examples/MultipleRedeemers.js index 7d8855f2b8..31479907d5 100644 --- a/examples/MultipleRedeemers.js +++ b/examples/MultipleRedeemers.js @@ -19,6 +19,6 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { vredeemerInt3 = readScript("redeemer3-validator"); } -exports.vredeemerInt1 = vredeemerInt1; -exports.vredeemerInt2 = vredeemerInt2; -exports.vredeemerInt3 = vredeemerInt3; +export {vredeemerInt1}; +export {vredeemerInt2}; +export {vredeemerInt3}; diff --git a/examples/OneShotMinting.js b/examples/OneShotMinting.js index 583fda1091..7ae56d760c 100644 --- a/examples/OneShotMinting.js +++ b/examples/OneShotMinting.js @@ -12,4 +12,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { ); } -exports.oneShotMinting = script; +export {script as oneShotMinting}; diff --git a/examples/OtherTypeTextEnvelope.js b/examples/OtherTypeTextEnvelope.js index 2affb4b24a..be56ab824b 100644 --- a/examples/OtherTypeTextEnvelope.js +++ b/examples/OtherTypeTextEnvelope.js @@ -14,4 +14,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { "utf8" ); } -exports.otherTypeTextEnvelope = script; +export {script as otherTypeTextEnvelope}; diff --git a/examples/PlutusV2/InlineDatum.js b/examples/PlutusV2/InlineDatum.js index 367b1170bc..dbdad10b76 100644 --- a/examples/PlutusV2/InlineDatum.js +++ b/examples/PlutusV2/InlineDatum.js @@ -15,4 +15,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { ); } -exports.checkDatumIsInline = script; +export {script as checkDatumIsInline}; diff --git a/examples/PlutusV2/OneShotMinting.js b/examples/PlutusV2/OneShotMinting.js index d3c979a851..9892c1ce00 100644 --- a/examples/PlutusV2/OneShotMinting.js +++ b/examples/PlutusV2/OneShotMinting.js @@ -15,4 +15,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { ); } -exports.oneShotMinting = script; +export {script as oneShotMinting}; diff --git a/examples/PlutusV2/Scripts/AlwaysMints.js b/examples/PlutusV2/Scripts/AlwaysMints.js index 170c59121f..120ecadd18 100644 --- a/examples/PlutusV2/Scripts/AlwaysMints.js +++ b/examples/PlutusV2/Scripts/AlwaysMints.js @@ -11,4 +11,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { "utf8" ); } -exports.alwaysMintsV2 = script; +export {script as alwaysMintsV2}; diff --git a/examples/PlutusV2/Scripts/AlwaysSucceeds.js b/examples/PlutusV2/Scripts/AlwaysSucceeds.js index a143119c93..b67c3d6654 100644 --- a/examples/PlutusV2/Scripts/AlwaysSucceeds.js +++ b/examples/PlutusV2/Scripts/AlwaysSucceeds.js @@ -12,4 +12,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { ); } -exports.alwaysSucceedsV2 = script; +export {script as alwaysSucceedsV2}; diff --git a/examples/Schnorr.js b/examples/Schnorr.js index 76d1ed2042..0de34e6a36 100644 --- a/examples/Schnorr.js +++ b/examples/Schnorr.js @@ -12,4 +12,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { ); } -exports.validateSchnorr = script; +export {script as validateSchnorr}; diff --git a/src/Contract/Test/Utils.js b/src/Contract/Test/Utils.js index a9592efa53..aab2e892a6 100644 --- a/src/Contract/Test/Utils.js +++ b/src/Contract/Test/Utils.js @@ -1,3 +1,5 @@ -exports.exitCode = code => () => { - process.exitCode = code; -}; +export function exitCode(code) { + return () => { + process.exitCode = code; + }; +} diff --git a/src/Internal/ApplyArgs.js b/src/Internal/ApplyArgs.js index 1afe7de8d3..b2b9a457c6 100644 --- a/src/Internal/ApplyArgs.js +++ b/src/Internal/ApplyArgs.js @@ -19,23 +19,25 @@ apply_args = require("@mlabs-haskell/csl-gc-wrapper")(apply_args); * @param {PlutusScript} script * @returns {Either String PlutusScript} */ -exports.apply_params_to_script = left => right => args => script => { - let version = script.language_version(); - let appliedScript; - try { - let scriptBytes = script.bytes(); // raw bytes - let argsBytes = args.to_bytes(); // cbor - +export function apply_params_to_script(left) { + return right => args => script => { + let version = script.language_version(); + let appliedScript; try { - appliedScript = apply_args.apply_params_to_script_no_panic( - argsBytes, - scriptBytes - ); - } catch (e) { - return left("Error applying argument to script: ".concat(e.toString())); + let scriptBytes = script.bytes(); // raw bytes + let argsBytes = args.to_bytes(); // cbor + + try { + appliedScript = apply_args.apply_params_to_script_no_panic( + argsBytes, + scriptBytes + ); + } catch (e) { + return left("Error applying argument to script: ".concat(e.toString())); + } + } catch (e1) { + return left("Error serializing arguments: ".concat(e1.toString())); } - } catch (e1) { - return left("Error serializing arguments: ".concat(e1.toString())); - } - return right(lib.PlutusScript.new_with_version(appliedScript, version)); -}; + return right(lib.PlutusScript.new_with_version(appliedScript, version)); + }; +} diff --git a/src/Internal/BalanceTx/UtxoMinAda.js b/src/Internal/BalanceTx/UtxoMinAda.js index 626faddd42..e42976d2bb 100644 --- a/src/Internal/BalanceTx/UtxoMinAda.js +++ b/src/Internal/BalanceTx/UtxoMinAda.js @@ -8,13 +8,20 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { } lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); -exports.minAdaForOutput = maybe => txOutput => dataCost => { - try { - return maybe.just(lib.min_ada_for_output(txOutput, dataCost)); - } catch (_) { - return maybe.nothing; - } -}; +export function minAdaForOutput(maybe) { + return txOutput => dataCost => { + try { + return maybe.just(lib.min_ada_for_output(txOutput, dataCost)); + } catch (_) { + return maybe.nothing; + } + }; +} + +export function newCoinsPerWord(n) { + return lib.DataCost.new_coins_per_word(n); +} -exports.newCoinsPerWord = n => lib.DataCost.new_coins_per_word(n); -exports.newCoinsPerByte = n => lib.DataCost.new_coins_per_byte(n); +export function newCoinsPerByte(n) { + return lib.DataCost.new_coins_per_byte(n); +} diff --git a/src/Internal/Base64.js b/src/Internal/Base64.js index 5bd33d96af..1db305d090 100644 --- a/src/Internal/Base64.js +++ b/src/Internal/Base64.js @@ -1,13 +1,13 @@ -const base64 = require("base64-js"); +import base64 from "base64-js"; +export var fromByteArray = base64.fromByteArray; +export var toByteArray = base64.toByteArray; -exports.fromByteArray = base64.fromByteArray; - -exports.toByteArray = base64.toByteArray; - -exports._decodeBase64 = maybe => str => { - try { - return maybe.just(base64.toByteArray(str)); - } catch (_) { - return maybe.nothing; - } -}; +export function _decodeBase64(maybe) { + return str => { + try { + return maybe.just(base64.toByteArray(str)); + } catch (_) { + return maybe.nothing; + } + }; +} diff --git a/src/Internal/Cardano/Types/Transaction.purs b/src/Internal/Cardano/Types/Transaction.purs index d118568dba..629a943c77 100644 --- a/src/Internal/Cardano/Types/Transaction.purs +++ b/src/Internal/Cardano/Types/Transaction.purs @@ -158,11 +158,11 @@ import Data.Set (Set) import Data.Set (union) as Set import Data.Show.Generic (genericShow) import Data.String.Utils (startsWith) -import Data.Symbol (SProxy(SProxy)) import Data.Tuple (Tuple(Tuple)) import Data.Tuple.Nested (type (/\)) import Data.UInt (UInt) import Partial.Unsafe (unsafePartial) +import Type.Proxy (Proxy(Proxy)) -------------------------------------------------------------------------------- -- `Transaction` @@ -693,56 +693,56 @@ instance EncodeAeson Certificate where -------------------------------------------------------------------------------- _inputs :: Lens' TxBody (Set TransactionInput) -_inputs = _Newtype <<< prop (SProxy :: SProxy "inputs") +_inputs = _Newtype <<< prop (Proxy :: Proxy "inputs") _outputs :: Lens' TxBody (Array TransactionOutput) -_outputs = _Newtype <<< prop (SProxy :: SProxy "outputs") +_outputs = _Newtype <<< prop (Proxy :: Proxy "outputs") _fee :: Lens' TxBody (Coin) -_fee = _Newtype <<< prop (SProxy :: SProxy "fee") +_fee = _Newtype <<< prop (Proxy :: Proxy "fee") _ttl :: Lens' TxBody (Maybe Slot) -_ttl = _Newtype <<< prop (SProxy :: SProxy "ttl") +_ttl = _Newtype <<< prop (Proxy :: Proxy "ttl") _certs :: Lens' TxBody (Maybe (Array Certificate)) -_certs = _Newtype <<< prop (SProxy :: SProxy "certs") +_certs = _Newtype <<< prop (Proxy :: Proxy "certs") _withdrawals :: Lens' TxBody (Maybe (Map RewardAddress Coin)) -_withdrawals = _Newtype <<< prop (SProxy :: SProxy "withdrawals") +_withdrawals = _Newtype <<< prop (Proxy :: Proxy "withdrawals") _update :: Lens' TxBody (Maybe Update) -_update = _Newtype <<< prop (SProxy :: SProxy "update") +_update = _Newtype <<< prop (Proxy :: Proxy "update") _auxiliaryDataHash :: Lens' TxBody (Maybe AuxiliaryDataHash) -_auxiliaryDataHash = _Newtype <<< prop (SProxy :: SProxy "auxiliaryDataHash") +_auxiliaryDataHash = _Newtype <<< prop (Proxy :: Proxy "auxiliaryDataHash") _validityStartInterval :: Lens' TxBody (Maybe Slot) _validityStartInterval = - _Newtype <<< prop (SProxy :: SProxy "validityStartInterval") + _Newtype <<< prop (Proxy :: Proxy "validityStartInterval") _mint :: Lens' TxBody (Maybe Mint) -_mint = _Newtype <<< prop (SProxy :: SProxy "mint") +_mint = _Newtype <<< prop (Proxy :: Proxy "mint") _scriptDataHash :: Lens' TxBody (Maybe ScriptDataHash) -_scriptDataHash = _Newtype <<< prop (SProxy :: SProxy "scriptDataHash") +_scriptDataHash = _Newtype <<< prop (Proxy :: Proxy "scriptDataHash") _collateral :: Lens' TxBody (Maybe (Array TransactionInput)) -_collateral = _Newtype <<< prop (SProxy :: SProxy "collateral") +_collateral = _Newtype <<< prop (Proxy :: Proxy "collateral") _requiredSigners :: Lens' TxBody (Maybe (Array RequiredSigner)) -_requiredSigners = _Newtype <<< prop (SProxy :: SProxy "requiredSigners") +_requiredSigners = _Newtype <<< prop (Proxy :: Proxy "requiredSigners") _networkId :: Lens' TxBody (Maybe NetworkId) -_networkId = _Newtype <<< prop (SProxy :: SProxy "networkId") +_networkId = _Newtype <<< prop (Proxy :: Proxy "networkId") _referenceInputs :: Lens' TxBody (Set TransactionInput) -_referenceInputs = _Newtype <<< prop (SProxy :: SProxy "referenceInputs") +_referenceInputs = _Newtype <<< prop (Proxy :: Proxy "referenceInputs") _collateralReturn :: Lens' TxBody (Maybe TransactionOutput) -_collateralReturn = _Newtype <<< prop (SProxy :: SProxy "collateralReturn") +_collateralReturn = _Newtype <<< prop (Proxy :: Proxy "collateralReturn") _totalCollateral :: Lens' TxBody (Maybe Coin) -_totalCollateral = _Newtype <<< prop (SProxy :: SProxy "totalCollateral") +_totalCollateral = _Newtype <<< prop (Proxy :: Proxy "totalCollateral") -------------------------------------------------------------------------------- -- `TransactionWitnessSet` diff --git a/src/Internal/Deserialization/BigInt.js b/src/Internal/Deserialization/BigInt.js index cd79973045..0fd6fef55d 100644 --- a/src/Internal/Deserialization/BigInt.js +++ b/src/Internal/Deserialization/BigInt.js @@ -1 +1,3 @@ -exports._BigInt_to_str = x => x.to_str(); +export function _BigInt_to_str(x) { + return x.to_str(); +} diff --git a/src/Internal/Deserialization/FromBytes.js b/src/Internal/Deserialization/FromBytes.js index 802458ed31..4f8820334c 100644 --- a/src/Internal/Deserialization/FromBytes.js +++ b/src/Internal/Deserialization/FromBytes.js @@ -8,10 +8,12 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { } lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); -exports._fromBytes = helper => name => bytes => { - try { - return helper.valid(lib[name].from_bytes(bytes)); - } catch (e) { - return helper.error(name + ".from_bytes() raised " + e); - } -}; +export function _fromBytes(helper) { + return name => bytes => { + try { + return helper.valid(lib[name].from_bytes(bytes)); + } catch (e) { + return helper.error(name + ".from_bytes() raised " + e); + } + }; +} diff --git a/src/Internal/Deserialization/Keys.js b/src/Internal/Deserialization/Keys.js index 51a83714d3..0e76d24adb 100644 --- a/src/Internal/Deserialization/Keys.js +++ b/src/Internal/Deserialization/Keys.js @@ -8,40 +8,50 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { } lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); -exports.freshPrivateKey = () => { +export function freshPrivateKey() { return lib.PrivateKey.generate_ed25519(); -}; +} -exports._publicKeyFromBech32 = maybe => bech32 => { - try { - return maybe.just(lib.PublicKey.from_bech32(bech32)); - } catch (_) { - return maybe.nothing; - } -}; +export function _publicKeyFromBech32(maybe) { + return bech32 => { + try { + return maybe.just(lib.PublicKey.from_bech32(bech32)); + } catch (_) { + return maybe.nothing; + } + }; +} -exports._ed25519SignatureFromBech32 = maybe => bech32 => { - try { - return maybe.just(lib.Ed25519Signature.from_bech32(bech32)); - } catch (_) { - return maybe.nothing; - } -}; +export function _ed25519SignatureFromBech32(maybe) { + return bech32 => { + try { + return maybe.just(lib.Ed25519Signature.from_bech32(bech32)); + } catch (_) { + return maybe.nothing; + } + }; +} -exports._privateKeyFromBytes = maybe => bytes => { - try { - return maybe.just(lib.PrivateKey.from_normal_bytes(bytes)); - } catch (_) { - return maybe.nothing; - } -}; +export function _privateKeyFromBytes(maybe) { + return bytes => { + try { + return maybe.just(lib.PrivateKey.from_normal_bytes(bytes)); + } catch (_) { + return maybe.nothing; + } + }; +} -exports.privateKeyToBech32 = privateKey => privateKey.to_bech32(); +export function privateKeyToBech32(privateKey) { + return privateKey.to_bech32(); +} -exports._privateKeyFromBech32 = maybe => bech32 => { - try { - return maybe.just(lib.PrivateKey.from_bech32(bech32)); - } catch (_) { - return maybe.nothing; - } -}; +export function _privateKeyFromBech32(maybe) { + return bech32 => { + try { + return maybe.just(lib.PrivateKey.from_bech32(bech32)); + } catch (_) { + return maybe.nothing; + } + }; +} diff --git a/src/Internal/Deserialization/Language.js b/src/Internal/Deserialization/Language.js index b2d596da37..3dfeb32ced 100644 --- a/src/Internal/Deserialization/Language.js +++ b/src/Internal/Deserialization/Language.js @@ -8,12 +8,14 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { } lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); -exports._convertLanguage = langCtors => cslLang => { - if (cslLang.kind() == lib.LanguageKind.PlutusV1) { - return langCtors.plutusV1; - } else if (cslLang.kind() == lib.LanguageKind.PlutusV2) { - return langCtors.plutusV2; - } else { - throw "_convertLanguage: Unsupported language kind: " + cslLang.kind(); - } -}; +export function _convertLanguage(langCtors) { + return cslLang => { + if (cslLang.kind() == lib.LanguageKind.PlutusV1) { + return langCtors.plutusV1; + } else if (cslLang.kind() == lib.LanguageKind.PlutusV2) { + return langCtors.plutusV2; + } else { + throw "_convertLanguage: Unsupported language kind: " + cslLang.kind(); + } + }; +} diff --git a/src/Internal/Deserialization/NativeScript.js b/src/Internal/Deserialization/NativeScript.js index 567e648715..5c26a853ed 100644 --- a/src/Internal/Deserialization/NativeScript.js +++ b/src/Internal/Deserialization/NativeScript.js @@ -8,34 +8,43 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { } lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); -exports._convertNativeScript = handler => ns => { - switch (ns.kind()) { - case lib.NativeScriptKind.ScriptPubkey: - return handler.scriptPubkey(ns.as_script_pubkey()); - case lib.NativeScriptKind.ScriptAll: - return handler.scriptAll(ns.as_script_all()); - case lib.NativeScriptKind.ScriptAny: - return handler.scriptAny(ns.as_script_any()); - case lib.NativeScriptKind.ScriptNOfK: - return handler.scriptNOfK(ns.as_script_n_of_k()); - case lib.NativeScriptKind.TimelockStart: - return handler.timelockStart(ns.as_timelock_start()); - case lib.NativeScriptKind.TimelockExpiry: - return handler.timelockExpiry(ns.as_timelock_expiry()); - default: - throw "Impossible native script kind: " + ns.kind(); - } -}; +export function _convertNativeScript(handler) { + return ns => { + switch (ns.kind()) { + case lib.NativeScriptKind.ScriptPubkey: + return handler.scriptPubkey(ns.as_script_pubkey()); + case lib.NativeScriptKind.ScriptAll: + return handler.scriptAll(ns.as_script_all()); + case lib.NativeScriptKind.ScriptAny: + return handler.scriptAny(ns.as_script_any()); + case lib.NativeScriptKind.ScriptNOfK: + return handler.scriptNOfK(ns.as_script_n_of_k()); + case lib.NativeScriptKind.TimelockStart: + return handler.timelockStart(ns.as_timelock_start()); + case lib.NativeScriptKind.TimelockExpiry: + return handler.timelockExpiry(ns.as_timelock_expiry()); + default: + throw "Impossible native script kind: " + ns.kind(); + } + }; +} const call = property => object => object[property](); -exports.scriptPubkey_addr_keyhash = call("addr_keyhash"); -exports.scriptAllScripts = helper => - helper.unpackFromProperty("native_scripts"); -exports.scriptAnyScripts = helper => - helper.unpackFromProperty("native_scripts"); -exports.scriptNOfKScripts = helper => - helper.unpackFromProperty("native_scripts"); -exports.scriptNOfK_n = call("n"); -exports.timelockStart_slot = call("slot_bignum"); -exports.timelockExpiry_slot = call("slot_bignum"); +export var scriptPubkey_addr_keyhash = call("addr_keyhash"); + +export function scriptAllScripts(helper) { + return helper.unpackFromProperty("native_scripts"); +} + +export function scriptAnyScripts(helper) { + return helper.unpackFromProperty("native_scripts"); +} + +export function scriptNOfKScripts(helper) { + return helper.unpackFromProperty("native_scripts"); +} + +export var scriptNOfK_n = call("n"); +export var timelockStart_slot = call("slot_bignum"); +export var timelockExpiry_slot = call("slot_bignum"); diff --git a/src/Internal/Deserialization/PlutusData.js b/src/Internal/Deserialization/PlutusData.js index 5542bdd10c..eee1077500 100644 --- a/src/Internal/Deserialization/PlutusData.js +++ b/src/Internal/Deserialization/PlutusData.js @@ -8,34 +8,46 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { } lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); -exports._convertPlutusData = handle => pd => { - switch (pd.kind()) { - case lib.PlutusDataKind.ConstrPlutusData: - return handle.constr(pd.as_constr_plutus_data()); - case lib.PlutusDataKind.Map: - return handle.map(pd.as_map()); - case lib.PlutusDataKind.List: - return handle.list(pd.as_list()); - case lib.PlutusDataKind.Integer: - return handle.integer(pd.as_integer()); - case lib.PlutusDataKind.Bytes: - return handle.bytes(pd.as_bytes()); - default: - throw "Impossible PlutusData kind: " + pd.kind(); - } -}; +export function _convertPlutusData(handle) { + return pd => { + switch (pd.kind()) { + case lib.PlutusDataKind.ConstrPlutusData: + return handle.constr(pd.as_constr_plutus_data()); + case lib.PlutusDataKind.Map: + return handle.map(pd.as_map()); + case lib.PlutusDataKind.List: + return handle.list(pd.as_list()); + case lib.PlutusDataKind.Integer: + return handle.integer(pd.as_integer()); + case lib.PlutusDataKind.Bytes: + return handle.bytes(pd.as_bytes()); + default: + throw "Impossible PlutusData kind: " + pd.kind(); + } + }; +} + +export function _unpackPlutusList(containerHelper) { + return containerHelper.unpack; +} -exports._unpackPlutusList = containerHelper => containerHelper.unpack; -exports._ConstrPlutusData_alternative = x => x.alternative(); -exports._ConstrPlutusData_data = x => x.data(); +export function _ConstrPlutusData_alternative(x) { + return x.alternative(); +} -exports._unpackPlutusMap = containerHelper => tuple => plutusMap => { - const keys = containerHelper.unpack(plutusMap.keys()); - const res = []; - for (let key of keys) { - // Assuming that `PlutusMap.get()` never fails on elements from result of - // its `.keys()` call. - res.push(tuple(key)(plutusMap.get(key))); - } - return res; -}; +export function _ConstrPlutusData_data(x) { + return x.data(); +} + +export function _unpackPlutusMap(containerHelper) { + return tuple => plutusMap => { + const keys = containerHelper.unpack(plutusMap.keys()); + const res = []; + for (let key of keys) { + // Assuming that `PlutusMap.get()` never fails on elements from result of + // its `.keys()` call. + res.push(tuple(key)(plutusMap.get(key))); + } + return res; + }; +} diff --git a/src/Internal/Deserialization/Transaction.js b/src/Internal/Deserialization/Transaction.js index e0f990c2e5..2b626fa0b0 100644 --- a/src/Internal/Deserialization/Transaction.js +++ b/src/Internal/Deserialization/Transaction.js @@ -14,13 +14,24 @@ const callMaybe = property => maybe => object => { return res != null ? maybe.just(res) : maybe.nothing; }; -exports._txIsValid = tx => tx.is_valid(); -exports._txWitnessSet = tx => tx.witness_set(); -exports._txBody = tx => tx.body(); -exports._txAuxiliaryData = maybe => tx => { - const ad = tx.auxiliary_data(); - return ad == null ? maybe.nothing : maybe.just(ad); -}; +export function _txIsValid(tx) { + return tx.is_valid(); +} + +export function _txWitnessSet(tx) { + return tx.witness_set(); +} + +export function _txBody(tx) { + return tx.body(); +} + +export function _txAuxiliaryData(maybe) { + return tx => { + const ad = tx.auxiliary_data(); + return ad == null ? maybe.nothing : maybe.just(ad); + }; +} const maybeGetter_ = fmap => propstr => maybe => obj => { if (typeof propstr != "string") { @@ -34,277 +45,346 @@ const maybeGetter = maybeGetter_(a => a); const maybeGetterMulti = propstr => containerHelper => maybeGetter_(o => containerHelper.unpack(o))(propstr); -exports._txAuxiliaryData = maybeGetter("auxiliary_data"); -exports._adGeneralMetadata = maybeGetter("metadata"); -exports._adNativeScripts = maybeGetter("native_scripts"); -exports._adPlutusScripts = maybeGetter("plutus_scripts"); +export var _txAuxiliaryData = maybeGetter("auxiliary_data"); +export var _adGeneralMetadata = maybeGetter("metadata"); +export var _adNativeScripts = maybeGetter("native_scripts"); +export var _adPlutusScripts = maybeGetter("plutus_scripts"); // inputs(): TransactionInputs; -exports._txBodyInputs = containerhelper => body => - containerhelper.unpack(body.inputs()); +export function _txBodyInputs(containerhelper) { + return body => + containerhelper.unpack(body.inputs()); +} + // outputs(): TransactionOutputs; -exports._txBodyOutputs = containerhelper => body => - containerhelper.unpack(body.outputs()); +export function _txBodyOutputs(containerhelper) { + return body => + containerhelper.unpack(body.outputs()); +} + // fee(): BigNum; -exports._txBodyFee = body => body.fee(); +export function _txBodyFee(body) { + return body.fee(); +} + // ttl(): number | void; -exports._txBodyTtl = maybeGetter("ttl_bignum"); +export var _txBodyTtl = maybeGetter("ttl_bignum"); + // certs(): Certificates | void; -exports._txBodyCerts = maybeGetterMulti("certs"); +export var _txBodyCerts = maybeGetterMulti("certs"); + // withdrawals(): Withdrawals | void; -exports._txBodyWithdrawals = maybeGetter("withdrawals"); +export var _txBodyWithdrawals = maybeGetter("withdrawals"); + // update(): Update | void; -exports._txBodyUpdate = maybeGetter("update"); +export var _txBodyUpdate = maybeGetter("update"); + // auxiliary_data_hash(): AuxiliaryDataHash | void; -exports._txBodyAuxiliaryDataHash = maybeGetter("auxiliary_data_hash"); +export var _txBodyAuxiliaryDataHash = maybeGetter("auxiliary_data_hash"); + // validity_start_interval(): number | void; -exports._txBodyValidityStartInterval = maybeGetter( +export var _txBodyValidityStartInterval = maybeGetter( "validity_start_interval_bignum" ); + // multiassets(): Mint | void; -exports._txBodyMultiAssets = maybeGetter("multiassets"); -exports._txBodyReferenceInputs = maybe => containerhelper => body => - body.reference_inputs() - ? maybe.just(containerhelper.unpack(body.reference_inputs())) - : maybe.nothing; +export var _txBodyMultiAssets = maybeGetter("multiassets"); + +export function _txBodyReferenceInputs(maybe) { + return containerhelper => body => + body.reference_inputs() + ? maybe.just(containerhelper.unpack(body.reference_inputs())) + : maybe.nothing; +} + // script_data_hash(): ScriptDataHash | void; -exports._txBodyScriptDataHash = maybeGetter("script_data_hash"); +export var _txBodyScriptDataHash = maybeGetter("script_data_hash"); + // collateral(): Array TransactionInput | void; -exports._txBodyCollateral = maybeGetterMulti("collateral"); +export var _txBodyCollateral = maybeGetterMulti("collateral"); + // required_signers(): Ed25519KeyHashes | void; -exports._txBodyRequiredSigners = maybeGetterMulti("required_signers"); +export var _txBodyRequiredSigners = maybeGetterMulti("required_signers"); + // network_id(): number | void; -exports._txBodyNetworkId = testnet => mainnet => - maybeGetter_(o => { - switch (o.kind()) { - case lib.NetworkIdKind.Testnet: - return testnet; - case lib.NetworkIdKind.Mainnet: - return mainnet; - default: - throw "Unknown NetworkIdKind: " + o.kind(); - } - })("network_id"); +export function _txBodyNetworkId(testnet) { + return mainnet => + maybeGetter_(o => { + switch (o.kind()) { + case lib.NetworkIdKind.Testnet: + return testnet; + case lib.NetworkIdKind.Mainnet: + return mainnet; + default: + throw "Unknown NetworkIdKind: " + o.kind(); + } + })("network_id"); +} // collateral_return(): TransactionOutput | void; -exports._txBodyCollateralReturn = maybeGetter("collateral_return"); +export var _txBodyCollateralReturn = maybeGetter("collateral_return"); // total_collateral(): BigNum | void -exports._txBodyTotalCollateral = maybeGetter("total_collateral"); +export var _txBodyTotalCollateral = maybeGetter("total_collateral"); // foreign import _unpackWithdrawals :: ContainerHelper -> CSL.Withdrawals -> Array(Tuple CSL.RewardAddress CSL.BigNum) -exports._unpackWithdrawals = containerhelper => - containerhelper.unpackKeyIndexed; - -exports._unpackUpdate = containerhelper => update => { - const pppus = containerhelper.unpackKeyIndexed( - update.proposed_protocol_parameter_updates() - ); - return { epoch: update.epoch(), paramUpdates: pppus }; -}; +export function _unpackWithdrawals(containerhelper) { + return containerhelper.unpackKeyIndexed; +} -exports._unpackMint = containerhelper => containerhelper.unpackKeyIndexed; - -exports._unpackMintAssets = containerhelper => containerhelper.unpackKeyIndexed; - -exports._convertCert = certConvHelper => cert => { - switch (cert.kind()) { - case lib.CertificateKind.StakeRegistration: - return certConvHelper.stakeRegistration( - cert.as_stake_registration().stake_credential() - ); - case lib.CertificateKind.StakeDeregistration: - return certConvHelper.stakeDeregistration( - cert.as_stake_deregistration().stake_credential() - ); - case lib.CertificateKind.StakeDelegation: - return certConvHelper.stakeDelegation( - cert.as_stake_delegation().stake_credential() - )(cert.as_stake_delegation().pool_keyhash()); - case lib.CertificateKind.PoolRegistration: - return certConvHelper.poolRegistration( - cert.as_pool_registration().pool_params() - ); - case lib.CertificateKind.PoolRetirement: - return certConvHelper.poolRetirement( - cert.as_pool_retirement().pool_keyhash() - )(cert.as_pool_retirement().epoch()); - case lib.CertificateKind.GenesisKeyDelegation: - return certConvHelper.genesisKeyDelegation( - cert.as_genesis_key_delegation().genesishash() - )(cert.as_genesis_key_delegation().genesis_delegate_hash())( - cert.as_genesis_key_delegation().vrf_keyhash() - ); - case lib.CertificateKind.MoveInstantaneousRewardsCert: - const mirCert = cert.as_move_instantaneous_rewards_cert(); - const mir = mirCert.move_instantaneous_reward(); - switch (mir.kind()) { - case lib.MIRKind.ToOtherPot: - return certConvHelper.moveInstantaneousRewardsToOtherPotCert( - mir.pot() - )(mir.as_to_other_pot()); - case lib.MIRKind.ToStakeCredentials: - return certConvHelper.moveInstantaneousRewardsToStakeCreds(mir.pot())( - mir.as_to_stake_creds() - ); - default: - throw ( - "MoveInstantaneousReward convertion failed for kind" + mir.kind() - ); - } - default: - throw ("Cert conversion failed for kind: ", cert.kind()); - } -}; +export function _unpackUpdate(containerhelper) { + return update => { + const pppus = containerhelper.unpackKeyIndexed( + update.proposed_protocol_parameter_updates() + ); + return { epoch: update.epoch(), paramUpdates: pppus }; + }; +} + +export function _unpackMint(containerhelper) { + return containerhelper.unpackKeyIndexed; +} -exports._unpackProtocolParamUpdate = maybe => ppu => { - const optional = x => (x == null ? maybe.nothing : maybe.just(x)); +export function _unpackMintAssets(containerhelper) { + return containerhelper.unpackKeyIndexed; +} - return { - minfeeA: optional(ppu.minfee_a()), - minfeeB: optional(ppu.minfee_b()), - maxBlockBodySize: optional(ppu.max_block_body_size()), - maxTxSize: optional(ppu.max_tx_size()), - maxBlockHeaderSize: optional(ppu.max_block_header_size()), - keyDeposit: optional(ppu.key_deposit()), - poolDeposit: optional(ppu.pool_deposit()), - maxEpoch: optional(ppu.max_epoch()), - nOpt: optional(ppu.n_opt()), - poolPledgeInfluence: optional(ppu.pool_pledge_influence()), - expansionRate: optional(ppu.expansion_rate()), - treasuryGrowthRate: optional(ppu.treasury_growth_rate()), - protocolVersion: optional(ppu.protocol_version()), - minPoolCost: optional(ppu.min_pool_cost()), - adaPerUtxoByte: optional(ppu.ada_per_utxo_byte()), - costModels: optional(ppu.cost_models()), - executionCosts: optional(ppu.execution_costs()), - maxTxExUnits: optional(ppu.max_tx_ex_units()), - maxBlockExUnits: optional(ppu.max_block_ex_units()), - maxValueSize: optional(ppu.max_value_size()), - collateralPercentage: optional(ppu.collateral_percentage()), - maxCollateralInputs: optional(ppu.max_collateral_inputs()), +export function _convertCert(certConvHelper) { + return cert => { + switch (cert.kind()) { + case lib.CertificateKind.StakeRegistration: + return certConvHelper.stakeRegistration( + cert.as_stake_registration().stake_credential() + ); + case lib.CertificateKind.StakeDeregistration: + return certConvHelper.stakeDeregistration( + cert.as_stake_deregistration().stake_credential() + ); + case lib.CertificateKind.StakeDelegation: + return certConvHelper.stakeDelegation( + cert.as_stake_delegation().stake_credential() + )(cert.as_stake_delegation().pool_keyhash()); + case lib.CertificateKind.PoolRegistration: + return certConvHelper.poolRegistration( + cert.as_pool_registration().pool_params() + ); + case lib.CertificateKind.PoolRetirement: + return certConvHelper.poolRetirement( + cert.as_pool_retirement().pool_keyhash() + )(cert.as_pool_retirement().epoch()); + case lib.CertificateKind.GenesisKeyDelegation: + return certConvHelper.genesisKeyDelegation( + cert.as_genesis_key_delegation().genesishash() + )(cert.as_genesis_key_delegation().genesis_delegate_hash())( + cert.as_genesis_key_delegation().vrf_keyhash() + ); + case lib.CertificateKind.MoveInstantaneousRewardsCert: + const mirCert = cert.as_move_instantaneous_rewards_cert(); + const mir = mirCert.move_instantaneous_reward(); + switch (mir.kind()) { + case lib.MIRKind.ToOtherPot: + return certConvHelper.moveInstantaneousRewardsToOtherPotCert( + mir.pot() + )(mir.as_to_other_pot()); + case lib.MIRKind.ToStakeCredentials: + return certConvHelper.moveInstantaneousRewardsToStakeCreds(mir.pot())( + mir.as_to_stake_creds() + ); + default: + throw ( + "MoveInstantaneousReward convertion failed for kind" + mir.kind() + ); + } + default: + throw ("Cert conversion failed for kind: ", cert.kind()); + } }; -}; +} + +export function _unpackProtocolParamUpdate(maybe) { + return ppu => { + const optional = x => (x == null ? maybe.nothing : maybe.just(x)); + + return { + minfeeA: optional(ppu.minfee_a()), + minfeeB: optional(ppu.minfee_b()), + maxBlockBodySize: optional(ppu.max_block_body_size()), + maxTxSize: optional(ppu.max_tx_size()), + maxBlockHeaderSize: optional(ppu.max_block_header_size()), + keyDeposit: optional(ppu.key_deposit()), + poolDeposit: optional(ppu.pool_deposit()), + maxEpoch: optional(ppu.max_epoch()), + nOpt: optional(ppu.n_opt()), + poolPledgeInfluence: optional(ppu.pool_pledge_influence()), + expansionRate: optional(ppu.expansion_rate()), + treasuryGrowthRate: optional(ppu.treasury_growth_rate()), + protocolVersion: optional(ppu.protocol_version()), + minPoolCost: optional(ppu.min_pool_cost()), + adaPerUtxoByte: optional(ppu.ada_per_utxo_byte()), + costModels: optional(ppu.cost_models()), + executionCosts: optional(ppu.execution_costs()), + maxTxExUnits: optional(ppu.max_tx_ex_units()), + maxBlockExUnits: optional(ppu.max_block_ex_units()), + maxValueSize: optional(ppu.max_value_size()), + collateralPercentage: optional(ppu.collateral_percentage()), + maxCollateralInputs: optional(ppu.max_collateral_inputs()), + }; + }; +} -exports._unpackCostModels = containerhelper => containerhelper.unpackKeyIndexed; +export function _unpackCostModels(containerhelper) { + return containerhelper.unpackKeyIndexed; +} -exports._unpackCostModel = cm => { +export function _unpackCostModel(cm) { const res = []; for (let op = 0; op < cm.len(); op++) { res.push(cm.get(op).to_str()); } return res; -}; +} -exports._convertNonce = nonceCtors => cslNonce => { - const hashBytes = cslNonce.get_hash(); - return hashBytes == null - ? nonceCtors.identityNonce - : nonceCtors.hashNonce(hashBytes); -}; +export function _convertNonce(nonceCtors) { + return cslNonce => { + const hashBytes = cslNonce.get_hash(); + return hashBytes == null + ? nonceCtors.identityNonce + : nonceCtors.hashNonce(hashBytes); + }; +} -exports._unpackMetadatums = containerHelper => containerHelper.unpackKeyIndexed; - -exports._unpackMetadataMap = containerHelper => - containerHelper.unpackKeyIndexed; - -exports._unpackMetadataList = containerHelper => containerHelper.unpack; - -exports._convertMetadatum = metadataCtors => cslMetadatum => { - switch (cslMetadatum.kind()) { - case lib.TransactionMetadatumKind.MetadataMap: - return metadataCtors.from_map(cslMetadatum.as_map()); - case lib.TransactionMetadatumKind.MetadataList: - return metadataCtors.from_list(cslMetadatum.as_list()); - case lib.TransactionMetadatumKind.Int: - return metadataCtors.from_int(cslMetadatum.as_int()); - case lib.TransactionMetadatumKind.Bytes: - return metadataCtors.from_bytes(cslMetadatum.as_bytes()); - case lib.TransactionMetadatumKind.Text: - return metadataCtors.from_text(cslMetadatum.as_text()); - default: - throw "Could not convert to known types."; - } -}; +export function _unpackMetadatums(containerHelper) { + return containerHelper.unpackKeyIndexed; +} -exports._unpackExUnits = exunits => { +export function _unpackMetadataMap(containerHelper) { + return containerHelper.unpackKeyIndexed; +} + +export function _unpackMetadataList(containerHelper) { + return containerHelper.unpack; +} + +export function _convertMetadatum(metadataCtors) { + return cslMetadatum => { + switch (cslMetadatum.kind()) { + case lib.TransactionMetadatumKind.MetadataMap: + return metadataCtors.from_map(cslMetadatum.as_map()); + case lib.TransactionMetadatumKind.MetadataList: + return metadataCtors.from_list(cslMetadatum.as_list()); + case lib.TransactionMetadatumKind.Int: + return metadataCtors.from_int(cslMetadatum.as_int()); + case lib.TransactionMetadatumKind.Bytes: + return metadataCtors.from_bytes(cslMetadatum.as_bytes()); + case lib.TransactionMetadatumKind.Text: + return metadataCtors.from_text(cslMetadatum.as_text()); + default: + throw "Could not convert to known types."; + } + }; +} + +export function _unpackExUnits(exunits) { return { mem: exunits.mem(), steps: exunits.steps(), }; -}; +} -exports._unpackUnitInterval = ui => { +export function _unpackUnitInterval(ui) { return { numerator: ui.numerator(), denominator: ui.denominator(), }; -}; +} -exports._unpackProtocolVersion = cslPV => ({ - major: cslPV.major(), - minor: cslPV.minor(), -}); +export function _unpackProtocolVersion(cslPV) { + return { + major: cslPV.major(), + minor: cslPV.minor(), + }; +} -exports._unpackExUnitsPrices = cslEup => { +export function _unpackExUnitsPrices(cslEup) { return { memPrice: cslEup.mem_price(), stepPrice: cslEup.step_price(), }; -}; +} -exports.poolParamsOperator = call("operator"); -exports.poolParamsVrfKeyhash = call("vrf_keyhash"); -exports.poolParamsPledge = call("pledge"); -exports.poolParamsCost = call("cost"); -exports.poolParamsMargin = call("margin"); -exports.poolParamsRewardAccount = call("reward_account"); -exports.poolParamsPoolOwners = containerHelper => poolParams => - containerHelper.unpack(poolParams.pool_owners()); -exports.poolParamsRelays = containerHelper => poolParams => - containerHelper.unpack(poolParams.relays()); -exports.poolParamsPoolMetadata = callMaybe("pool_metadata"); - -exports.convertRelay_ = helper => relay => { - switch (relay.kind()) { - case lib.RelayKind.SingleHostAddr: - return helper.asSingleHostAddr(relay.as_single_host_addr()); - case lib.RelayKind.SingleHostName: - return helper.asSingleHostName(relay.as_single_host_name()); - case lib.RelayKind.MultiHostName: - return helper.asMultiHostName(relay.as_multi_host_name()); - default: - throw "convertRelay_: impossible happened: invalid Relay"; - } -}; +export var poolParamsOperator = call("operator"); +export var poolParamsVrfKeyhash = call("vrf_keyhash"); +export var poolParamsPledge = call("pledge"); +export var poolParamsCost = call("cost"); +export var poolParamsMargin = call("margin"); +export var poolParamsRewardAccount = call("reward_account"); -exports.convertIpv6_ = ipv6 => ipv6.ip(); +export function poolParamsPoolOwners(containerHelper) { + return poolParams => + containerHelper.unpack(poolParams.pool_owners()); +} -exports.convertIpv4_ = ipv6 => ipv6.ip(); +export function poolParamsRelays(containerHelper) { + return poolParams => + containerHelper.unpack(poolParams.relays()); +} -exports.convertSingleHostAddr_ = maybe => cont => singleHostAddr => { - const port = singleHostAddr.port(); - const ipv4 = singleHostAddr.ipv4(); - const ipv6 = singleHostAddr.ipv6(); +export var poolParamsPoolMetadata = callMaybe("pool_metadata"); + +export function convertRelay_(helper) { + return relay => { + switch (relay.kind()) { + case lib.RelayKind.SingleHostAddr: + return helper.asSingleHostAddr(relay.as_single_host_addr()); + case lib.RelayKind.SingleHostName: + return helper.asSingleHostName(relay.as_single_host_name()); + case lib.RelayKind.MultiHostName: + return helper.asMultiHostName(relay.as_multi_host_name()); + default: + throw "convertRelay_: impossible happened: invalid Relay"; + } + }; +} - return cont(port ? maybe.just(port) : maybe.nothing)( - ipv4 ? maybe.just(ipv4) : maybe.nothing - )(ipv6 ? maybe.just(ipv6) : maybe.nothing); -}; +export function convertIpv6_(ipv6) { + return ipv6.ip(); +} -exports.convertSingleHostName_ = maybe => cont => singleHostName => { - const port = singleHostName.port(); - return cont(port ? maybe.just(port) : maybe.nothing)( - singleHostName.dns_name().record() - ); -}; +export function convertIpv4_(ipv6) { + return ipv6.ip(); +} + +export function convertSingleHostAddr_(maybe) { + return cont => singleHostAddr => { + const port = singleHostAddr.port(); + const ipv4 = singleHostAddr.ipv4(); + const ipv6 = singleHostAddr.ipv6(); + + return cont(port ? maybe.just(port) : maybe.nothing)( + ipv4 ? maybe.just(ipv4) : maybe.nothing + )(ipv6 ? maybe.just(ipv6) : maybe.nothing); + }; +} -exports.convertMultiHostName_ = multiHostName => - multiHostName.dns_name().record(); +export function convertSingleHostName_(maybe) { + return cont => singleHostName => { + const port = singleHostName.port(); + return cont(port ? maybe.just(port) : maybe.nothing)( + singleHostName.dns_name().record() + ); + }; +} + +export function convertMultiHostName_(multiHostName) { + return multiHostName.dns_name().record(); +} -exports.unpackMIRToStakeCredentials_ = - containerHelper => mirToStakeCredentials => +export function unpackMIRToStakeCredentials_(containerHelper) { + return mirToStakeCredentials => containerHelper.unpackKeyIndexed(mirToStakeCredentials); +} -exports.convertPoolMetadata_ = cont => poolMetadata => - cont(poolMetadata.url().url())(poolMetadata.pool_metadata_hash()); +export function convertPoolMetadata_(cont) { + return poolMetadata => + cont(poolMetadata.url().url())(poolMetadata.pool_metadata_hash()); +} diff --git a/src/Internal/Deserialization/UnspentOutput.js b/src/Internal/Deserialization/UnspentOutput.js index e87e5eb37d..9b22f6678f 100644 --- a/src/Internal/Deserialization/UnspentOutput.js +++ b/src/Internal/Deserialization/UnspentOutput.js @@ -40,28 +40,34 @@ const extractDict = tuple => dict => { return res; }; -exports.getInput = call("input"); -exports.getOutput = call("output"); -exports.getTransactionHash = call("transaction_id"); -exports.getTransactionIndex = call("index"); -exports.getAddress = call("address"); -exports.getPlutusData = callMaybe("plutus_data"); -exports.getScriptRef = callMaybe("script_ref"); -exports.withScriptRef = ccNativeScript => ccPlutusScript => scriptRef => { - if (scriptRef.is_native_script()) { - return ccNativeScript(scriptRef.native_script()); - } else if (scriptRef.is_plutus_script()) { - return ccPlutusScript(scriptRef.plutus_script()); - } else { - throw "Impossible happened: withScriptRef: not a script"; - } -}; +export var getInput = call("input"); +export var getOutput = call("output"); +export var getTransactionHash = call("transaction_id"); +export var getTransactionIndex = call("index"); +export var getAddress = call("address"); +export var getPlutusData = callMaybe("plutus_data"); +export var getScriptRef = callMaybe("script_ref"); + +export function withScriptRef(ccNativeScript) { + return ccPlutusScript => scriptRef => { + if (scriptRef.is_native_script()) { + return ccNativeScript(scriptRef.native_script()); + } else if (scriptRef.is_plutus_script()) { + return ccPlutusScript(scriptRef.plutus_script()); + } else { + throw "Impossible happened: withScriptRef: not a script"; + } + }; +} + +export var getAmount = call("amount"); +export var getCoin = call("coin"); +export var getMultiAsset = callMaybe("multiasset"); +export {extractDict as extractMultiAsset}; +export {extractDict as extractAssets}; +export var getDataHash = callMaybe("data_hash"); -exports.getAmount = call("amount"); -exports.getCoin = call("coin"); -exports.getMultiAsset = callMaybe("multiasset"); -exports.extractMultiAsset = extractDict; -exports.extractAssets = extractDict; -exports.getDataHash = callMaybe("data_hash"); -exports.mkTransactionUnspentOutput = input => output => - lib.TransactionUnspentOutput.new(input, output); +export function mkTransactionUnspentOutput(input) { + return output => + lib.TransactionUnspentOutput.new(input, output); +} diff --git a/src/Internal/Deserialization/WitnessSet.js b/src/Internal/Deserialization/WitnessSet.js index 752cc47bc0..e9b388b29f 100644 --- a/src/Internal/Deserialization/WitnessSet.js +++ b/src/Internal/Deserialization/WitnessSet.js @@ -18,35 +18,39 @@ const containerExtractor = obj => { return res; }; -exports.getVkeywitnesses = callMaybe("vkeys"); -exports.extractWitnesses = containerExtractor; -exports.getVkey = call("vkey"); -exports.getSignature = call("signature"); -exports.vkeyPublicKey = call("public_key"); -exports.publicKeyToBech32 = call("to_bech32"); -exports.signatureToBech32 = call("to_bech32"); -exports.getNativeScripts = callMaybe("native_scripts"); -exports.extractNativeScripts = containerExtractor; -exports.nativeScriptAs = maybe => prop => res => ns => - ns[prop]() == null ? maybe.nothing : maybe.just(res); -exports.getBootstraps = callMaybe("bootstraps"); -exports.extractBootstraps = containerExtractor; -exports.getBootstrapVkey = call("vkey"); -exports.getBootstrapSignature = call("signature"); -exports.getBootstrapChainCode = call("chain_code"); -exports.getBootstrapAttributes = call("attributes"); -exports.getPlutusScripts = callMaybe("plutus_scripts"); -exports.extractPlutusScripts = containerExtractor; -exports.plutusScriptBytes = call("bytes"); -exports.plutusScriptVersion = call("language_version"); -exports.getWitnessSetPlutusData = callMaybe("plutus_data"); -exports.extractPlutusData = containerExtractor; -exports.getRedeemers = callMaybe("redeemers"); -exports.getRedeemerTag = call("tag"); -exports.getRedeemerIndex = call("index"); -exports.extractRedeemers = containerExtractor; -exports.getRedeemerTagKind = call("kind"); -exports.getRedeemerPlutusData = call("data"); -exports.getExUnits = call("ex_units"); -exports.getExUnitsMem = call("mem"); -exports.getExUnitsSteps = call("steps"); +export var getVkeywitnesses = callMaybe("vkeys"); +export {containerExtractor as extractWitnesses}; +export var getVkey = call("vkey"); +export var getSignature = call("signature"); +export var vkeyPublicKey = call("public_key"); +export var publicKeyToBech32 = call("to_bech32"); +export var signatureToBech32 = call("to_bech32"); +export var getNativeScripts = callMaybe("native_scripts"); +export {containerExtractor as extractNativeScripts}; + +export function nativeScriptAs(maybe) { + return prop => res => ns => + ns[prop]() == null ? maybe.nothing : maybe.just(res); +} + +export var getBootstraps = callMaybe("bootstraps"); +export {containerExtractor as extractBootstraps}; +export var getBootstrapVkey = call("vkey"); +export var getBootstrapSignature = call("signature"); +export var getBootstrapChainCode = call("chain_code"); +export var getBootstrapAttributes = call("attributes"); +export var getPlutusScripts = callMaybe("plutus_scripts"); +export {containerExtractor as extractPlutusScripts}; +export var plutusScriptBytes = call("bytes"); +export var plutusScriptVersion = call("language_version"); +export var getWitnessSetPlutusData = callMaybe("plutus_data"); +export {containerExtractor as extractPlutusData}; +export var getRedeemers = callMaybe("redeemers"); +export var getRedeemerTag = call("tag"); +export var getRedeemerIndex = call("index"); +export {containerExtractor as extractRedeemers}; +export var getRedeemerTagKind = call("kind"); +export var getRedeemerPlutusData = call("data"); +export var getExUnits = call("ex_units"); +export var getExUnitsMem = call("mem"); +export var getExUnitsSteps = call("steps"); diff --git a/src/Internal/FfiHelpers.js b/src/Internal/FfiHelpers.js index 457e224b54..bd67788e16 100644 --- a/src/Internal/FfiHelpers.js +++ b/src/Internal/FfiHelpers.js @@ -11,34 +11,36 @@ const unpack = obj => { const unpackFromProperty = prop => obj => unpack(obj[prop]()); -exports._containerHelper = r => ({ - unpack, - unpackFromProperty, - // unpacks an associative container where keys are stored in .keys() - // and values for that keys might be missing. - unpackKeyIndexed: obj => { - const res = []; - for (let i = 0; i < obj.len(); i++) { - let k = obj.keys().get(i); - let v = obj.get(k); - if (v == null) continue; - res.push(r.tuple(k)(v)); - } - return res; - }, - // Abstracts away packing array of something into a monomorphic container. - pack: (container, elements) => { - const res = container.new(); - elements.forEach(elem => res.add(elem)); - return res; - }, - // Abstracts away packing a list of KV-pairs into a map-like structure. - packMap: (container, entries) => { - const res = container.new(); - entries.forEach(entry => { - const [key, value] = r.untuple(entry); - res.insert(key, value); - }); - return res; - }, -}); +export function _containerHelper(r) { + return { + unpack, + unpackFromProperty, + // unpacks an associative container where keys are stored in .keys() + // and values for that keys might be missing. + unpackKeyIndexed: obj => { + const res = []; + for (let i = 0; i < obj.len(); i++) { + let k = obj.keys().get(i); + let v = obj.get(k); + if (v == null) continue; + res.push(r.tuple(k)(v)); + } + return res; + }, + // Abstracts away packing array of something into a monomorphic container. + pack: (container, elements) => { + const res = container.new(); + elements.forEach(elem => res.add(elem)); + return res; + }, + // Abstracts away packing a list of KV-pairs into a map-like structure. + packMap: (container, entries) => { + const res = container.new(); + entries.forEach(entry => { + const [key, value] = r.untuple(entry); + res.insert(key, value); + }); + return res; + }, + }; +} diff --git a/src/Internal/Hashing.js b/src/Internal/Hashing.js index 0d9f2065d0..319382353d 100644 --- a/src/Internal/Hashing.js +++ b/src/Internal/Hashing.js @@ -1,8 +1,9 @@ /* global BROWSER_RUNTIME */ -const Blake2 = require("blakejs"); -const SHA256 = require("jssha/dist/sha256"); -const SHA3 = require("jssha/dist/sha3"); +import Blake2 from "blakejs"; + +import SHA256 from "jssha/dist/sha256"; +import SHA3 from "jssha/dist/sha3"; let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { @@ -12,27 +13,29 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { } lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); -exports.blake2b224Hash = bytesToHash => { +export function blake2b224Hash(bytesToHash) { return Blake2.blake2b(bytesToHash, null, 28); -}; +} -exports.blake2b224HashHex = bytesToHash => { +export function blake2b224HashHex(bytesToHash) { return Blake2.blake2bHex(bytesToHash, null, 28); -}; +} -exports.blake2b256Hash = bytesToHash => { +export function blake2b256Hash(bytesToHash) { return Blake2.blake2b(bytesToHash, null, 32); -}; +} -exports.blake2b256HashHex = bytesToHash => { +export function blake2b256HashHex(bytesToHash) { return Blake2.blake2bHex(bytesToHash, null, 32); -}; +} -exports.hashPlutusData = plutusData => { +export function hashPlutusData(plutusData) { return lib.hash_plutus_data(plutusData); -}; +} -exports.hashPlutusScript = script => script.hash(); +export function hashPlutusScript(script) { + return script.hash(); +} const SHA256_HASH_VARIANT = "SHA-256"; const SHA3_256_HASH_VARIANT = "SHA3-256"; @@ -40,26 +43,26 @@ const SHA3_256_HASH_VARIANT = "SHA3-256"; const UINT8ARRAY_FORMAT = "UINT8ARRAY"; const HEX_FORMAT = "HEX"; -exports.sha256Hash = bytesToHash => { +export function sha256Hash(bytesToHash) { const shaObj = new SHA256(SHA256_HASH_VARIANT, UINT8ARRAY_FORMAT); shaObj.update(bytesToHash); return shaObj.getHash(UINT8ARRAY_FORMAT); -}; +} -exports.sha256HashHex = bytesToHash => { +export function sha256HashHex(bytesToHash) { const shaObj = new SHA256(SHA256_HASH_VARIANT, UINT8ARRAY_FORMAT); shaObj.update(bytesToHash); return shaObj.getHash(HEX_FORMAT); -}; +} -exports.sha3_256Hash = bytesToHash => { +export function sha3_256Hash(bytesToHash) { const shaObj = new SHA3(SHA3_256_HASH_VARIANT, UINT8ARRAY_FORMAT); shaObj.update(bytesToHash); return shaObj.getHash(UINT8ARRAY_FORMAT); -}; +} -exports.sha3_256HashHex = bytesToHash => { +export function sha3_256HashHex(bytesToHash) { const shaObj = new SHA3(SHA3_256_HASH_VARIANT, UINT8ARRAY_FORMAT); shaObj.update(bytesToHash); return shaObj.getHash(HEX_FORMAT); -}; +} diff --git a/src/Internal/JsWebSocket.js b/src/Internal/JsWebSocket.js index 7a0c537e76..305c14915d 100644 --- a/src/Internal/JsWebSocket.js +++ b/src/Internal/JsWebSocket.js @@ -1,6 +1,6 @@ /* global BROWSER_RUNTIME */ -const ReconnectingWebSocket = require("reconnecting-websocket"); +import ReconnectingWebSocket from "reconnecting-websocket"; let OurWebSocket; if (typeof BROWSER_RUNTIME == "undefined" || !BROWSER_RUNTIME) { @@ -17,88 +17,106 @@ class NoPerMessageDeflateWebSocket extends OurWebSocket { } } -exports._mkWebSocket = logger => url => () => { - try { - let ws; - if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - ws = new ReconnectingWebSocket.default(url); - } else { - ws = new ReconnectingWebSocket(url, [], { - WebSocket: NoPerMessageDeflateWebSocket, - }); +export function _mkWebSocket(logger) { + return url => () => { + try { + let ws; + if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { + ws = new ReconnectingWebSocket.default(url); + } else { + ws = new ReconnectingWebSocket(url, [], { + WebSocket: NoPerMessageDeflateWebSocket, + }); + } + ws.finalizers = []; + logger("Created a new WebSocket")(); + return ws; + } catch (e) { + logger("Failed to create a new WebSocket"); + throw e; } - ws.finalizers = []; - logger("Created a new WebSocket")(); - return ws; - } catch (e) { - logger("Failed to create a new WebSocket"); - throw e; - } -}; + }; +} -exports._onWsConnect = ws => fn => () => { - ws.addEventListener("open", fn); - ws.finalizers.push(() => { - ws.removeEventListener("open", fn); - }); -}; +export function _onWsConnect(ws) { + return fn => () => { + ws.addEventListener("open", fn); + ws.finalizers.push(() => { + ws.removeEventListener("open", fn); + }); + }; +} -exports._onWsError = ws => fn => () => { - const listener = function (event) { - if ( - "message" in event && - typeof event.message === "string" && - event.message.length > 0 - ) { - fn(event.message)(); - } else if ("error" in event && event.error instanceof Error) { - fn(event.error.toString())(); - } else { - fn(event.toString())(); - } +export function _onWsError(ws) { + return fn => () => { + const listener = function (event) { + if ( + "message" in event && + typeof event.message === "string" && + event.message.length > 0 + ) { + fn(event.message)(); + } else if ("error" in event && event.error instanceof Error) { + fn(event.error.toString())(); + } else { + fn(event.toString())(); + } + }; + ws.addEventListener("error", listener); + ws.finalizers.push(() => { + ws.removeEventListener("error", listener); + }); + return listener; }; - ws.addEventListener("error", listener); - ws.finalizers.push(() => { - ws.removeEventListener("error", listener); - }); - return listener; -}; +} -exports._removeOnWsError = ws => listener => () => - ws.removeEventListener("error", listener); +export function _removeOnWsError(ws) { + return listener => () => + ws.removeEventListener("error", listener); +} -exports._onWsMessage = ws => logger => fn => () => { - const listener = function func(event) { - const str = event.data; - logger(`message: ${str}`)(); - fn(str)(); +export function _onWsMessage(ws) { + return logger => fn => () => { + const listener = function func(event) { + const str = event.data; + logger(`message: ${str}`)(); + fn(str)(); + }; + ws.addEventListener("message", listener); + ws.finalizers.push(() => { + ws.removeEventListener("message", listener); + }); }; - ws.addEventListener("message", listener); - ws.finalizers.push(() => { - ws.removeEventListener("message", listener); - }); -}; +} -exports._wsFinalize = ws => () => { - for (let finalizer of ws.finalizers) { - /* eslint-disable no-empty */ - try { - finalizer(); - } catch (_) {} - /* eslint-enable */ - } - ws.finalizers = []; -}; +export function _wsFinalize(ws) { + return () => { + for (let finalizer of ws.finalizers) { + /* eslint-disable no-empty */ + try { + finalizer(); + } catch (_) {} + /* eslint-enable */ + } + ws.finalizers = []; + }; +} -exports._wsSend = ws => logger => str => () => { - logger(`sending: ${str}`)(); - ws.send(str); -}; +export function _wsSend(ws) { + return logger => str => () => { + logger(`sending: ${str}`)(); + ws.send(str); + }; +} -exports._wsReconnect = ws => () => { - ws.reconnect(); -}; +export function _wsReconnect(ws) { + return () => { + ws.reconnect(); + }; +} -exports._wsClose = ws => () => { - ws.close(); -}; +export function _wsClose(ws) { + return () => { + ws.close(); + }; +} diff --git a/src/Internal/Metadata/ToMetadata.purs b/src/Internal/Metadata/ToMetadata.purs index bb1db286e0..9b96597134 100644 --- a/src/Internal/Metadata/ToMetadata.purs +++ b/src/Internal/Metadata/ToMetadata.purs @@ -10,13 +10,10 @@ import Ctl.Internal.Types.Int (Int, fromBigInt) as Int import Ctl.Internal.Types.TransactionMetadata ( TransactionMetadatum(MetadataMap, MetadataList, Int, Bytes, Text) ) -import Data.Array (fromFoldable) as Array import Data.BigInt (BigInt) -import Data.Foldable (class Foldable) import Data.Map (Map) import Data.Map (fromFoldable, toUnfoldable) as Map import Data.Maybe (fromJust) -import Data.NonEmpty (NonEmpty) import Data.Profunctor.Strong ((***)) import Data.Tuple (Tuple) import Partial.Unsafe (unsafePartial) @@ -49,9 +46,6 @@ instance else instance ToMetadata a => ToMetadata (Array a) where toMetadata = MetadataList <<< map toMetadata -instance (Foldable f, ToMetadata a) => ToMetadata (NonEmpty f a) where - toMetadata = toMetadata <<< Array.fromFoldable - instance ToMetadata Int.Int where toMetadata = Int diff --git a/src/Internal/Plutip/PortCheck.js b/src/Internal/Plutip/PortCheck.js index b9440791b7..dedb2434aa 100644 --- a/src/Internal/Plutip/PortCheck.js +++ b/src/Internal/Plutip/PortCheck.js @@ -1,24 +1,26 @@ -const net = require("net"); +import net from "net"; -exports._isPortAvailable = port => () => - new Promise((resolve, reject) => { - const server = net - .createServer() - .once("error", function (err) { - if (err.code == "EADDRINUSE") { - resolve(false); - } else { - reject( - "Failed check for port availability (port: " + - port + - ", error: " + - err.code + - ")" - ); - } - }) - .once("listening", () => { - server.once("close", () => resolve(true)).close(); - }) - .listen(port); - }); +export function _isPortAvailable(port) { + return () => + new Promise((resolve, reject) => { + const server = net + .createServer() + .once("error", function (err) { + if (err.code == "EADDRINUSE") { + resolve(false); + } else { + reject( + "Failed check for port availability (port: " + + port + + ", error: " + + err.code + + ")" + ); + } + }) + .once("listening", () => { + server.once("close", () => resolve(true)).close(); + }) + .listen(port); + }); +} diff --git a/src/Internal/Plutip/Spawn.js b/src/Internal/Plutip/Spawn.js index 4e4273f3af..93cba32e6c 100644 --- a/src/Internal/Plutip/Spawn.js +++ b/src/Internal/Plutip/Spawn.js @@ -1,20 +1,26 @@ "use strict"; -exports.clearLineHandler = readline => () => { - readline.removeAllListeners("line"); -}; +export function clearLineHandler(readline) { + return () => { + readline.removeAllListeners("line"); + }; +} -const fs = require("fs"); +import fs from "fs"; -exports._rmdirSync = path => () => fs.rmSync(path, { recursive: true }); +export function _rmdirSync(path) { + return () => fs.rmSync(path, { recursive: true }); +} -exports.removeOnSignal = - ({ signal, callback }) => - () => { +export function removeOnSignal({ signal, callback }) { + return () => { process.removeListener(signal, callback); }; +} -exports.onSignalImpl = signal => callback => () => { - process.on(signal, callback); - return { signal, callback }; -}; +export function onSignalImpl(signal) { + return callback => () => { + process.on(signal, callback); + return { signal, callback }; + }; +} diff --git a/src/Internal/Plutip/Utils.js b/src/Internal/Plutip/Utils.js index 279fd085a1..ab594520c6 100644 --- a/src/Internal/Plutip/Utils.js +++ b/src/Internal/Plutip/Utils.js @@ -1,3 +1,5 @@ -const os = require("os"); +import os from "os"; -exports.tmpdir = () => os.tmpdir(); +export function tmpdir() { + return os.tmpdir(); +} diff --git a/src/Internal/Plutus/Types/AssocMap.purs b/src/Internal/Plutus/Types/AssocMap.purs index 9b5bcb5f63..15e16e3846 100644 --- a/src/Internal/Plutus/Types/AssocMap.purs +++ b/src/Internal/Plutus/Types/AssocMap.purs @@ -20,13 +20,14 @@ module Ctl.Internal.Plutus.Types.AssocMap import Prelude -import Aeson (class DecodeAeson, class EncodeAeson) +import Aeson (Aeson, class DecodeAeson, class EncodeAeson, decodeAeson, encodeAeson) import Ctl.Internal.FromData (class FromData, fromData) import Ctl.Internal.ToData (class ToData, toData) import Ctl.Internal.Types.PlutusData (PlutusData(Map)) as PD import Data.Array (any, deleteAt, filter, findIndex, mapMaybe, null, singleton) as Array import Data.Array ((:)) -import Data.Bifunctor (bimap) +import Data.Bifunctor (bimap, rmap) +import Data.Bitraversable (rtraverse) import Data.Foldable ( class Foldable , foldMap @@ -67,8 +68,14 @@ derive instance Generic (Map k v) _ derive instance Newtype (Map k v) _ derive newtype instance (Eq k, Eq v) => Eq (Map k v) derive newtype instance (Ord k, Ord v) => Ord (Map k v) -derive newtype instance (EncodeAeson k, EncodeAeson v) => EncodeAeson (Map k v) -derive newtype instance (DecodeAeson k, DecodeAeson v) => DecodeAeson (Map k v) + +instance (EncodeAeson k, EncodeAeson v) => EncodeAeson (Map k v) where + encodeAeson = encodeAeson <<< map (rmap encodeAeson) <<< unwrap + +instance (DecodeAeson k, DecodeAeson v) => DecodeAeson (Map k v) where + decodeAeson x = Map <$> + (traverse (rtraverse decodeAeson) + =<< (decodeAeson x :: _ (Array (Tuple k Aeson)))) instance (Show k, Show v) => Show (Map k v) where show = genericShow diff --git a/src/Internal/QueryM/UniqueId.js b/src/Internal/QueryM/UniqueId.js index c4c2faf40b..a96dee7ac8 100644 --- a/src/Internal/QueryM/UniqueId.js +++ b/src/Internal/QueryM/UniqueId.js @@ -1,3 +1,5 @@ -const uniqid = require("uniqid"); +import uniqid from "uniqid"; -exports.uniqueId = str => () => uniqid(str); +export function uniqueId(str) { + return () => uniqid(str); +} diff --git a/src/Internal/Serialization.js b/src/Internal/Serialization.js index d66f01e93e..d39b29bb70 100644 --- a/src/Internal/Serialization.js +++ b/src/Internal/Serialization.js @@ -10,177 +10,270 @@ lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); const setter = prop => obj => value => () => obj["set_" + prop](value); -exports.hashTransaction = body => () => lib.hash_transaction(body); - -exports.newValue = coin => () => lib.Value.new(coin); - -exports.newValueFromAssets = multiasset => () => - lib.Value.new_from_assets(multiasset); - -exports.valueSetCoin = setter("coin"); +export function hashTransaction(body) { + return () => lib.hash_transaction(body); +} -exports.newTransactionInput = transaction_id => index => () => - lib.TransactionInput.new(transaction_id, index); +export function newValue(coin) { + return () => lib.Value.new(coin); +} -exports.newTransactionInputs = () => lib.TransactionInputs.new(); +export function newValueFromAssets(multiasset) { + return () => + lib.Value.new_from_assets(multiasset); +} -exports.addTransactionInput = inputs => input => () => inputs.add(input); +export var valueSetCoin = setter("coin"); -exports.newTransactionOutput = address => amount => () => - lib.TransactionOutput.new(address, amount); +export function newTransactionInput(transaction_id) { + return index => () => + lib.TransactionInput.new(transaction_id, index); +} -exports.newTransactionOutputs = () => lib.TransactionOutputs.new(); +export function newTransactionInputs() { + return lib.TransactionInputs.new(); +} -exports.addTransactionOutput = outputs => output => () => outputs.add(output); +export function addTransactionInput(inputs) { + return input => () => inputs.add(input); +} -exports.newTransactionBody = inputs => outputs => fee => () => - lib.TransactionBody.new_tx_body(inputs, outputs, fee); +export function newTransactionOutput(address) { + return amount => () => + lib.TransactionOutput.new(address, amount); +} -exports.setTxIsValid = tx => isValid => () => tx.set_is_valid(isValid); +export function newTransactionOutputs() { + return lib.TransactionOutputs.new(); +} -exports.newTransaction = body => witness_set => auxiliary_data => () => - lib.Transaction.new(body, witness_set, auxiliary_data); +export function addTransactionOutput(outputs) { + return output => () => outputs.add(output); +} -exports.newTransaction_ = body => witness_set => () => - lib.Transaction.new(body, witness_set); +export function newTransactionBody(inputs) { + return outputs => fee => () => + lib.TransactionBody.new_tx_body(inputs, outputs, fee); +} -exports.newTransactionUnspentOutput = input => output => () => - lib.TransactionUnspentOutput.new(input, output); +export function setTxIsValid(tx) { + return isValid => () => tx.set_is_valid(isValid); +} -exports.newMultiAsset = () => lib.MultiAsset.new(); +export function newTransaction(body) { + return witness_set => auxiliary_data => () => + lib.Transaction.new(body, witness_set, auxiliary_data); +} -exports.insertMultiAsset = multiasset => key => value => () => - multiasset.insert(key, value); +export function newTransaction_(body) { + return witness_set => () => + lib.Transaction.new(body, witness_set); +} -exports.newAssets = () => lib.Assets.new(); +export function newTransactionUnspentOutput(input) { + return output => () => + lib.TransactionUnspentOutput.new(input, output); +} -exports.insertAssets = assets => key => value => () => - assets.insert(key, value); +export function newMultiAsset() { + return lib.MultiAsset.new(); +} -exports.newAssetName = name => () => lib.AssetName.new(name); +export function insertMultiAsset(multiasset) { + return key => value => () => + multiasset.insert(key, value); +} -exports.transactionOutputSetDataHash = setter("data_hash"); +export function newAssets() { + return lib.Assets.new(); +} -exports.transactionOutputSetPlutusData = setter("plutus_data"); +export function insertAssets(assets) { + return key => value => () => + assets.insert(key, value); +} -exports.transactionOutputSetScriptRef = setter("script_ref"); +export function newAssetName(name) { + return () => lib.AssetName.new(name); +} -exports.scriptRefNewNativeScript = nativeScript => - lib.ScriptRef.new_native_script(nativeScript); +export var transactionOutputSetDataHash = setter("data_hash"); +export var transactionOutputSetPlutusData = setter("plutus_data"); +export var transactionOutputSetScriptRef = setter("script_ref"); -exports.scriptRefNewPlutusScript = plutusScript => - lib.ScriptRef.new_plutus_script(plutusScript); +export function scriptRefNewNativeScript(nativeScript) { + return lib.ScriptRef.new_native_script(nativeScript); +} -exports.newVkeywitnesses = () => lib.Vkeywitnesses.new(); +export function scriptRefNewPlutusScript(plutusScript) { + return lib.ScriptRef.new_plutus_script(plutusScript); +} -exports.makeVkeywitness = hash => key => () => lib.make_vkey_witness(hash, key); +export function newVkeywitnesses() { + return lib.Vkeywitnesses.new(); +} -exports.newVkeywitness = vkey => signature => () => - lib.Vkeywitness.new(vkey, signature); +export function makeVkeywitness(hash) { + return key => () => lib.make_vkey_witness(hash, key); +} -exports.addVkeywitness = witnesses => witness => () => witnesses.add(witness); +export function newVkeywitness(vkey) { + return signature => () => + lib.Vkeywitness.new(vkey, signature); +} -exports.newVkeyFromPublicKey = public_key => () => lib.Vkey.new(public_key); +export function addVkeywitness(witnesses) { + return witness => () => witnesses.add(witness); +} -exports.publicKeyHash = pk => pk.hash(); +export function newVkeyFromPublicKey(public_key) { + return () => lib.Vkey.new(public_key); +} -exports.transactionWitnessSetSetVkeys = setter("vkeys"); +export function publicKeyHash(pk) { + return pk.hash(); +} -exports.newCostmdls = () => lib.Costmdls.new(); +export var transactionWitnessSetSetVkeys = setter("vkeys"); -exports.defaultCostmdls = () => - lib.TxBuilderConstants.plutus_vasil_cost_models(); +export function newCostmdls() { + return lib.Costmdls.new(); +} -exports.costmdlsSetCostModel = cms => lang => cm => () => cms.insert(lang, cm); +export function defaultCostmdls() { + return lib.TxBuilderConstants.plutus_vasil_cost_models(); +} -exports.newCostModel = () => lib.CostModel.new(); +export function costmdlsSetCostModel(cms) { + return lang => cm => () => cms.insert(lang, cm); +} -exports.costModelSetCost = cm => op => cost => () => cm.set(op, cost); +export function newCostModel() { + return lib.CostModel.new(); +} -exports.newPlutusV1 = () => lib.Language.new_plutus_v1(); +export function costModelSetCost(cm) { + return op => cost => () => cm.set(op, cost); +} -exports.newPlutusV2 = () => lib.Language.new_plutus_v2(); +export function newPlutusV1() { + return lib.Language.new_plutus_v1(); +} -exports._hashScriptData = rs => cms => ds => () => { - const list = lib.PlutusList.new(); - ds.forEach(d => list.add(d)); - return lib.hash_script_data(rs, cms, list); -}; +export function newPlutusV2() { + return lib.Language.new_plutus_v2(); +} -exports._hashScriptDataNoDatums = rs => cms => () => - lib.hash_script_data(rs, cms); +export function _hashScriptData(rs) { + return cms => ds => () => { + const list = lib.PlutusList.new(); + ds.forEach(d => list.add(d)); + return lib.hash_script_data(rs, cms, list); + }; +} -exports.newRedeemers = () => lib.Redeemers.new(); +export function _hashScriptDataNoDatums(rs) { + return cms => () => + lib.hash_script_data(rs, cms); +} -exports.addRedeemer = rs => r => () => rs.add(r); +export function newRedeemers() { + return lib.Redeemers.new(); +} -exports.setTxBodyReferenceInputs = txBody => referenceInputs => () => - txBody.set_reference_inputs(referenceInputs); +export function addRedeemer(rs) { + return r => () => rs.add(r); +} -exports.setTxBodyScriptDataHash = setter("script_data_hash"); +export function setTxBodyReferenceInputs(txBody) { + return referenceInputs => () => + txBody.set_reference_inputs(referenceInputs); +} -exports.setTxBodyMint = setter("mint"); +export var setTxBodyScriptDataHash = setter("script_data_hash"); +export var setTxBodyMint = setter("mint"); -exports.newMint = () => lib.Mint.new(); +export function newMint() { + return lib.Mint.new(); +} -exports._bigIntToInt = maybe => bigInt => { - try { - const str = bigInt.to_str(); - if (str[0] == "-") { - return maybe.just( - lib.Int.new_negative(lib.BigNum.from_str(str.slice(1))) - ); - } else { - return maybe.just(lib.Int.new(lib.BigNum.from_str(str))); +export function _bigIntToInt(maybe) { + return bigInt => { + try { + const str = bigInt.to_str(); + if (str[0] == "-") { + return maybe.just( + lib.Int.new_negative(lib.BigNum.from_str(str.slice(1))) + ); + } else { + return maybe.just(lib.Int.new(lib.BigNum.from_str(str))); + } + } catch (_) { + return maybe.nothing; } - } catch (_) { - return maybe.nothing; - } -}; - -exports.newMintAssets = lib.MintAssets.new; + }; +} -exports.insertMintAssets = mint => scriptHash => mintAssets => () => - mint.insert(scriptHash, mintAssets); +export var newMintAssets = lib.MintAssets.new; -exports.insertMintAsset = mintAssets => assetName => int => () => - mintAssets.insert(assetName, int); +export function insertMintAssets(mint) { + return scriptHash => mintAssets => () => + mint.insert(scriptHash, mintAssets); +} -exports.networkIdTestnet = () => lib.NetworkId.testnet(); +export function insertMintAsset(mintAssets) { + return assetName => int => () => + mintAssets.insert(assetName, int); +} -exports.networkIdMainnet = () => lib.NetworkId.mainnet(); +export function networkIdTestnet() { + return lib.NetworkId.testnet(); +} -exports.setTxBodyCollateralReturn = txBody => collateralReturn => () => - txBody.set_collateral_return(collateralReturn); +export function networkIdMainnet() { + return lib.NetworkId.mainnet(); +} -exports.setTxBodyTotalCollateral = txBody => totalCollateral => () => - txBody.set_total_collateral(totalCollateral); +export function setTxBodyCollateralReturn(txBody) { + return collateralReturn => () => + txBody.set_collateral_return(collateralReturn); +} -exports.setTxBodyTtl = setter("ttl"); +export function setTxBodyTotalCollateral(txBody) { + return totalCollateral => () => + txBody.set_total_collateral(totalCollateral); +} -exports.setTxBodyCerts = setter("certs"); +export var setTxBodyTtl = setter("ttl"); +export var setTxBodyCerts = setter("certs"); -exports.newCertificates = () => lib.Certificates.new(); +export function newCertificates() { + return lib.Certificates.new(); +} -exports.newStakeRegistrationCertificate = stakeCredential => () => - lib.Certificate.new_stake_registration( - lib.StakeRegistration.new(stakeCredential) - ); +export function newStakeRegistrationCertificate(stakeCredential) { + return () => + lib.Certificate.new_stake_registration( + lib.StakeRegistration.new(stakeCredential) + ); +} -exports.newStakeDeregistrationCertificate = stakeCredential => () => - lib.Certificate.new_stake_deregistration( - lib.StakeDeregistration.new(stakeCredential) - ); +export function newStakeDeregistrationCertificate(stakeCredential) { + return () => + lib.Certificate.new_stake_deregistration( + lib.StakeDeregistration.new(stakeCredential) + ); +} -exports.newStakeDelegationCertificate = - stakeCredential => ed25519KeyHash => () => +export function newStakeDelegationCertificate(stakeCredential) { + return ed25519KeyHash => () => lib.Certificate.new_stake_delegation( lib.StakeDelegation.new(stakeCredential, ed25519KeyHash) ); +} -exports.newPoolRegistrationCertificate = - operator => - vrfKeyhash => +export function newPoolRegistrationCertificate(operator) { + return vrfKeyhash => pledge => cost => margin => @@ -204,143 +297,172 @@ exports.newPoolRegistrationCertificate = ) ) ); +} -exports.newUnitInterval = numerator => denominator => () => - lib.UnitInterval.new(numerator, denominator); +export function newUnitInterval(numerator) { + return denominator => () => + lib.UnitInterval.new(numerator, denominator); +} -exports.newPoolRetirementCertificate = poolKeyHash => epoch => () => - lib.Certificate.new_pool_retirement( - lib.PoolRetirement.new(poolKeyHash, epoch) - ); +export function newPoolRetirementCertificate(poolKeyHash) { + return epoch => () => + lib.Certificate.new_pool_retirement( + lib.PoolRetirement.new(poolKeyHash, epoch) + ); +} -exports.newGenesisKeyDelegationCertificate = - genesisHash => genesisDelegateHash => vrfKeyhash => () => +export function newGenesisKeyDelegationCertificate(genesisHash) { + return genesisDelegateHash => vrfKeyhash => () => lib.Certificate.new_genesis_key_delegation( lib.GenesisKeyDelegation.new(genesisHash, genesisDelegateHash, vrfKeyhash) ); +} -exports.addCert = certificates => certificate => () => - certificates.add(certificate); - -exports.setTxBodyCollateral = setter("collateral"); +export function addCert(certificates) { + return certificate => () => + certificates.add(certificate); +} -exports.setTxBodyNetworkId = setter("network_id"); +export var setTxBodyCollateral = setter("collateral"); +export var setTxBodyNetworkId = setter("network_id"); -exports.transactionBodySetRequiredSigners = - containerHelper => body => keyHashes => () => +export function transactionBodySetRequiredSigners(containerHelper) { + return body => keyHashes => () => body.set_required_signers( containerHelper.pack(lib.Ed25519KeyHashes, keyHashes) ); +} -exports.transactionBodySetValidityStartInterval = setter( +export var transactionBodySetValidityStartInterval = setter( "validity_start_interval_bignum" ); -exports.transactionBodySetAuxiliaryDataHash = txBody => hash => () => - txBody.set_auxiliary_data_hash(hash); - -exports.convertPoolOwners = containerHelper => keyHashes => () => - containerHelper.pack(lib.Ed25519KeyHashes, keyHashes); - -exports.packRelays = containerHelper => relays => - containerHelper.pack(lib.Relays, relays); - -exports.newIpv4 = data => () => lib.Ipv4.new(data); - -exports.newIpv6 = data => () => lib.Ipv6.new(data); - -exports.newSingleHostAddr = port => ipv4 => ipv6 => () => - lib.Relay.new_single_host_addr(lib.SingleHostAddr.new(port, ipv4, ipv6)); - -exports.newSingleHostName = port => dnsName => () => - lib.Relay.new_single_host_name( - lib.SingleHostName.new(port, lib.DNSRecordAorAAAA.new(dnsName)) - ); - -exports.newMultiHostName = dnsName => () => - lib.Relay.new_multi_host_name( - lib.MultiHostName.new(lib.DNSRecordSRV.new(dnsName)) - ); - -exports.newPoolMetadata = url => hash => () => - lib.PoolMetadata.new(lib.URL.new(url), hash); - -exports.newMoveInstantaneousRewardToOtherPot = pot => amount => () => - lib.MoveInstantaneousReward.new_to_other_pot(pot, amount); - -exports.newMoveInstantaneousRewardToStakeCreds = pot => amounts => () => - lib.MoveInstantaneousReward.new_to_stake_creds(pot, amounts); - -exports.newMIRToStakeCredentials = containerHelper => entries => () => - containerHelper.packMap(lib.MIRToStakeCredentials, entries); - -exports.newMoveInstantaneousRewardsCertificate = mir => () => - lib.Certificate.new_move_instantaneous_rewards_cert( - lib.MoveInstantaneousRewardsCert.new(mir) - ); - -exports.newWithdrawals = containerHelper => entries => () => - containerHelper.packMap(lib.Withdrawals, entries); - -exports.setTxBodyWithdrawals = setter("withdrawals"); - -exports.setTxBodyUpdate = setter("update"); - -exports.newUpdate = ppUpdates => epoch => () => - lib.Update.new(ppUpdates, epoch); - -exports.ppuSetMinfeeA = setter("minfee_a"); - -exports.ppuSetMinfeeB = setter("minfee_b"); - -exports.ppuSetMaxBlockBodySize = setter("max_block_body_size"); - -exports.ppuSetMaxTxSize = setter("max_tx_size"); +export function transactionBodySetAuxiliaryDataHash(txBody) { + return hash => () => + txBody.set_auxiliary_data_hash(hash); +} -exports.ppuSetMaxBlockHeaderSize = setter("max_block_header_size"); +export function convertPoolOwners(containerHelper) { + return keyHashes => () => + containerHelper.pack(lib.Ed25519KeyHashes, keyHashes); +} -exports.ppuSetKeyDeposit = setter("key_deposit"); +export function packRelays(containerHelper) { + return relays => + containerHelper.pack(lib.Relays, relays); +} -exports.ppuSetPoolDeposit = setter("pool_deposit"); +export function newIpv4(data) { + return () => lib.Ipv4.new(data); +} -exports.ppuSetMaxEpoch = setter("max_epoch"); +export function newIpv6(data) { + return () => lib.Ipv6.new(data); +} -exports.ppuSetNOpt = setter("n_opt"); +export function newSingleHostAddr(port) { + return ipv4 => ipv6 => () => + lib.Relay.new_single_host_addr(lib.SingleHostAddr.new(port, ipv4, ipv6)); +} -exports.ppuSetPoolPledgeInfluence = setter("pool_pledge_influence"); +export function newSingleHostName(port) { + return dnsName => () => + lib.Relay.new_single_host_name( + lib.SingleHostName.new(port, lib.DNSRecordAorAAAA.new(dnsName)) + ); +} -exports.ppuSetExpansionRate = setter("expansion_rate"); +export function newMultiHostName(dnsName) { + return () => + lib.Relay.new_multi_host_name( + lib.MultiHostName.new(lib.DNSRecordSRV.new(dnsName)) + ); +} -exports.ppuSetTreasuryGrowthRate = setter("treasury_growth_rate"); +export function newPoolMetadata(url) { + return hash => () => + lib.PoolMetadata.new(lib.URL.new(url), hash); +} -exports.newProtocolVersion = major => minor => () => - lib.ProtocolVersion.new(major, minor); +export function newMoveInstantaneousRewardToOtherPot(pot) { + return amount => () => + lib.MoveInstantaneousReward.new_to_other_pot(pot, amount); +} -exports.ppuSetProtocolVersion = ppu => version => () => - ppu.set_protocol_version(version); +export function newMoveInstantaneousRewardToStakeCreds(pot) { + return amounts => () => + lib.MoveInstantaneousReward.new_to_stake_creds(pot, amounts); +} -exports.ppuSetMinPoolCost = setter("min_pool_cost"); +export function newMIRToStakeCredentials(containerHelper) { + return entries => () => + containerHelper.packMap(lib.MIRToStakeCredentials, entries); +} -exports.ppuSetAdaPerUtxoByte = setter("ada_per_utxo_byte"); +export function newMoveInstantaneousRewardsCertificate(mir) { + return () => + lib.Certificate.new_move_instantaneous_rewards_cert( + lib.MoveInstantaneousRewardsCert.new(mir) + ); +} -exports.ppuSetCostModels = setter("cost_models"); +export function newWithdrawals(containerHelper) { + return entries => () => + containerHelper.packMap(lib.Withdrawals, entries); +} -exports.newExUnitPrices = mem_price => step_price => () => - lib.ExUnitPrices.new(mem_price, step_price); +export var setTxBodyWithdrawals = setter("withdrawals"); +export var setTxBodyUpdate = setter("update"); -exports.ppuSetExecutionCosts = setter("execution_costs"); +export function newUpdate(ppUpdates) { + return epoch => () => + lib.Update.new(ppUpdates, epoch); +} -exports.ppuSetMaxTxExUnits = setter("max_tx_ex_units"); +export var ppuSetMinfeeA = setter("minfee_a"); +export var ppuSetMinfeeB = setter("minfee_b"); +export var ppuSetMaxBlockBodySize = setter("max_block_body_size"); +export var ppuSetMaxTxSize = setter("max_tx_size"); +export var ppuSetMaxBlockHeaderSize = setter("max_block_header_size"); +export var ppuSetKeyDeposit = setter("key_deposit"); +export var ppuSetPoolDeposit = setter("pool_deposit"); +export var ppuSetMaxEpoch = setter("max_epoch"); +export var ppuSetNOpt = setter("n_opt"); +export var ppuSetPoolPledgeInfluence = setter("pool_pledge_influence"); +export var ppuSetExpansionRate = setter("expansion_rate"); +export var ppuSetTreasuryGrowthRate = setter("treasury_growth_rate"); + +export function newProtocolVersion(major) { + return minor => () => + lib.ProtocolVersion.new(major, minor); +} -exports.ppuSetMaxBlockExUnits = setter("max_block_ex_units"); +export function ppuSetProtocolVersion(ppu) { + return version => () => + ppu.set_protocol_version(version); +} -exports.ppuSetMaxValueSize = setter("max_value_size"); +export var ppuSetMinPoolCost = setter("min_pool_cost"); +export var ppuSetAdaPerUtxoByte = setter("ada_per_utxo_byte"); +export var ppuSetCostModels = setter("cost_models"); -exports.ppuSetCollateralPercentage = setter("collateral_percentage"); +export function newExUnitPrices(mem_price) { + return step_price => () => + lib.ExUnitPrices.new(mem_price, step_price); +} -exports.ppuSetMaxCollateralInputs = setter("max_collateral_inputs"); +export var ppuSetExecutionCosts = setter("execution_costs"); +export var ppuSetMaxTxExUnits = setter("max_tx_ex_units"); +export var ppuSetMaxBlockExUnits = setter("max_block_ex_units"); +export var ppuSetMaxValueSize = setter("max_value_size"); +export var ppuSetCollateralPercentage = setter("collateral_percentage"); +export var ppuSetMaxCollateralInputs = setter("max_collateral_inputs"); -exports.newProtocolParamUpdate = () => lib.ProtocolParamUpdate.new(); +export function newProtocolParamUpdate() { + return lib.ProtocolParamUpdate.new(); +} -exports.newProposedProtocolParameterUpdates = containerHelper => kvs => () => - containerHelper.packMap(lib.ProposedProtocolParameterUpdates, kvs); +export function newProposedProtocolParameterUpdates(containerHelper) { + return kvs => () => + containerHelper.packMap(lib.ProposedProtocolParameterUpdates, kvs); +} diff --git a/src/Internal/Serialization/Address.js b/src/Internal/Serialization/Address.js index b9f664e970..7764c11603 100644 --- a/src/Internal/Serialization/Address.js +++ b/src/Internal/Serialization/Address.js @@ -31,121 +31,140 @@ const callNetworkId = callMethodParameterless("network_id"); const callPaymentCred = callMethodParameterless("payment_cred"); const callStakeCred = callMethodParameterless("stake_cred"); -exports.withStakeCredential = cbObj => stakeCred => { - return stakeCred.kind() == lib.StakeCredKind.Key - ? cbObj.onKeyHash(stakeCred.to_keyhash()) - : cbObj.onScriptHash(stakeCred.to_scripthash()); -}; +export function withStakeCredential(cbObj) { + return stakeCred => { + return stakeCred.kind() == lib.StakeCredKind.Key + ? cbObj.onKeyHash(stakeCred.to_keyhash()) + : cbObj.onScriptHash(stakeCred.to_scripthash()); + }; +} -exports.keyHashCredential = lib.StakeCredential.from_keyhash; -exports.scriptHashCredential = lib.StakeCredential.from_scripthash; +export var keyHashCredential = lib.StakeCredential.from_keyhash; +export var scriptHashCredential = lib.StakeCredential.from_scripthash; +export {callToBytes as addressBytes}; +export {callToBytes as byronAddressBytes}; +export {callToBytes as stakeCredentialToBytes}; +export {callToBech32 as addressBech32}; -exports.addressBytes = callToBytes; -exports.byronAddressBytes = callToBytes; -exports.stakeCredentialToBytes = callToBytes; +export function _addressNetworkId(toAdt) { + return addr => { + return toAdt(callNetworkId(addr)); + }; +} -exports.addressBech32 = callToBech32; -exports._addressNetworkId = toAdt => addr => { - return toAdt(callNetworkId(addr)); -}; -exports._byronAddressNetworkId = toAdt => addr => { - return toAdt(callNetworkId(addr)); -}; +export function _byronAddressNetworkId(toAdt) { + return addr => { + return toAdt(callNetworkId(addr)); + }; +} -exports._addressFromBytes = callClassStaticMaybe("Address", "from_bytes"); -exports._stakeCredentialFromBytes = callClassStaticMaybe( +export var _addressFromBytes = callClassStaticMaybe("Address", "from_bytes"); + +export var _stakeCredentialFromBytes = callClassStaticMaybe( "StakeCredential", "from_bytes" ); -exports._byronAddressFromBytes = callClassStaticMaybe( + +export var _byronAddressFromBytes = callClassStaticMaybe( "ByronAddress", "from_bytes" ); -exports._addressFromBech32 = callClassStaticMaybe("Address", "from_bech32"); +export var _addressFromBech32 = callClassStaticMaybe("Address", "from_bech32"); -exports._byronAddressFromBase58 = callClassStaticMaybe( +export var _byronAddressFromBase58 = callClassStaticMaybe( "ByronAddress", "from_base58" ); -exports._baseAddressFromAddress = callClassStaticMaybe( +export var _baseAddressFromAddress = callClassStaticMaybe( "BaseAddress", "from_address" ); -exports._byronAddressFromAddress = callClassStaticMaybe( + +export var _byronAddressFromAddress = callClassStaticMaybe( "ByronAddress", "from_address" ); -exports._enterpriseAddressFromAddress = callClassStaticMaybe( + +export var _enterpriseAddressFromAddress = callClassStaticMaybe( "EnterpriseAddress", "from_address" ); -exports._pointerAddressFromAddress = callClassStaticMaybe( + +export var _pointerAddressFromAddress = callClassStaticMaybe( "PointerAddress", "from_address" ); -exports._rewardAddressFromAddress = callClassStaticMaybe( + +export var _rewardAddressFromAddress = callClassStaticMaybe( "RewardAddress", "from_address" ); -exports.baseAddressToAddress = callToAddress; -exports.byronAddressToAddress = callToAddress; -exports.enterpriseAddressToAddress = callToAddress; -exports.pointerAddressToAddress = callToAddress; -exports.rewardAddressToAddress = callToAddress; - -exports.baseAddressPaymentCred = callPaymentCred; -exports.rewardAddressPaymentCred = callPaymentCred; -exports.enterpriseAddressPaymentCred = callPaymentCred; -exports.pointerAddressPaymentCred = callPaymentCred; - -exports.baseAddressDelegationCred = callStakeCred; - -exports.byronAddressAttributes = callMethodParameterless("attributes"); -exports.byronAddressIsValid = lib.ByronAddress.is_valid; -exports.byronAddressToBase58 = callMethodParameterless("to_base58"); -exports.byronProtocolMagic = callMethodParameterless("byron_protocol_magic"); - -exports.icarusFromKey = bip32pubkey => byronProtocolMagic => { - return lib.ByronAddress.icarus_from_key(bip32pubkey, byronProtocolMagic); -}; +export {callToAddress as baseAddressToAddress}; +export {callToAddress as byronAddressToAddress}; +export {callToAddress as enterpriseAddressToAddress}; +export {callToAddress as pointerAddressToAddress}; +export {callToAddress as rewardAddressToAddress}; +export {callPaymentCred as baseAddressPaymentCred}; +export {callPaymentCred as rewardAddressPaymentCred}; +export {callPaymentCred as enterpriseAddressPaymentCred}; +export {callPaymentCred as pointerAddressPaymentCred}; +export {callStakeCred as baseAddressDelegationCred}; +export var byronAddressAttributes = callMethodParameterless("attributes"); +export var byronAddressIsValid = lib.ByronAddress.is_valid; +export var byronAddressToBase58 = callMethodParameterless("to_base58"); +export var byronProtocolMagic = callMethodParameterless("byron_protocol_magic"); + +export function icarusFromKey(bip32pubkey) { + return byronProtocolMagic => { + return lib.ByronAddress.icarus_from_key(bip32pubkey, byronProtocolMagic); + }; +} -exports.pointerAddressStakePointer = pa => { +export function pointerAddressStakePointer(pa) { const pointerForeign = pa.stake_pointer(); return { slot: pointerForeign.slot_bignum(), txIx: pointerForeign.tx_index_bignum(), certIx: pointerForeign.cert_index_bignum(), }; -}; +} -exports._enterpriseAddress = netIdToInt => inpRec => { - return lib.EnterpriseAddress.new( - netIdToInt(inpRec.network), - inpRec.paymentCred - ); -}; +export function _enterpriseAddress(netIdToInt) { + return inpRec => { + return lib.EnterpriseAddress.new( + netIdToInt(inpRec.network), + inpRec.paymentCred + ); + }; +} -exports._rewardAddress = netIdToInt => inpRec => { - return lib.RewardAddress.new(netIdToInt(inpRec.network), inpRec.paymentCred); -}; +export function _rewardAddress(netIdToInt) { + return inpRec => { + return lib.RewardAddress.new(netIdToInt(inpRec.network), inpRec.paymentCred); + }; +} -exports._baseAddress = netIdToInt => inpRec => { - return lib.BaseAddress.new( - netIdToInt(inpRec.network), - inpRec.paymentCred, - inpRec.delegationCred - ); -}; +export function _baseAddress(netIdToInt) { + return inpRec => { + return lib.BaseAddress.new( + netIdToInt(inpRec.network), + inpRec.paymentCred, + inpRec.delegationCred + ); + }; +} -exports._pointerAddress = netIdToInt => inpRec => { - const p = inpRec.stakePointer; - const pointerForeign = lib.Pointer.new_pointer(p.slot, p.txIx, p.certIx); - return lib.PointerAddress.new( - netIdToInt(inpRec.network), - inpRec.paymentCred, - pointerForeign - ); -}; +export function _pointerAddress(netIdToInt) { + return inpRec => { + const p = inpRec.stakePointer; + const pointerForeign = lib.Pointer.new_pointer(p.slot, p.txIx, p.certIx); + return lib.PointerAddress.new( + netIdToInt(inpRec.network), + inpRec.paymentCred, + pointerForeign + ); + }; +} diff --git a/src/Internal/Serialization/AuxiliaryData.js b/src/Internal/Serialization/AuxiliaryData.js index 130262830e..0d58cce2f6 100644 --- a/src/Internal/Serialization/AuxiliaryData.js +++ b/src/Internal/Serialization/AuxiliaryData.js @@ -10,33 +10,46 @@ lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); const setter = prop => obj => value => () => obj["set_" + prop](value); -exports.newAuxiliaryData = () => lib.AuxiliaryData.new(); - -exports._hashAuxiliaryData = auxiliaryData => - lib.hash_auxiliary_data(auxiliaryData); - -exports.setAuxiliaryDataNativeScripts = setter("native_scripts"); +export function newAuxiliaryData() { + return lib.AuxiliaryData.new(); +} -exports.setAuxiliaryDataPlutusScripts = setter("plutus_scripts"); +export function _hashAuxiliaryData(auxiliaryData) { + return lib.hash_auxiliary_data(auxiliaryData); +} -exports.setAuxiliaryDataGeneralTransactionMetadata = setter("metadata"); +export var setAuxiliaryDataNativeScripts = setter("native_scripts"); +export var setAuxiliaryDataPlutusScripts = setter("plutus_scripts"); +export var setAuxiliaryDataGeneralTransactionMetadata = setter("metadata"); -exports.newGeneralTransactionMetadata = containerHelper => entries => () => - containerHelper.packMap(lib.GeneralTransactionMetadata, entries); +export function newGeneralTransactionMetadata(containerHelper) { + return entries => () => + containerHelper.packMap(lib.GeneralTransactionMetadata, entries); +} -exports.newMetadataMap = containerHelper => entries => () => - lib.TransactionMetadatum.new_map( - containerHelper.packMap(lib.MetadataMap, entries) - ); +export function newMetadataMap(containerHelper) { + return entries => () => + lib.TransactionMetadatum.new_map( + containerHelper.packMap(lib.MetadataMap, entries) + ); +} -exports.newMetadataList = containerHelper => entries => () => - lib.TransactionMetadatum.new_list( - containerHelper.pack(lib.MetadataList, entries) - ); +export function newMetadataList(containerHelper) { + return entries => () => + lib.TransactionMetadatum.new_list( + containerHelper.pack(lib.MetadataList, entries) + ); +} -exports.newMetadataInt = int => () => lib.TransactionMetadatum.new_int(int); +export function newMetadataInt(int) { + return () => lib.TransactionMetadatum.new_int(int); +} -exports.newMetadataBytes = bytes => () => - lib.TransactionMetadatum.new_bytes(bytes); +export function newMetadataBytes(bytes) { + return () => + lib.TransactionMetadatum.new_bytes(bytes); +} -exports.newMetadataText = text => () => lib.TransactionMetadatum.new_text(text); +export function newMetadataText(text) { + return () => lib.TransactionMetadatum.new_text(text); +} diff --git a/src/Internal/Serialization/BigInt.js b/src/Internal/Serialization/BigInt.js index 6997bf4af6..79f0d2bc8d 100644 --- a/src/Internal/Serialization/BigInt.js +++ b/src/Internal/Serialization/BigInt.js @@ -8,10 +8,12 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { } lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); -exports._BigInt_from_str = helper => str => { - try { - return helper.just(lib.BigInt.from_str(str)); - } catch (_) { - return helper.nothing; - } -}; +export function _BigInt_from_str(helper) { + return str => { + try { + return helper.just(lib.BigInt.from_str(str)); + } catch (_) { + return helper.nothing; + } + }; +} diff --git a/src/Internal/Serialization/Hash.js b/src/Internal/Serialization/Hash.js index 88a7af703b..861e937d63 100644 --- a/src/Internal/Serialization/Hash.js +++ b/src/Internal/Serialization/Hash.js @@ -8,17 +8,21 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { } lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); -exports.hashToBytes = hash => { +export function hashToBytes(hash) { return hash.to_bytes(); -}; +} -exports.hashFromBytes = name => maybe => bytes => { - return hashFromImpl(lib[name].from_bytes)(maybe)(bytes); -}; +export function hashFromBytes(name) { + return maybe => bytes => { + return hashFromImpl(lib[name].from_bytes)(maybe)(bytes); + }; +} -exports.hashToBech32Unsafe = prefix => hash => { - return hash.to_bech32(prefix); -}; +export function hashToBech32Unsafe(prefix) { + return hash => { + return hash.to_bech32(prefix); + }; +} const hashFromImpl = hashClassFrom => maybe => input => { let ret = null; @@ -33,25 +37,33 @@ const hashFromImpl = hashClassFrom => maybe => input => { return maybe.just(ret); }; -exports.hashToBech32Impl = maybe => prefix => hash => { - let ret = null; - try { - ret = hash.to_bech32(prefix); - } catch (e) { - // Do nothing - } - if (ret == null) { - return maybe.nothing; - } - return maybe.just(ret); -}; +export function hashToBech32Impl(maybe) { + return prefix => hash => { + let ret = null; + try { + ret = hash.to_bech32(prefix); + } catch (e) { + // Do nothing + } + if (ret == null) { + return maybe.nothing; + } + return maybe.just(ret); + }; +} -exports._ed25519KeyHashFromBech32Impl = maybe => bech32str => { - return hashFromImpl(lib.Ed25519KeyHash.from_bech32)(maybe)(bech32str); -}; +export function _ed25519KeyHashFromBech32Impl(maybe) { + return bech32str => { + return hashFromImpl(lib.Ed25519KeyHash.from_bech32)(maybe)(bech32str); + }; +} -exports._scriptHashFromBech32Impl = maybe => bech32str => { - return hashFromImpl(lib.ScriptHash.from_bech32)(maybe)(bech32str); -}; +export function _scriptHashFromBech32Impl(maybe) { + return bech32str => { + return hashFromImpl(lib.ScriptHash.from_bech32)(maybe)(bech32str); + }; +} -exports.nativeScriptHash = script => script.hash(); +export function nativeScriptHash(script) { + return script.hash(); +} diff --git a/src/Internal/Serialization/Keys.js b/src/Internal/Serialization/Keys.js index f15d7dedfe..36f6b4a079 100644 --- a/src/Internal/Serialization/Keys.js +++ b/src/Internal/Serialization/Keys.js @@ -2,13 +2,15 @@ const bytesFromKey = key => key.as_bytes(); -exports.bytesFromPublicKey = bytesFromKey; -exports.bytesFromPrivateKey = bytesFromKey; +export {bytesFromKey as bytesFromPublicKey}; +export {bytesFromKey as bytesFromPrivateKey}; -exports.publicKeyFromPrivateKey = private_key => private_key.to_public(); +export function publicKeyFromPrivateKey(private_key) { + return private_key.to_public(); +} const bech32FromX = key => key.to_bech32(); -exports.bech32FromPublicKey = bech32FromX; -exports.bech32FromPrivateKey = bech32FromX; -exports.bech32FromEd25519Signature = bech32FromX; +export {bech32FromX as bech32FromPublicKey}; +export {bech32FromX as bech32FromPrivateKey}; +export {bech32FromX as bech32FromEd25519Signature}; diff --git a/src/Internal/Serialization/MinFee.js b/src/Internal/Serialization/MinFee.js index c24676a3a7..9733f55ab0 100644 --- a/src/Internal/Serialization/MinFee.js +++ b/src/Internal/Serialization/MinFee.js @@ -8,14 +8,18 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { } lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); -exports._minFee = maybe => tx => txFeeFixed => txFeePerByte => { - try { - const linearFee = lib.LinearFee.new(txFeePerByte, txFeeFixed); - return maybe.just(lib.min_fee(tx, linearFee)); - } catch (_) { - return maybe.nothing; - } -}; +export function _minFee(maybe) { + return tx => txFeeFixed => txFeePerByte => { + try { + const linearFee = lib.LinearFee.new(txFeePerByte, txFeeFixed); + return maybe.just(lib.min_fee(tx, linearFee)); + } catch (_) { + return maybe.nothing; + } + }; +} -exports._minScriptFee = exUnitPrices => tx => - lib.min_script_fee(tx, exUnitPrices); +export function _minScriptFee(exUnitPrices) { + return tx => + lib.min_script_fee(tx, exUnitPrices); +} diff --git a/src/Internal/Serialization/NativeScript.js b/src/Internal/Serialization/NativeScript.js index ea4f798a5d..f4fa1fb425 100644 --- a/src/Internal/Serialization/NativeScript.js +++ b/src/Internal/Serialization/NativeScript.js @@ -10,17 +10,38 @@ lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); const mkScript = prop => arg => lib.NativeScript[prop](arg); -exports.mkScriptPubkey = keyHash => lib.ScriptPubkey.new(keyHash); -exports.nativeScript_new_script_pubkey = mkScript("new_script_pubkey"); -exports.nativeScript_new_script_all = mkScript("new_script_all"); -exports.nativeScript_new_script_any = mkScript("new_script_any"); -exports.nativeScript_new_script_n_of_k = mkScript("new_script_n_of_k"); -exports.nativeScript_new_timelock_start = mkScript("new_timelock_start"); -exports.nativeScript_new_timelock_expiry = mkScript("new_timelock_expiry"); -exports._packNativeScripts = helper => nss => - helper.pack(lib.NativeScripts, nss); -exports.mkScriptAll = nss => lib.ScriptAll.new(nss); -exports.mkScriptAny = nss => lib.ScriptAny.new(nss); -exports.mkScriptNOfK = n => nss => lib.ScriptNOfK.new(n, nss); -exports.mkTimelockExpiry = n => lib.TimelockExpiry.new_timelockexpiry(n); -exports.mkTimelockStart = n => lib.TimelockStart.new_timelockstart(n); +export function mkScriptPubkey(keyHash) { + return lib.ScriptPubkey.new(keyHash); +} + +export var nativeScript_new_script_pubkey = mkScript("new_script_pubkey"); +export var nativeScript_new_script_all = mkScript("new_script_all"); +export var nativeScript_new_script_any = mkScript("new_script_any"); +export var nativeScript_new_script_n_of_k = mkScript("new_script_n_of_k"); +export var nativeScript_new_timelock_start = mkScript("new_timelock_start"); +export var nativeScript_new_timelock_expiry = mkScript("new_timelock_expiry"); + +export function _packNativeScripts(helper) { + return nss => + helper.pack(lib.NativeScripts, nss); +} + +export function mkScriptAll(nss) { + return lib.ScriptAll.new(nss); +} + +export function mkScriptAny(nss) { + return lib.ScriptAny.new(nss); +} + +export function mkScriptNOfK(n) { + return nss => lib.ScriptNOfK.new(n, nss); +} + +export function mkTimelockExpiry(n) { + return lib.TimelockExpiry.new_timelockexpiry(n); +} + +export function mkTimelockStart(n) { + return lib.TimelockStart.new_timelockstart(n); +} diff --git a/src/Internal/Serialization/PlutusData.js b/src/Internal/Serialization/PlutusData.js index 580cdcfddc..abe7cc7934 100644 --- a/src/Internal/Serialization/PlutusData.js +++ b/src/Internal/Serialization/PlutusData.js @@ -8,29 +8,51 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { } lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); -exports._mkPlutusData_bytes = bytes => lib.PlutusData.new_bytes(bytes); -exports._mkPlutusData_list = list => lib.PlutusData.new_list(list); -exports._mkPlutusData_map = list => lib.PlutusData.new_map(list); -exports._mkPlutusData_integer = int => lib.PlutusData.new_integer(int); -exports._mkPlutusData_constr = constr => - lib.PlutusData.new_constr_plutus_data(constr); - -exports._packPlutusList = containerHelper => elems => - containerHelper.pack(lib.PlutusList, elems); -exports._mkConstrPlutusData = n => list => lib.ConstrPlutusData.new(n, list); - -exports._bigIntFromString = maybe => str => { - try { - return maybe.just(lib.BigInt.from_str(str)); - } catch (_) { - return maybe.nothing; - } -}; - -exports._packMap = first => second => kvs => { - const res = lib.PlutusMap.new(); - for (let kv of kvs) { - res.insert(first(kv), second(kv)); - } - return res; -}; +export function _mkPlutusData_bytes(bytes) { + return lib.PlutusData.new_bytes(bytes); +} + +export function _mkPlutusData_list(list) { + return lib.PlutusData.new_list(list); +} + +export function _mkPlutusData_map(list) { + return lib.PlutusData.new_map(list); +} + +export function _mkPlutusData_integer(int) { + return lib.PlutusData.new_integer(int); +} + +export function _mkPlutusData_constr(constr) { + return lib.PlutusData.new_constr_plutus_data(constr); +} + +export function _packPlutusList(containerHelper) { + return elems => + containerHelper.pack(lib.PlutusList, elems); +} + +export function _mkConstrPlutusData(n) { + return list => lib.ConstrPlutusData.new(n, list); +} + +export function _bigIntFromString(maybe) { + return str => { + try { + return maybe.just(lib.BigInt.from_str(str)); + } catch (_) { + return maybe.nothing; + } + }; +} + +export function _packMap(first) { + return second => kvs => { + const res = lib.PlutusMap.new(); + for (let kv of kvs) { + res.insert(first(kv), second(kv)); + } + return res; + }; +} diff --git a/src/Internal/Serialization/PlutusScript.js b/src/Internal/Serialization/PlutusScript.js index af3c7ec8ca..607f6575e7 100644 --- a/src/Internal/Serialization/PlutusScript.js +++ b/src/Internal/Serialization/PlutusScript.js @@ -8,8 +8,14 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { } lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); -exports.newPlutusV1Script = bytes => lib.PlutusScript.new(bytes); +export function newPlutusV1Script(bytes) { + return lib.PlutusScript.new(bytes); +} -exports.newPlutusV2Script = bytes => lib.PlutusScript.new_v2(bytes); +export function newPlutusV2Script(bytes) { + return lib.PlutusScript.new_v2(bytes); +} -exports.plutusScriptBytes = script => script.bytes(); +export function plutusScriptBytes(script) { + return script.bytes(); +} diff --git a/src/Internal/Serialization/ToBytes.js b/src/Internal/Serialization/ToBytes.js index 6107d0d2ad..7ec989fcad 100644 --- a/src/Internal/Serialization/ToBytes.js +++ b/src/Internal/Serialization/ToBytes.js @@ -1 +1,3 @@ -exports._toBytes = sth => sth.to_bytes(); +export function _toBytes(sth) { + return sth.to_bytes(); +} diff --git a/src/Internal/Serialization/WitnessSet.js b/src/Internal/Serialization/WitnessSet.js index 8596ffc6aa..8394a1ad5a 100644 --- a/src/Internal/Serialization/WitnessSet.js +++ b/src/Internal/Serialization/WitnessSet.js @@ -8,55 +8,94 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { } lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); -exports.newTransactionWitnessSet = () => lib.TransactionWitnessSet.new(); +export function newTransactionWitnessSet() { + return lib.TransactionWitnessSet.new(); +} -exports.newPublicKey = bech32 => () => lib.PublicKey.from_bech32(bech32); +export function newPublicKey(bech32) { + return () => lib.PublicKey.from_bech32(bech32); +} -exports.newVkeyFromPublicKey = public_key => () => lib.Vkey.new(public_key); +export function newVkeyFromPublicKey(public_key) { + return () => lib.Vkey.new(public_key); +} -exports.newVkeywitnesses = () => lib.Vkeywitnesses.new(); +export function newVkeywitnesses() { + return lib.Vkeywitnesses.new(); +} -exports.newVkeywitness = vkey => signature => () => - lib.Vkeywitness.new(vkey, signature); +export function newVkeywitness(vkey) { + return signature => () => + lib.Vkeywitness.new(vkey, signature); +} -exports.addVkeywitness = witnesses => witness => () => witnesses.add(witness); +export function addVkeywitness(witnesses) { + return witness => () => witnesses.add(witness); +} -exports.newPlutusScripts = () => lib.PlutusScripts.new(); +export function newPlutusScripts() { + return lib.PlutusScripts.new(); +} -exports.addPlutusScript = scripts => script => () => scripts.add(script); +export function addPlutusScript(scripts) { + return script => () => scripts.add(script); +} -exports.transactionWitnessSetSetVkeys = ws => vkeys => () => - ws.set_vkeys(vkeys); +export function transactionWitnessSetSetVkeys(ws) { + return vkeys => () => + ws.set_vkeys(vkeys); +} -exports.txWitnessSetSetPlutusScripts = ws => scripts => () => - ws.set_plutus_scripts(scripts); +export function txWitnessSetSetPlutusScripts(ws) { + return scripts => () => + ws.set_plutus_scripts(scripts); +} -exports.transactionWitnessSetSetNativeScripts = ws => scripts => () => - ws.set_native_scripts(scripts); +export function transactionWitnessSetSetNativeScripts(ws) { + return scripts => () => + ws.set_native_scripts(scripts); +} -exports._wsSetBootstraps = helper => ws => bootstraps => () => - ws.set_bootstraps(helper.pack(lib.BootstrapWitnesses, bootstraps)); +export function _wsSetBootstraps(helper) { + return ws => bootstraps => () => + ws.set_bootstraps(helper.pack(lib.BootstrapWitnesses, bootstraps)); +} -exports.newBootstrapWitness = - vkey => signature => chain_code => attributes => () => { +export function newBootstrapWitness(vkey) { + return signature => chain_code => attributes => () => { lib.BootstrapWitness.new(vkey, signature, chain_code, attributes); }; +} -exports._wsSetPlutusData = helper => ws => plutus_data => () => - ws.set_plutus_data(helper.pack(lib.PlutusList, plutus_data)); +export function _wsSetPlutusData(helper) { + return ws => plutus_data => () => + ws.set_plutus_data(helper.pack(lib.PlutusList, plutus_data)); +} -exports.newRedeemer = tag => index => data => ex_units => () => - lib.Redeemer.new(tag, index, data, ex_units); +export function newRedeemer(tag) { + return index => data => ex_units => () => + lib.Redeemer.new(tag, index, data, ex_units); +} -exports._newRedeemerTag = tag => () => lib.RedeemerTag["new_" + tag](); +export function _newRedeemerTag(tag) { + return () => lib.RedeemerTag["new_" + tag](); +} -exports.newExUnits = mem => steps => lib.ExUnits.new(mem, steps); +export function newExUnits(mem) { + return steps => lib.ExUnits.new(mem, steps); +} -exports._wsSetRedeemers = helper => ws => redeemers => () => - ws.set_redeemers(helper.pack(lib.Redeemers, redeemers)); +export function _wsSetRedeemers(helper) { + return ws => redeemers => () => + ws.set_redeemers(helper.pack(lib.Redeemers, redeemers)); +} -exports._mkRedeemers = helper => redeemers => - helper.pack(lib.Redeemers, redeemers); +export function _mkRedeemers(helper) { + return redeemers => + helper.pack(lib.Redeemers, redeemers); +} -exports._wsSetPlutusScripts = helper => ws => scripts => () => - ws.set_plutus_scripts(helper.pack(lib.PlutusScripts, scripts)); +export function _wsSetPlutusScripts(helper) { + return ws => scripts => () => + ws.set_plutus_scripts(helper.pack(lib.PlutusScripts, scripts)); +} diff --git a/src/Internal/Test/E2E/Feedback.js b/src/Internal/Test/E2E/Feedback.js index a78681ce10..00ce74f53c 100644 --- a/src/Internal/Test/E2E/Feedback.js +++ b/src/Internal/Test/E2E/Feedback.js @@ -1 +1,3 @@ -exports._publishTestFeedback = value => () => (window.ctlTestFeedback = value); +export function _publishTestFeedback(value) { + return () => (window.ctlTestFeedback = value); +} diff --git a/src/Internal/Test/E2E/Feedback/Browser.js b/src/Internal/Test/E2E/Feedback/Browser.js index 6137ec57af..6968cee199 100644 --- a/src/Internal/Test/E2E/Feedback/Browser.js +++ b/src/Internal/Test/E2E/Feedback/Browser.js @@ -1,11 +1,15 @@ -exports._pushBrowserEvent = message => () => { - if (typeof window.ctlE2ECommunications != "object") { - window.ctlE2ECommunications = []; - } - window.ctlE2ECommunications.push(message); -}; +export function _pushBrowserEvent(message) { + return () => { + if (typeof window.ctlE2ECommunications != "object") { + window.ctlE2ECommunications = []; + } + window.ctlE2ECommunications.push(message); + }; +} -exports._getClusterSetup = maybe => () => - window.ctlE2EClusterSetup - ? maybe.just(window.ctlE2EClusterSetup) - : maybe.nothing; +export function _getClusterSetup(maybe) { + return () => + window.ctlE2EClusterSetup + ? maybe.just(window.ctlE2EClusterSetup) + : maybe.nothing; +} diff --git a/src/Internal/Test/E2E/Route.js b/src/Internal/Test/E2E/Route.js index 7d827c8ded..cf7c28ae29 100644 --- a/src/Internal/Test/E2E/Route.js +++ b/src/Internal/Test/E2E/Route.js @@ -1,69 +1,75 @@ -exports._queryString = () => window.location.search; +export function _queryString() { + return window.location.search; +} const createLink = (example, wallet) => '' + wallet + ""; -exports._writeExampleHTML = example => wallets => () => { - const ul = document.getElementById("examples"); - const li = document.createElement("li"); - li.innerHTML = `${example}: ${wallets - .map(w => createLink(example, w)) - .join(" ")}`; - ul.appendChild(li); -}; +export function _writeExampleHTML(example) { + return wallets => () => { + const ul = document.getElementById("examples"); + const li = document.createElement("li"); + li.innerHTML = `${example}: ${wallets + .map(w => createLink(example, w)) + .join(" ")}`; + ul.appendChild(li); + }; +} -exports._addLinks = configs => tests => () => { - const configSelectEl = document.createElement("select"); - const testNameSelectEl = document.createElement("select"); - const linkEl = document.createElement("a"); - linkEl.textContent = "➡ RUN EXAMPLE"; +export function _addLinks(configs) { + return tests => () => { + const configSelectEl = document.createElement("select"); + const testNameSelectEl = document.createElement("select"); + const linkEl = document.createElement("a"); + linkEl.textContent = "➡ RUN EXAMPLE"; - const h1El = document.createElement("h3"); - h1El.textContent = "Example runner"; + const h1El = document.createElement("h3"); + h1El.textContent = "Example runner"; - const selectEnvironmentEl = document.createElement("span"); - selectEnvironmentEl.textContent = "Environment: "; + const selectEnvironmentEl = document.createElement("span"); + selectEnvironmentEl.textContent = "Environment: "; - const selectExampleEl = document.createElement("span"); - selectExampleEl.textContent = "Example: "; + const selectExampleEl = document.createElement("span"); + selectExampleEl.textContent = "Example: "; - document.body.appendChild(h1El); - document.body.appendChild(selectEnvironmentEl); + document.body.appendChild(h1El); + document.body.appendChild(selectEnvironmentEl); - const updateUrl = () => { - linkEl.href = "?" + configSelectEl.value + ":" + testNameSelectEl.value; - }; + const updateUrl = () => { + linkEl.href = "?" + configSelectEl.value + ":" + testNameSelectEl.value; + }; - configs.forEach((config, ix) => { - const optionEl = document.createElement("option"); - optionEl.textContent = config; - optionEl.value = config; - configSelectEl.appendChild(optionEl); - if (document.location.search.startsWith("?" + config + ":")) { - configSelectEl.selectedIndex = ix; - } - }); - document.body.appendChild(configSelectEl); - document.body.appendChild(document.createElement("br")); + configs.forEach((config, ix) => { + const optionEl = document.createElement("option"); + optionEl.textContent = config; + optionEl.value = config; + configSelectEl.appendChild(optionEl); + if (document.location.search.startsWith("?" + config + ":")) { + configSelectEl.selectedIndex = ix; + } + }); + document.body.appendChild(configSelectEl); + document.body.appendChild(document.createElement("br")); - document.body.appendChild(selectExampleEl); + document.body.appendChild(selectExampleEl); - tests.forEach((test, ix) => { - const optionEl = document.createElement("option"); - optionEl.textContent = test; - optionEl.value = test; - testNameSelectEl.appendChild(optionEl); - if (document.location.search.endsWith(":" + test)) { - testNameSelectEl.selectedIndex = ix; - } - }); - document.body.appendChild(testNameSelectEl); + tests.forEach((test, ix) => { + const optionEl = document.createElement("option"); + optionEl.textContent = test; + optionEl.value = test; + testNameSelectEl.appendChild(optionEl); + if (document.location.search.endsWith(":" + test)) { + testNameSelectEl.selectedIndex = ix; + } + }); + document.body.appendChild(testNameSelectEl); - updateUrl(); - document.body.appendChild(document.createElement("br")); + updateUrl(); + document.body.appendChild(document.createElement("br")); - document.body.appendChild(linkEl); + document.body.appendChild(linkEl); - configSelectEl.onchange = updateUrl; - testNameSelectEl.onchange = updateUrl; -}; + configSelectEl.onchange = updateUrl; + testNameSelectEl.onchange = updateUrl; + }; +} diff --git a/src/Internal/Test/E2E/Runner.js b/src/Internal/Test/E2E/Runner.js index 58ca7ffd57..0e57d9e2dd 100644 --- a/src/Internal/Test/E2E/Runner.js +++ b/src/Internal/Test/E2E/Runner.js @@ -1,9 +1,11 @@ -exports._retrieveJQuery = page => () => - page.evaluate(() => - window - .fetch( - "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js" - ) - .then(res => res.text()) - .catch(_ => "") - ); +export function _retrieveJQuery(page) { + return () => + page.evaluate(() => + window + .fetch( + "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js" + ) + .then(res => res.text()) + .catch(_ => "") + ); +} diff --git a/src/Internal/Test/E2E/Wallets.js b/src/Internal/Test/E2E/Wallets.js index db78ffc21e..a01ba8313f 100644 --- a/src/Internal/Test/E2E/Wallets.js +++ b/src/Internal/Test/E2E/Wallets.js @@ -1,4 +1,8 @@ -exports._typeInto = selector => text => page => () => - page.focus(selector).then(() => page.keyboard.type(text)); +export function _typeInto(selector) { + return text => page => () => + page.focus(selector).then(() => page.keyboard.type(text)); +} -exports.pageUrl = page => () => page.url(); +export function pageUrl(page) { + return () => page.url(); +} diff --git a/src/Internal/Types/BigNum.js b/src/Internal/Types/BigNum.js index 70ba1439ba..da69caf7f0 100644 --- a/src/Internal/Types/BigNum.js +++ b/src/Internal/Types/BigNum.js @@ -8,34 +8,43 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { } lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); -exports.bnCompare = lhs => rhs => lhs.compare(rhs); - -exports.zero = lib.BigNum.zero(); - -exports.one = lib.BigNum.one(); +export function bnCompare(lhs) { + return rhs => lhs.compare(rhs); +} -exports.bnAdd = maybe => lhs => rhs => { - try { - return maybe.just(lhs.checked_add(rhs)); - } catch (_) { - return maybe.nothing; - } -}; +export var zero = lib.BigNum.zero(); +export var one = lib.BigNum.one(); + +export function bnAdd(maybe) { + return lhs => rhs => { + try { + return maybe.just(lhs.checked_add(rhs)); + } catch (_) { + return maybe.nothing; + } + }; +} -exports.bnMul = maybe => lhs => rhs => { - try { - return maybe.just(lhs.checked_mul(rhs)); - } catch (_) { - return maybe.nothing; - } -}; +export function bnMul(maybe) { + return lhs => rhs => { + try { + return maybe.just(lhs.checked_mul(rhs)); + } catch (_) { + return maybe.nothing; + } + }; +} -exports._fromString = maybe => str => { - try { - return maybe.just(lib.BigNum.from_str(str)); - } catch (_) { - return maybe.nothing; - } -}; +export function _fromString(maybe) { + return str => { + try { + return maybe.just(lib.BigNum.from_str(str)); + } catch (_) { + return maybe.nothing; + } + }; +} -exports.toString = bn => bn.to_str(); +export function toString(bn) { + return bn.to_str(); +} diff --git a/src/Internal/Types/ByteArray.js b/src/Internal/Types/ByteArray.js index 8f204f55ae..09bf1f2b12 100644 --- a/src/Internal/Types/ByteArray.js +++ b/src/Internal/Types/ByteArray.js @@ -1,36 +1,42 @@ // From instance for Array in prelude -exports.ord_ = f => xs => ys => { - let i = 0; - const xlen = xs.length; - const ylen = ys.length; - while (i < xlen && i < ylen) { - let o = f(xs[i])(ys[i]); - if (o !== 0) { - return o; +export function ord_(f) { + return xs => ys => { + let i = 0; + const xlen = xs.length; + const ylen = ys.length; + while (i < xlen && i < ylen) { + let o = f(xs[i])(ys[i]); + if (o !== 0) { + return o; + } + i++; } - i++; - } - if (xlen === ylen) { - return 0; - } else if (xlen > ylen) { - return -1; - } else { - return 1; - } -}; + if (xlen === ylen) { + return 0; + } else if (xlen > ylen) { + return -1; + } else { + return 1; + } + }; +} -exports.concat_ = xs => ys => { - const res = new Uint8Array(xs.length + ys.length); - for (let i = 0; i < xs.length; i++) { - res[i] = xs[i]; - } - for (let i = 0; i < ys.length; i++) { - res[i + xs.length] = ys[i]; - } - return res; -}; +export function concat_(xs) { + return ys => { + const res = new Uint8Array(xs.length + ys.length); + for (let i = 0; i < xs.length; i++) { + res[i] = xs[i]; + } + for (let i = 0; i < ys.length; i++) { + res[i + xs.length] = ys[i]; + } + return res; + }; +} -exports.byteArrayToHex = arr => Buffer.from(arr).toString("hex"); +export function byteArrayToHex(arr) { + return Buffer.from(arr).toString("hex"); +} /* adapted from https://github.com/WebReflection/uint8-to-utf16/blob/master/esm/index.js * (someone who knows javascript should like import that or something) @@ -38,7 +44,7 @@ exports.byteArrayToHex = arr => Buffer.from(arr).toString("hex"); const { ceil } = Math; const { fromCharCode } = String; -exports.byteArrayToUTF16le = uint8array => { +export function byteArrayToUTF16le(uint8array) { let extra = 0; const output = []; const { length } = uint8array; @@ -51,44 +57,57 @@ exports.byteArrayToUTF16le = uint8array => { ); output.push(fromCharCode(extra)); return output.join(""); -}; +} -exports.hexToByteArray_ = nothing => just => hex => { - let bytes = []; - for (let c = 0; c < hex.length; c += 2) { - const chunk = hex.substr(c, 2); - if (/[0-9a-f]{2}/i.test(chunk)) { - bytes.push(parseInt(chunk, 16)); - } else { - return nothing; +export function hexToByteArray_(nothing) { + return just => hex => { + let bytes = []; + for (let c = 0; c < hex.length; c += 2) { + const chunk = hex.substr(c, 2); + if (/[0-9a-f]{2}/i.test(chunk)) { + bytes.push(parseInt(chunk, 16)); + } else { + return nothing; + } } - } - return just(new Uint8Array(bytes)); -}; + return just(new Uint8Array(bytes)); + }; +} -exports.hexToByteArrayUnsafe = hex => { +export function hexToByteArrayUnsafe(hex) { let bytes = []; for (let c = 0; c < hex.length; c += 2) { bytes.push(parseInt(hex.substr(c, 2), 16)); } return new Uint8Array(bytes); -}; +} -exports.byteArrayFromIntArrayUnsafe = ints => new Uint8Array(ints); +export function byteArrayFromIntArrayUnsafe(ints) { + return new Uint8Array(ints); +} -exports.byteArrayFromInt16ArrayUnsafe = ints => - new Uint8Array(ints.buffer, ints.byteOffset, ints.byteLength); +export function byteArrayFromInt16ArrayUnsafe(ints) { + return new Uint8Array(ints.buffer, ints.byteOffset, ints.byteLength); +} -exports.byteArrayFromIntArray_ = nothing => just => ints => { - if (ints.every(i => i < 256 && i >= 0)) { - return just(new Uint8Array(ints)); - } else { - return nothing; - } -}; +export function byteArrayFromIntArray_(nothing) { + return just => ints => { + if (ints.every(i => i < 256 && i >= 0)) { + return just(new Uint8Array(ints)); + } else { + return nothing; + } + }; +} -exports.byteArrayToIntArray = bytes => Array.from(bytes); +export function byteArrayToIntArray(bytes) { + return Array.from(bytes); +} -exports.byteLength = bytes => bytes.byteLength; +export function byteLength(bytes) { + return bytes.byteLength; +} -exports.subarray = start => end => bytes => bytes.subarray(start, end); +export function subarray(start) { + return end => bytes => bytes.subarray(start, end); +} diff --git a/src/Internal/Types/Int.js b/src/Internal/Types/Int.js index 301a3d7724..fe21eb664b 100644 --- a/src/Internal/Types/Int.js +++ b/src/Internal/Types/Int.js @@ -8,6 +8,9 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { } lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); -exports.newPositive = lib.Int.new; -exports.newNegative = lib.Int.new_negative; -exports._intToStr = n => n.to_str(); +export var newPositive = lib.Int.new; +export var newNegative = lib.Int.new_negative; + +export function _intToStr(n) { + return n.to_str(); +} diff --git a/src/Internal/Types/TokenName.js b/src/Internal/Types/TokenName.js index 24e44f82c2..8f1b9c785b 100644 --- a/src/Internal/Types/TokenName.js +++ b/src/Internal/Types/TokenName.js @@ -8,16 +8,18 @@ if (typeof BROWSER_RUNTIME == "undefined" || !BROWSER_RUNTIME) { OurTextDecoder = TextDecoder; } -exports._decodeUtf8 = buffer => left => right => { - let decoder = new OurTextDecoder("utf-8", { fatal: true }); // Without fatal=true it never fails +export function _decodeUtf8(buffer) { + return left => right => { + let decoder = new OurTextDecoder("utf-8", { fatal: true }); // Without fatal=true it never fails - try { - return right(decoder.decode(buffer)); - } catch (err) { - return left(err.toString()); - } -}; + try { + return right(decoder.decode(buffer)); + } catch (err) { + return left(err.toString()); + } + }; +} // FIXME: https://github.com/Plutonomicon/cardano-transaction-lib/issues/548 const call = property => object => object[property](); -exports.assetNameName = call("name"); +export var assetNameName = call("name"); diff --git a/src/Internal/Wallet.js b/src/Internal/Wallet.js index 851fceb142..ea7d712c48 100644 --- a/src/Internal/Wallet.js +++ b/src/Internal/Wallet.js @@ -40,7 +40,7 @@ const enableWallet = wallet => () => { } }; -exports._enableWallet = enableWallet; +export {enableWallet as _enableWallet}; const isWalletAvailable = walletName => () => { checkNotNode(); @@ -51,36 +51,44 @@ const isWalletAvailable = walletName => () => { ); }; -exports._isWalletAvailable = isWalletAvailable; +export {isWalletAvailable as _isWalletAvailable}; -exports._isEnabled = walletName => () => { - if (isWalletAvailable(walletName)()) { - return window.cardano[walletName].isEnabled(); - } else { - throw new Error("Wallet `" + walletName + "` is not available"); - } -}; +export function _isEnabled(walletName) { + return () => { + if (isWalletAvailable(walletName)()) { + return window.cardano[walletName].isEnabled(); + } else { + throw new Error("Wallet `" + walletName + "` is not available"); + } + }; +} -exports._apiVersion = walletName => () => { - if (isWalletAvailable(walletName)()) { - return window.cardano[walletName].apiVersion; - } else { - throw new Error("Wallet `" + walletName + "` is not available"); - } -}; +export function _apiVersion(walletName) { + return () => { + if (isWalletAvailable(walletName)()) { + return window.cardano[walletName].apiVersion; + } else { + throw new Error("Wallet `" + walletName + "` is not available"); + } + }; +} -exports._name = walletName => () => { - if (isWalletAvailable(walletName)()) { - return window.cardano[walletName].name; - } else { - throw new Error("Wallet `" + walletName + "` is not available"); - } -}; +export function _name(walletName) { + return () => { + if (isWalletAvailable(walletName)()) { + return window.cardano[walletName].name; + } else { + throw new Error("Wallet `" + walletName + "` is not available"); + } + }; +} -exports._icon = walletName => () => { - if (isWalletAvailable(walletName)()) { - return window.cardano[walletName].icon; - } else { - throw new Error("Wallet `" + walletName + "` is not available"); - } -}; +export function _icon(walletName) { + return () => { + if (isWalletAvailable(walletName)()) { + return window.cardano[walletName].icon; + } else { + throw new Error("Wallet `" + walletName + "` is not available"); + } + }; +} diff --git a/src/Internal/Wallet/Bip32.js b/src/Internal/Wallet/Bip32.js index 3a5cb53871..bdff56d6af 100644 --- a/src/Internal/Wallet/Bip32.js +++ b/src/Internal/Wallet/Bip32.js @@ -7,26 +7,32 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { lib = require("@emurgo/cardano-serialization-lib-nodejs"); } lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); -const bip39 = require("bip39"); +import bip39 from "bip39"; const HARDENED = 0x80000000; -exports._bip32PrivateKeyFromMnemonic = left => right => phrase => { - try { - return right( - lib.Bip32PrivateKey.from_bip39_entropy( - Uint8Array.from( - Buffer.from(bip39.mnemonicToEntropy(phrase.toLowerCase()), "hex") - ), - new Uint8Array() // passphrase (not currently implemented) - ) - ); - } catch (e) { - return left(e.toString()); - } -}; +export function _bip32PrivateKeyFromMnemonic(left) { + return right => phrase => { + try { + return right( + lib.Bip32PrivateKey.from_bip39_entropy( + Uint8Array.from( + Buffer.from(bip39.mnemonicToEntropy(phrase.toLowerCase()), "hex") + ), + new Uint8Array() // passphrase (not currently implemented) + ) + ); + } catch (e) { + return left(e.toString()); + } + }; +} -exports.bip32ToPrivateKey = privateKey => privateKey.to_raw_key(); +export function bip32ToPrivateKey(privateKey) { + return privateKey.to_raw_key(); +} -exports.derivePrivateKey = path => hardened => privateKey => - privateKey.derive(path | (hardened ? HARDENED : 0)); +export function derivePrivateKey(path) { + return hardened => privateKey => + privateKey.derive(path | (hardened ? HARDENED : 0)); +} diff --git a/src/Internal/Wallet/Cip30.js b/src/Internal/Wallet/Cip30.js index 7414ae3070..efd296d2e5 100644 --- a/src/Internal/Wallet/Cip30.js +++ b/src/Internal/Wallet/Cip30.js @@ -1,33 +1,53 @@ /* global BROWSER_RUNTIME */ -exports._getNetworkId = conn => () => conn.getNetworkId(); - -exports._getUtxos = maybe => conn => () => - conn.getUtxos().then(res => (res === null ? maybe.nothing : maybe.just(res))); - -exports._getCollateral = maybe => conn => () => - conn.experimental - .getCollateral() - .then(utxos => - utxos !== null && utxos.length ? maybe.just(utxos) : maybe.nothing - ); - -exports._getBalance = conn => () => conn.getBalance(); - -exports._getAddresses = conn => conn.getUsedAddresses; - -exports._getUnusedAddresses = conn => () => conn.getUnusedAddresses(); - -exports._getChangeAddress = conn => () => conn.getChangeAddress(); - -exports._getRewardAddresses = conn => () => conn.getRewardAddresses(); - -exports._signTx = txHex => conn => () => - conn.signTx(txHex, true).catch(e => { - throw JSON.stringify(e); - }); - -exports._signData = address => payload => conn => () => - conn.signData(address, payload).catch(e => { - throw JSON.stringify(e); - }); +export function _getNetworkId(conn) { + return () => conn.getNetworkId(); +} + +export function _getUtxos(maybe) { + return conn => () => + conn.getUtxos().then(res => (res === null ? maybe.nothing : maybe.just(res))); +} + +export function _getCollateral(maybe) { + return conn => () => + conn.experimental + .getCollateral() + .then(utxos => + utxos !== null && utxos.length ? maybe.just(utxos) : maybe.nothing + ); +} + +export function _getBalance(conn) { + return () => conn.getBalance(); +} + +export function _getAddresses(conn) { + return conn.getUsedAddresses; +} + +export function _getUnusedAddresses(conn) { + return () => conn.getUnusedAddresses(); +} + +export function _getChangeAddress(conn) { + return () => conn.getChangeAddress(); +} + +export function _getRewardAddresses(conn) { + return () => conn.getRewardAddresses(); +} + +export function _signTx(txHex) { + return conn => () => + conn.signTx(txHex, true).catch(e => { + throw JSON.stringify(e); + }); +} + +export function _signData(address) { + return payload => conn => () => + conn.signData(address, payload).catch(e => { + throw JSON.stringify(e); + }); +} diff --git a/src/Internal/Wallet/Cip30/SignData.js b/src/Internal/Wallet/Cip30/SignData.js index 79e1dab9ff..7cc4117b86 100644 --- a/src/Internal/Wallet/Cip30/SignData.js +++ b/src/Internal/Wallet/Cip30/SignData.js @@ -12,100 +12,120 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { // ----------------------------------------------------------------------------- // newCoseSign1Builder :: ByteArray -> Headers -> Effect COSESign1Builder -exports.newCoseSign1Builder = payload => headers => () => { - return lib.COSESign1Builder.new(headers, payload, false); -}; +export function newCoseSign1Builder(payload) { + return headers => () => { + return lib.COSESign1Builder.new(headers, payload, false); + }; +} // makeDataToSign :: COSESign1Builder -> ByteArray -exports.makeDataToSign = builder => { +export function makeDataToSign(builder) { return builder.make_data_to_sign().to_bytes(); -}; +} // sign :: PrivateKey -> ByteArray -> ByteArray -exports.sign = privateKey => message => { - return privateKey.sign(message).to_bytes(); -}; +export function sign(privateKey) { + return message => { + return privateKey.sign(message).to_bytes(); + }; +} // buildSignature :: COSESign1Builder -> ByteArray -> ByteArray -exports.buildSignature = builder => signedSigStruct => { - return builder.build(signedSigStruct).to_bytes(); -}; +export function buildSignature(builder) { + return signedSigStruct => { + return builder.build(signedSigStruct).to_bytes(); + }; +} // ----------------------------------------------------------------------------- // Headers // ----------------------------------------------------------------------------- // newHeaders :: HeaderMap -> ProtectedHeaderMap -> Headers -exports.newHeaders = unprotectedHeaders => protectedHeaders => { - return lib.Headers.new(protectedHeaders, unprotectedHeaders); -}; +export function newHeaders(unprotectedHeaders) { + return protectedHeaders => { + return lib.Headers.new(protectedHeaders, unprotectedHeaders); + }; +} // ----------------------------------------------------------------------------- // ProtectedHeaderMap // ----------------------------------------------------------------------------- // newProtectedHeaderMap :: HeaderMap -> ProtectedHeaderMap -exports.newProtectedHeaderMap = headerMap => { +export function newProtectedHeaderMap(headerMap) { return lib.ProtectedHeaderMap.new(headerMap); -}; +} // ----------------------------------------------------------------------------- // HeaderMap // ----------------------------------------------------------------------------- // newHeaderMap :: Effect HeaderMap -exports.newHeaderMap = () => { +export function newHeaderMap() { return lib.HeaderMap.new(); -}; +} // setAlgHeaderToEdDsa :: HeaderMap -> Effect Unit -exports.setAlgHeaderToEdDsa = headerMap => () => { - const label = lib.Label.from_algorithm_id(lib.AlgorithmId.EdDSA); - headerMap.set_algorithm_id(label); -}; +export function setAlgHeaderToEdDsa(headerMap) { + return () => { + const label = lib.Label.from_algorithm_id(lib.AlgorithmId.EdDSA); + headerMap.set_algorithm_id(label); + }; +} // setAddressHeader :: ByteArray -> HeaderMap -> Effect Unit -exports.setAddressHeader = addressBytes => headerMap => () => { - const label = lib.Label.new_text("address"); - const value = lib.CBORValue.new_bytes(addressBytes); - headerMap.set_header(label, value); -}; +export function setAddressHeader(addressBytes) { + return headerMap => () => { + const label = lib.Label.new_text("address"); + const value = lib.CBORValue.new_bytes(addressBytes); + headerMap.set_header(label, value); + }; +} // ----------------------------------------------------------------------------- // COSEKey // ----------------------------------------------------------------------------- // newCoseKeyWithOkpType :: Effect COSEKey -exports.newCoseKeyWithOkpType = () => { +export function newCoseKeyWithOkpType() { return lib.COSEKey.new(lib.Label.from_key_type(lib.KeyType.OKP)); -}; +} // setCoseKeyAlgHeaderToEdDsa :: COSEKey -> Effect Unit -exports.setCoseKeyAlgHeaderToEdDsa = key => () => { - key.set_algorithm_id(lib.Label.from_algorithm_id(lib.AlgorithmId.EdDSA)); -}; +export function setCoseKeyAlgHeaderToEdDsa(key) { + return () => { + key.set_algorithm_id(lib.Label.from_algorithm_id(lib.AlgorithmId.EdDSA)); + }; +} // setCoseKeyCrvHeaderToEd25519 :: COSEKey -> Effect Unit -exports.setCoseKeyCrvHeaderToEd25519 = key => () => { - key.set_header( - lib.Label.new_int( - lib.Int.new_negative(lib.BigNum.from_str("1")) // crv (-1) - ), - lib.CBORValue.new_int( - lib.Int.new_i32(6) // Ed25519 (6) - ) - ); -}; +export function setCoseKeyCrvHeaderToEd25519(key) { + return () => { + key.set_header( + lib.Label.new_int( + lib.Int.new_negative(lib.BigNum.from_str("1")) // crv (-1) + ), + lib.CBORValue.new_int( + lib.Int.new_i32(6) // Ed25519 (6) + ) + ); + }; +} // setCoseKeyXHeader :: RawBytes -> COSEKey -> Effect Unit -exports.setCoseKeyXHeader = publicKeyBytes => key => () => { - key.set_header( - lib.Label.new_int( - lib.Int.new_negative(lib.BigNum.from_str("2")) // x (-2) - ), - lib.CBORValue.new_bytes(publicKeyBytes) // public key bytes - ); -}; +export function setCoseKeyXHeader(publicKeyBytes) { + return key => () => { + key.set_header( + lib.Label.new_int( + lib.Int.new_negative(lib.BigNum.from_str("2")) // x (-2) + ), + lib.CBORValue.new_bytes(publicKeyBytes) // public key bytes + ); + }; +} // bytesFromCoseKey :: COSEKey -> CborBytes -exports.bytesFromCoseKey = key => key.to_bytes(); +export function bytesFromCoseKey(key) { + return key.to_bytes(); +} diff --git a/src/Internal/Wallet/Cip30Mock.js b/src/Internal/Wallet/Cip30Mock.js index 4b62dab59b..a92d55cb81 100644 --- a/src/Internal/Wallet/Cip30Mock.js +++ b/src/Internal/Wallet/Cip30Mock.js @@ -1,51 +1,53 @@ /* eslint-disable no-global-assign */ -exports.injectCip30Mock = walletName => mock => () => { - const hadWindow = typeof window != "undefined"; +export function injectCip30Mock(walletName) { + return mock => () => { + const hadWindow = typeof window != "undefined"; - if ( - typeof window == "object" && - typeof window.cardano == "object" && - typeof window.cardano[walletName] != "undefined" - ) { - throw ( - "injectCip30Mock: refusing to overwrite existing wallet (" + - walletName + - ")" - ); - } - - if (typeof window == "undefined") { - window = { cardano: {} }; - } else if (typeof window.cardano == "undefined") { - window.cardano = {}; - } - - window.cardano[walletName] = { - enable: () => { - return new Promise((resolve, _reject) => - resolve({ - getNetworkId: mock.getNetworkId, - getUtxos: mock.getUtxos, - experimental: { - getCollateral: mock.getCollateral, - }, - getBalance: mock.getBalance, - getUsedAddresses: mock.getUsedAddresses, - getUnusedAddresses: mock.getUnusedAddresses, - getChangeAddress: mock.getChangeAddress, - getRewardAddresses: mock.getRewardAddresses, - signTx: mock.signTx, - signData: mock.signData, - }) + if ( + typeof window == "object" && + typeof window.cardano == "object" && + typeof window.cardano[walletName] != "undefined" + ) { + throw ( + "injectCip30Mock: refusing to overwrite existing wallet (" + + walletName + + ")" ); - }, - }; + } - return () => { - delete window.cardano[walletName]; - if (!hadWindow) { - window = undefined; + if (typeof window == "undefined") { + window = { cardano: {} }; + } else if (typeof window.cardano == "undefined") { + window.cardano = {}; } + + window.cardano[walletName] = { + enable: () => { + return new Promise((resolve, _reject) => + resolve({ + getNetworkId: mock.getNetworkId, + getUtxos: mock.getUtxos, + experimental: { + getCollateral: mock.getCollateral, + }, + getBalance: mock.getBalance, + getUsedAddresses: mock.getUsedAddresses, + getUnusedAddresses: mock.getUnusedAddresses, + getChangeAddress: mock.getChangeAddress, + getRewardAddresses: mock.getRewardAddresses, + signTx: mock.signTx, + signData: mock.signData, + }) + ); + }, + }; + + return () => { + delete window.cardano[walletName]; + if (!hadWindow) { + window = undefined; + } + }; }; -}; +} diff --git a/test/ApplyArgs.js b/test/ApplyArgs.js index b3ec192469..cd7684ad22 100644 --- a/test/ApplyArgs.js +++ b/test/ApplyArgs.js @@ -164,4 +164,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { ); } -exports.scripts = scripts; +export {scripts}; diff --git a/test/Wallet/Cip30/SignData.js b/test/Wallet/Cip30/SignData.js index 69ce9d44be..33b62a195f 100644 --- a/test/Wallet/Cip30/SignData.js +++ b/test/Wallet/Cip30/SignData.js @@ -33,22 +33,26 @@ const fromBytes = name => bytes => () => { // ----------------------------------------------------------------------------- // verifySignature :: COSESign1 -> PublicKey -> CborBytes -> Effect Boolean -exports.verifySignature = coseSign1 => publicKey => sigStructBytes => () => { - const signature = csl.Ed25519Signature.from_bytes(coseSign1.signature()); - return publicKey.verify(sigStructBytes, signature); -}; +export function verifySignature(coseSign1) { + return publicKey => sigStructBytes => () => { + const signature = csl.Ed25519Signature.from_bytes(coseSign1.signature()); + return publicKey.verify(sigStructBytes, signature); + }; +} // ----------------------------------------------------------------------------- // COSESign1 // ----------------------------------------------------------------------------- // _fromBytesCoseSign1 :: CborBytes -> Effect COSESign1 -exports.fromBytesCoseSign1 = fromBytes("COSESign1"); +export var fromBytesCoseSign1 = fromBytes("COSESign1"); // getSignedData :: COSESign1 -> Effect CborBytes -exports.getSignedData = coseSign1 => () => { - return coseSign1.signed_data(null, null).to_bytes(); -}; +export function getSignedData(coseSign1) { + return () => { + return coseSign1.signed_data(null, null).to_bytes(); + }; +} // getCoseSign1ProtectedHeaders :: COSESign1 -> HeaderMap const getCoseSign1ProtectedHeaders = coseSign1 => { @@ -56,64 +60,80 @@ const getCoseSign1ProtectedHeaders = coseSign1 => { }; // getCoseSign1ProtectedHeaderAlg :: MaybeFfiHelper -> COSESign1 -> Maybe Int -exports._getCoseSign1ProtectedHeaderAlg = maybe => coseSign1 => { - const protectedHeaders = getCoseSign1ProtectedHeaders(coseSign1); - return opt_chain(maybe, protectedHeaders, "algorithm_id", "as_int", "as_i32"); -}; +export function _getCoseSign1ProtectedHeaderAlg(maybe) { + return coseSign1 => { + const protectedHeaders = getCoseSign1ProtectedHeaders(coseSign1); + return opt_chain(maybe, protectedHeaders, "algorithm_id", "as_int", "as_i32"); + }; +} // _getCoseSign1ProtectedHeaderAddress // :: MaybeFfiHelper -> COSESign1 -> Maybe CborBytes -exports._getCoseSign1ProtectedHeaderAddress = maybe => coseSign1 => { - const protectedHeaders = getCoseSign1ProtectedHeaders(coseSign1); - const cborValue = protectedHeaders.header(lib.Label.new_text("address")); - return opt_chain(maybe, cborValue, "as_bytes"); -}; +export function _getCoseSign1ProtectedHeaderAddress(maybe) { + return coseSign1 => { + const protectedHeaders = getCoseSign1ProtectedHeaders(coseSign1); + const cborValue = protectedHeaders.header(lib.Label.new_text("address")); + return opt_chain(maybe, cborValue, "as_bytes"); + }; +} // _getCoseSign1ProtectedHeaderKid // :: MaybeFfiHelper -> COSESign1 -> Maybe RawBytes -exports._getCoseSign1ProtectedHeaderKid = maybe => coseSign1 => { - const protectedHeaders = getCoseSign1ProtectedHeaders(coseSign1); - return opt_chain(maybe, protectedHeaders, "key_id"); -}; +export function _getCoseSign1ProtectedHeaderKid(maybe) { + return coseSign1 => { + const protectedHeaders = getCoseSign1ProtectedHeaders(coseSign1); + return opt_chain(maybe, protectedHeaders, "key_id"); + }; +} // ----------------------------------------------------------------------------- // COSEKey // ----------------------------------------------------------------------------- // _fromBytesCoseKey :: CborBytes -> Effect COSEKey -exports.fromBytesCoseKey = fromBytes("COSEKey"); +export var fromBytesCoseKey = fromBytes("COSEKey"); // _getCoseKeyHeaderKty :: MaybeFfiHelper -> COSEKey -> Maybe Int -exports._getCoseKeyHeaderKty = maybe => coseKey => { - return opt_chain(maybe, coseKey.key_type(), "as_int", "as_i32"); -}; +export function _getCoseKeyHeaderKty(maybe) { + return coseKey => { + return opt_chain(maybe, coseKey.key_type(), "as_int", "as_i32"); + }; +} // _getCoseKeyHeaderAlg :: MaybeFfiHelper -> COSEKey -> Maybe Int -exports._getCoseKeyHeaderAlg = maybe => coseKey => { - return opt_chain(maybe, coseKey, "algorithm_id", "as_int", "as_i32"); -}; +export function _getCoseKeyHeaderAlg(maybe) { + return coseKey => { + return opt_chain(maybe, coseKey, "algorithm_id", "as_int", "as_i32"); + }; +} // _getCoseKeyHeaderCrv :: MaybeFfiHelper -> COSEKey -> Maybe Int -exports._getCoseKeyHeaderCrv = maybe => coseKey => { - const cborValue = coseKey.header( - lib.Label.new_int( - lib.Int.new_negative(lib.BigNum.from_str("1")) // crv (-1) - ) - ); - return opt_chain(maybe, cborValue, "as_int", "as_i32"); -}; +export function _getCoseKeyHeaderCrv(maybe) { + return coseKey => { + const cborValue = coseKey.header( + lib.Label.new_int( + lib.Int.new_negative(lib.BigNum.from_str("1")) // crv (-1) + ) + ); + return opt_chain(maybe, cborValue, "as_int", "as_i32"); + }; +} // _getCoseKeyHeaderX :: MaybeFfiHelper -> COSEKey -> Maybe RawBytes -exports._getCoseKeyHeaderX = maybe => coseKey => { - const cborValue = coseKey.header( - lib.Label.new_int( - lib.Int.new_negative(lib.BigNum.from_str("2")) // x (-2) - ) - ); - return opt_chain(maybe, cborValue, "as_bytes"); -}; +export function _getCoseKeyHeaderX(maybe) { + return coseKey => { + const cborValue = coseKey.header( + lib.Label.new_int( + lib.Int.new_negative(lib.BigNum.from_str("2")) // x (-2) + ) + ); + return opt_chain(maybe, cborValue, "as_bytes"); + }; +} // _getCoseKeyHeaderKid :: MaybeFfiHelper -> COSESign1 -> Maybe RawBytes -exports._getCoseKeyHeaderKid = maybe => coseKey => { - return opt_chain(maybe, coseKey, "key_id"); -}; +export function _getCoseKeyHeaderKid(maybe) { + return coseKey => { + return opt_chain(maybe, coseKey, "key_id"); + }; +} From 856ed1d24b42c158f3a56affc7086060e0ecfd33 Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Fri, 30 Jun 2023 15:35:07 +0200 Subject: [PATCH 08/85] build: select affjax driver based on environment (node or browser) --- src/Internal/Affjax.js | 32 +++++++++++++++++++++ src/Internal/Affjax.purs | 33 ++++++++++++++++++++++ src/Internal/ProcessConstraints/State.purs | 20 ++++++------- src/Internal/QueryM.purs | 3 +- src/Internal/QueryM/Kupo.purs | 3 +- src/Internal/Service/Blockfrost.purs | 3 +- 6 files changed, 81 insertions(+), 13 deletions(-) create mode 100644 src/Internal/Affjax.js create mode 100644 src/Internal/Affjax.purs diff --git a/src/Internal/Affjax.js b/src/Internal/Affjax.js new file mode 100644 index 0000000000..73e5a02e80 --- /dev/null +++ b/src/Internal/Affjax.js @@ -0,0 +1,32 @@ +import XHR from "xhr2"; +import urllib from "url"; + +const browserDriver = { + newXHR: function () { + return new XMLHttpRequest(); + }, + fixupUrl: function (url) { + return url || "/"; + } +}; + +const nodeDriver = { + newXHR: function () { + return new XHR(); + }, + fixupUrl: function (url, xhr) { + if (xhr.nodejsBaseUrl === null) { + var u = urllib.parse(url); + u.protocol = u.protocol || "http:"; + u.hostname = u.hostname || "localhost"; + return urllib.format(u); + } else { + return url || "/"; + } + }, +}; + +export const driver = + typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME + ? browserDriver + : nodeDriver; diff --git a/src/Internal/Affjax.purs b/src/Internal/Affjax.purs new file mode 100644 index 0000000000..1d654e4cc3 --- /dev/null +++ b/src/Internal/Affjax.purs @@ -0,0 +1,33 @@ +module Ctl.Internal.Affjax + ( request + ) where + +import Prelude + +import Affjax (AffjaxDriver) +import Affjax (Error, Request, Response) as Affjax +import Affjax (request) as Affjax +import Data.Either (Either) +import Effect.Aff (Aff) + +foreign import driver :: AffjaxDriver + +-- | Makes an HTTP request. +-- | +-- | The example below performs a `GET` request to the URL `/resource` and +-- | interprets the response body as JSON. +-- | +-- | ```purescript +-- | import Affjax.ResponseFormat (json) +-- | ... +-- | request (defaultRequest { url = "/resource", method = Left GET, responseFormat = json}) +-- | ``` +-- | +-- | For common cases helper functions can often be used insteAX of `request` . +-- | For instance, the above example is equivalent to the following. +-- | +-- | ```purescript +-- | get json "/resource" +-- | ``` +request :: forall a. Affjax.Request a -> Aff (Either Affjax.Error (Affjax.Response a)) +request = Affjax.request driver diff --git a/src/Internal/ProcessConstraints/State.purs b/src/Internal/ProcessConstraints/State.purs index 9874e3973f..5f842fce15 100644 --- a/src/Internal/ProcessConstraints/State.purs +++ b/src/Internal/ProcessConstraints/State.purs @@ -38,8 +38,8 @@ import Data.Lens.Record (prop) import Data.Lens.Types (Lens') import Data.Map (Map) import Data.Show.Generic (genericShow) -import Data.Symbol (SProxy(SProxy)) import Data.Tuple.Nested ((/\)) +import Type.Proxy (Proxy(Proxy)) -- A `StateT` ontop of `QueryM` ~ ReaderT QueryConfig Aff`. -- The state is `ConstraintProcessingState`, which keeps track of the unbalanced @@ -76,45 +76,45 @@ type ConstraintProcessingState (a :: Type) = _cpsTransaction :: forall (a :: Type). Lens' (ConstraintProcessingState a) Transaction -_cpsTransaction = prop (SProxy :: SProxy "transaction") +_cpsTransaction = prop (Proxy :: Proxy "transaction") _cpsUsedUtxos :: forall (a :: Type) . Lens' (ConstraintProcessingState a) (Map TransactionInput TransactionOutput) -_cpsUsedUtxos = prop (SProxy :: SProxy "usedUtxos") +_cpsUsedUtxos = prop (Proxy :: Proxy "usedUtxos") _valueSpentBalancesInputs :: forall (a :: Type). Lens' (ConstraintProcessingState a) ValueSpentBalances -_valueSpentBalancesInputs = prop (SProxy :: SProxy "valueSpentBalancesInputs") +_valueSpentBalancesInputs = prop (Proxy :: Proxy "valueSpentBalancesInputs") _valueSpentBalancesOutputs :: forall (a :: Type). Lens' (ConstraintProcessingState a) ValueSpentBalances -_valueSpentBalancesOutputs = prop (SProxy :: SProxy "valueSpentBalancesOutputs") +_valueSpentBalancesOutputs = prop (Proxy :: Proxy "valueSpentBalancesOutputs") _datums :: forall (a :: Type). Lens' (ConstraintProcessingState a) (Array Datum) -_datums = prop (SProxy :: SProxy "datums") +_datums = prop (Proxy :: Proxy "datums") _costModels :: forall (a :: Type). Lens' (ConstraintProcessingState a) Costmdls -_costModels = prop (SProxy :: SProxy "costModels") +_costModels = prop (Proxy :: Proxy "costModels") _redeemers :: forall (a :: Type) . Lens' (ConstraintProcessingState a) (Array UnindexedRedeemer) -_redeemers = prop (SProxy :: SProxy "redeemers") +_redeemers = prop (Proxy :: Proxy "redeemers") _lookups :: forall (a :: Type). Lens' (ConstraintProcessingState a) (ScriptLookups a) -_lookups = prop (SProxy :: SProxy "lookups") +_lookups = prop (Proxy :: Proxy "lookups") _refScriptsUtxoMap :: forall (a :: Type) . Lens' (ConstraintProcessingState a) (Map TransactionInput Plutus.TransactionOutputWithRefScript) -_refScriptsUtxoMap = prop (SProxy :: SProxy "refScriptsUtxoMap") +_refScriptsUtxoMap = prop (Proxy :: Proxy "refScriptsUtxoMap") -- | The balances we track for computing the missing 'Value' (if any) -- | that needs to be added to the transaction. diff --git a/src/Internal/QueryM.purs b/src/Internal/QueryM.purs index f5ef2c1b8b..df099e9ba1 100644 --- a/src/Internal/QueryM.purs +++ b/src/Internal/QueryM.purs @@ -59,7 +59,7 @@ import Aeson , parseJsonStringToAeson , stringifyAeson ) -import Affjax (Error, Response, defaultRequest, request) as Affjax +import Affjax (Error, Response, defaultRequest) as Affjax import Affjax.RequestBody as Affjax.RequestBody import Affjax.RequestHeader as Affjax.RequestHeader import Affjax.ResponseFormat as Affjax.ResponseFormat @@ -78,6 +78,7 @@ import Control.Monad.Reader.Trans (ReaderT(ReaderT), asks) import Control.Monad.Rec.Class (class MonadRec) import Control.Parallel (class Parallel, parallel, sequential) import Control.Plus (class Plus) +import Ctl.Internal.Affjax (request) as Affjax import Ctl.Internal.Cardano.Types.Transaction (PoolPubKeyHash) import Ctl.Internal.Helpers (logWithLevel) import Ctl.Internal.JsWebSocket diff --git a/src/Internal/QueryM/Kupo.purs b/src/Internal/QueryM/Kupo.purs index 17ce07cd50..bb05ca609d 100644 --- a/src/Internal/QueryM/Kupo.purs +++ b/src/Internal/QueryM/Kupo.purs @@ -21,7 +21,7 @@ import Aeson , getFieldOptional' , isNull ) -import Affjax (Error, Response, defaultRequest, request) as Affjax +import Affjax (Error, Response, defaultRequest) as Affjax import Affjax.ResponseFormat (string) as Affjax.ResponseFormat import Affjax.StatusCode (StatusCode(StatusCode)) import Contract.Log (logTrace') @@ -31,6 +31,7 @@ import Control.Monad.Error.Class (throwError) import Control.Monad.Except.Trans (ExceptT(ExceptT), except, runExceptT) import Control.Monad.Reader.Class (asks) import Control.Parallel (parTraverse) +import Ctl.Internal.Affjax (request) as Affjax import Ctl.Internal.Cardano.Types.ScriptRef ( ScriptRef(NativeScriptRef, PlutusScriptRef) ) diff --git a/src/Internal/Service/Blockfrost.purs b/src/Internal/Service/Blockfrost.purs index 3c09cf9795..2cafe33393 100644 --- a/src/Internal/Service/Blockfrost.purs +++ b/src/Internal/Service/Blockfrost.purs @@ -77,7 +77,7 @@ import Aeson , (.:) , (.:!) ) -import Affjax (Error, Response, URL, defaultRequest, printError, request) as Affjax +import Affjax (Error, Response, URL, defaultRequest, printError) as Affjax import Affjax.RequestBody (RequestBody, arrayView, string) as Affjax import Affjax.RequestHeader (RequestHeader(ContentType, RequestHeader)) as Affjax import Affjax.ResponseFormat (string) as Affjax.ResponseFormat @@ -96,6 +96,7 @@ import Control.Monad.Maybe.Trans (MaybeT(MaybeT), runMaybeT) import Control.Monad.Reader.Class (ask, asks) import Control.Monad.Reader.Trans (ReaderT, runReaderT) import Control.Parallel (parTraverse) +import Ctl.Internal.Affjax (request) as Affjax import Ctl.Internal.Cardano.Types.NativeScript ( NativeScript ( ScriptAll From 4c66024831d2e6da2c82e758c4d21904dbc4b41a Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Fri, 30 Jun 2023 15:55:22 +0200 Subject: [PATCH 09/85] style: fix formatting --- Makefile | 2 +- examples/AlwaysMints.js | 2 +- examples/AlwaysSucceeds.js | 2 +- examples/ECDSA.js | 2 +- examples/ExUnits.js | 2 +- examples/IncludeDatum.js | 2 +- examples/Lose7Ada.js | 2 +- examples/MintsMultipleTokens.js | 6 +- examples/MultipleRedeemers.js | 6 +- examples/OneShotMinting.js | 2 +- examples/OtherTypeTextEnvelope.js | 2 +- examples/PlutusV2/InlineDatum.js | 2 +- examples/PlutusV2/OneShotMinting.js | 2 +- examples/PlutusV2/Scripts/AlwaysMints.js | 2 +- examples/PlutusV2/Scripts/AlwaysSucceeds.js | 2 +- examples/Schnorr.js | 2 +- flake.nix | 2 +- src/Internal/Affjax.js | 10 +- src/Internal/Affjax.purs | 3 +- src/Internal/Base64.js | 4 +- src/Internal/Deserialization/NativeScript.js | 8 +- src/Internal/Deserialization/Transaction.js | 71 +++---- src/Internal/Deserialization/UnspentOutput.js | 29 ++- src/Internal/Deserialization/WitnessSet.js | 60 +++--- src/Internal/JsWebSocket.js | 3 +- src/Internal/Plutus/Types/AssocMap.purs | 13 +- src/Internal/Serialization.js | 189 ++++++++---------- src/Internal/Serialization/Address.js | 70 ++++--- src/Internal/Serialization/AuxiliaryData.js | 9 +- src/Internal/Serialization/Keys.js | 10 +- src/Internal/Serialization/MinFee.js | 3 +- src/Internal/Serialization/NativeScript.js | 15 +- src/Internal/Serialization/PlutusData.js | 3 +- src/Internal/Serialization/WitnessSet.js | 15 +- src/Internal/Types/BigNum.js | 4 +- src/Internal/Types/Int.js | 4 +- src/Internal/Types/TokenName.js | 2 +- src/Internal/Wallet.js | 4 +- src/Internal/Wallet/Cip30.js | 4 +- test/ApplyArgs.js | 2 +- test/Wallet/Cip30/SignData.js | 12 +- 41 files changed, 285 insertions(+), 304 deletions(-) diff --git a/Makefile b/Makefile index c0d17da31a..fbf143289a 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ check-format: check-explicit-exports check-examples-imports check-whitespace @purs-tidy check ${ps-sources} @nixpkgs-fmt --check ${nix-sources} @prettier --loglevel warn -c ${js-sources} - @eslint --quiet ${js-sources} + @eslint --quiet ${js-sources} --parser-options 'sourceType: module' format: @purs-tidy format-in-place ${ps-sources} diff --git a/examples/AlwaysMints.js b/examples/AlwaysMints.js index 49601ff1cc..f859dd0747 100644 --- a/examples/AlwaysMints.js +++ b/examples/AlwaysMints.js @@ -11,4 +11,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { "utf8" ); } -export {script as alwaysMints}; +export { script as alwaysMints }; diff --git a/examples/AlwaysSucceeds.js b/examples/AlwaysSucceeds.js index edc58cb330..7ee323003d 100644 --- a/examples/AlwaysSucceeds.js +++ b/examples/AlwaysSucceeds.js @@ -12,4 +12,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { ); } -export {script as alwaysSucceeds}; +export { script as alwaysSucceeds }; diff --git a/examples/ECDSA.js b/examples/ECDSA.js index c3cb277e27..a1d874fd3b 100644 --- a/examples/ECDSA.js +++ b/examples/ECDSA.js @@ -11,4 +11,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { "utf8" ); } -export {script as validateECDSA}; +export { script as validateECDSA }; diff --git a/examples/ExUnits.js b/examples/ExUnits.js index 157ecde3d0..3e0039a9a1 100644 --- a/examples/ExUnits.js +++ b/examples/ExUnits.js @@ -12,4 +12,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { ); } -export {script as exUnits}; +export { script as exUnits }; diff --git a/examples/IncludeDatum.js b/examples/IncludeDatum.js index a66b971c0a..fa1910b6ba 100644 --- a/examples/IncludeDatum.js +++ b/examples/IncludeDatum.js @@ -12,4 +12,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { ); } -export {script as includeDatum}; +export { script as includeDatum }; diff --git a/examples/Lose7Ada.js b/examples/Lose7Ada.js index 160a30565b..0b7f92ab79 100644 --- a/examples/Lose7Ada.js +++ b/examples/Lose7Ada.js @@ -12,4 +12,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { ); } -export {script as alwaysFails}; +export { script as alwaysFails }; diff --git a/examples/MintsMultipleTokens.js b/examples/MintsMultipleTokens.js index 3c31afceea..98f9152cd2 100644 --- a/examples/MintsMultipleTokens.js +++ b/examples/MintsMultipleTokens.js @@ -19,6 +19,6 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { redeemerInt3 = readScript("redeemer3"); } -export {redeemerInt1}; -export {redeemerInt2}; -export {redeemerInt3}; +export { redeemerInt1 }; +export { redeemerInt2 }; +export { redeemerInt3 }; diff --git a/examples/MultipleRedeemers.js b/examples/MultipleRedeemers.js index 31479907d5..f24ce0146c 100644 --- a/examples/MultipleRedeemers.js +++ b/examples/MultipleRedeemers.js @@ -19,6 +19,6 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { vredeemerInt3 = readScript("redeemer3-validator"); } -export {vredeemerInt1}; -export {vredeemerInt2}; -export {vredeemerInt3}; +export { vredeemerInt1 }; +export { vredeemerInt2 }; +export { vredeemerInt3 }; diff --git a/examples/OneShotMinting.js b/examples/OneShotMinting.js index 7ae56d760c..214afcd266 100644 --- a/examples/OneShotMinting.js +++ b/examples/OneShotMinting.js @@ -12,4 +12,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { ); } -export {script as oneShotMinting}; +export { script as oneShotMinting }; diff --git a/examples/OtherTypeTextEnvelope.js b/examples/OtherTypeTextEnvelope.js index be56ab824b..6a27e2121a 100644 --- a/examples/OtherTypeTextEnvelope.js +++ b/examples/OtherTypeTextEnvelope.js @@ -14,4 +14,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { "utf8" ); } -export {script as otherTypeTextEnvelope}; +export { script as otherTypeTextEnvelope }; diff --git a/examples/PlutusV2/InlineDatum.js b/examples/PlutusV2/InlineDatum.js index dbdad10b76..4d65a94e99 100644 --- a/examples/PlutusV2/InlineDatum.js +++ b/examples/PlutusV2/InlineDatum.js @@ -15,4 +15,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { ); } -export {script as checkDatumIsInline}; +export { script as checkDatumIsInline }; diff --git a/examples/PlutusV2/OneShotMinting.js b/examples/PlutusV2/OneShotMinting.js index 9892c1ce00..c4e3a66a6c 100644 --- a/examples/PlutusV2/OneShotMinting.js +++ b/examples/PlutusV2/OneShotMinting.js @@ -15,4 +15,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { ); } -export {script as oneShotMinting}; +export { script as oneShotMinting }; diff --git a/examples/PlutusV2/Scripts/AlwaysMints.js b/examples/PlutusV2/Scripts/AlwaysMints.js index 120ecadd18..995ee1f572 100644 --- a/examples/PlutusV2/Scripts/AlwaysMints.js +++ b/examples/PlutusV2/Scripts/AlwaysMints.js @@ -11,4 +11,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { "utf8" ); } -export {script as alwaysMintsV2}; +export { script as alwaysMintsV2 }; diff --git a/examples/PlutusV2/Scripts/AlwaysSucceeds.js b/examples/PlutusV2/Scripts/AlwaysSucceeds.js index b67c3d6654..63748d5aa4 100644 --- a/examples/PlutusV2/Scripts/AlwaysSucceeds.js +++ b/examples/PlutusV2/Scripts/AlwaysSucceeds.js @@ -12,4 +12,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { ); } -export {script as alwaysSucceedsV2}; +export { script as alwaysSucceedsV2 }; diff --git a/examples/Schnorr.js b/examples/Schnorr.js index 0de34e6a36..2bb28622c9 100644 --- a/examples/Schnorr.js +++ b/examples/Schnorr.js @@ -12,4 +12,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { ); } -export {script as validateSchnorr}; +export { script as validateSchnorr }; diff --git a/flake.nix b/flake.nix index 8b6b9d4e02..e1c7996ec9 100644 --- a/flake.nix +++ b/flake.nix @@ -258,7 +258,7 @@ }; }; runtime = - ( + ( final: prev: let inherit (prev) system; diff --git a/src/Internal/Affjax.js b/src/Internal/Affjax.js index 73e5a02e80..282ec7f1b1 100644 --- a/src/Internal/Affjax.js +++ b/src/Internal/Affjax.js @@ -1,3 +1,5 @@ +/* global BROWSER_RUNTIME */ + import XHR from "xhr2"; import urllib from "url"; @@ -7,7 +9,7 @@ const browserDriver = { }, fixupUrl: function (url) { return url || "/"; - } + }, }; const nodeDriver = { @@ -16,7 +18,7 @@ const nodeDriver = { }, fixupUrl: function (url, xhr) { if (xhr.nodejsBaseUrl === null) { - var u = urllib.parse(url); + let u = urllib.parse(url); u.protocol = u.protocol || "http:"; u.hostname = u.hostname || "localhost"; return urllib.format(u); @@ -26,7 +28,7 @@ const nodeDriver = { }, }; -export const driver = - typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME +export const driver = + typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME ? browserDriver : nodeDriver; diff --git a/src/Internal/Affjax.purs b/src/Internal/Affjax.purs index 1d654e4cc3..a03371e656 100644 --- a/src/Internal/Affjax.purs +++ b/src/Internal/Affjax.purs @@ -29,5 +29,6 @@ foreign import driver :: AffjaxDriver -- | ```purescript -- | get json "/resource" -- | ``` -request :: forall a. Affjax.Request a -> Aff (Either Affjax.Error (Affjax.Response a)) +request + :: forall a. Affjax.Request a -> Aff (Either Affjax.Error (Affjax.Response a)) request = Affjax.request driver diff --git a/src/Internal/Base64.js b/src/Internal/Base64.js index 1db305d090..bd67608948 100644 --- a/src/Internal/Base64.js +++ b/src/Internal/Base64.js @@ -1,6 +1,6 @@ import base64 from "base64-js"; -export var fromByteArray = base64.fromByteArray; -export var toByteArray = base64.toByteArray; +export const fromByteArray = base64.fromByteArray; +export const toByteArray = base64.toByteArray; export function _decodeBase64(maybe) { return str => { diff --git a/src/Internal/Deserialization/NativeScript.js b/src/Internal/Deserialization/NativeScript.js index 5c26a853ed..fdc5dc64c4 100644 --- a/src/Internal/Deserialization/NativeScript.js +++ b/src/Internal/Deserialization/NativeScript.js @@ -31,7 +31,7 @@ export function _convertNativeScript(handler) { const call = property => object => object[property](); -export var scriptPubkey_addr_keyhash = call("addr_keyhash"); +export const scriptPubkey_addr_keyhash = call("addr_keyhash"); export function scriptAllScripts(helper) { return helper.unpackFromProperty("native_scripts"); @@ -45,6 +45,6 @@ export function scriptNOfKScripts(helper) { return helper.unpackFromProperty("native_scripts"); } -export var scriptNOfK_n = call("n"); -export var timelockStart_slot = call("slot_bignum"); -export var timelockExpiry_slot = call("slot_bignum"); +export const scriptNOfK_n = call("n"); +export const timelockStart_slot = call("slot_bignum"); +export const timelockExpiry_slot = call("slot_bignum"); diff --git a/src/Internal/Deserialization/Transaction.js b/src/Internal/Deserialization/Transaction.js index 2b626fa0b0..4de02b2e2c 100644 --- a/src/Internal/Deserialization/Transaction.js +++ b/src/Internal/Deserialization/Transaction.js @@ -26,13 +26,6 @@ export function _txBody(tx) { return tx.body(); } -export function _txAuxiliaryData(maybe) { - return tx => { - const ad = tx.auxiliary_data(); - return ad == null ? maybe.nothing : maybe.just(ad); - }; -} - const maybeGetter_ = fmap => propstr => maybe => obj => { if (typeof propstr != "string") { const s = "maybeGetter_ propstr must be a string, got " + propstr; @@ -45,21 +38,19 @@ const maybeGetter = maybeGetter_(a => a); const maybeGetterMulti = propstr => containerHelper => maybeGetter_(o => containerHelper.unpack(o))(propstr); -export var _txAuxiliaryData = maybeGetter("auxiliary_data"); -export var _adGeneralMetadata = maybeGetter("metadata"); -export var _adNativeScripts = maybeGetter("native_scripts"); -export var _adPlutusScripts = maybeGetter("plutus_scripts"); +export const _txAuxiliaryData = maybeGetter("auxiliary_data"); +export const _adGeneralMetadata = maybeGetter("metadata"); +export const _adNativeScripts = maybeGetter("native_scripts"); +export const _adPlutusScripts = maybeGetter("plutus_scripts"); // inputs(): TransactionInputs; export function _txBodyInputs(containerhelper) { - return body => - containerhelper.unpack(body.inputs()); + return body => containerhelper.unpack(body.inputs()); } // outputs(): TransactionOutputs; export function _txBodyOutputs(containerhelper) { - return body => - containerhelper.unpack(body.outputs()); + return body => containerhelper.unpack(body.outputs()); } // fee(): BigNum; @@ -68,27 +59,27 @@ export function _txBodyFee(body) { } // ttl(): number | void; -export var _txBodyTtl = maybeGetter("ttl_bignum"); +export const _txBodyTtl = maybeGetter("ttl_bignum"); // certs(): Certificates | void; -export var _txBodyCerts = maybeGetterMulti("certs"); +export const _txBodyCerts = maybeGetterMulti("certs"); // withdrawals(): Withdrawals | void; -export var _txBodyWithdrawals = maybeGetter("withdrawals"); +export const _txBodyWithdrawals = maybeGetter("withdrawals"); // update(): Update | void; -export var _txBodyUpdate = maybeGetter("update"); +export const _txBodyUpdate = maybeGetter("update"); // auxiliary_data_hash(): AuxiliaryDataHash | void; -export var _txBodyAuxiliaryDataHash = maybeGetter("auxiliary_data_hash"); +export const _txBodyAuxiliaryDataHash = maybeGetter("auxiliary_data_hash"); // validity_start_interval(): number | void; -export var _txBodyValidityStartInterval = maybeGetter( +export const _txBodyValidityStartInterval = maybeGetter( "validity_start_interval_bignum" ); // multiassets(): Mint | void; -export var _txBodyMultiAssets = maybeGetter("multiassets"); +export const _txBodyMultiAssets = maybeGetter("multiassets"); export function _txBodyReferenceInputs(maybe) { return containerhelper => body => @@ -98,13 +89,13 @@ export function _txBodyReferenceInputs(maybe) { } // script_data_hash(): ScriptDataHash | void; -export var _txBodyScriptDataHash = maybeGetter("script_data_hash"); +export const _txBodyScriptDataHash = maybeGetter("script_data_hash"); // collateral(): Array TransactionInput | void; -export var _txBodyCollateral = maybeGetterMulti("collateral"); +export const _txBodyCollateral = maybeGetterMulti("collateral"); // required_signers(): Ed25519KeyHashes | void; -export var _txBodyRequiredSigners = maybeGetterMulti("required_signers"); +export const _txBodyRequiredSigners = maybeGetterMulti("required_signers"); // network_id(): number | void; export function _txBodyNetworkId(testnet) { @@ -122,10 +113,10 @@ export function _txBodyNetworkId(testnet) { } // collateral_return(): TransactionOutput | void; -export var _txBodyCollateralReturn = maybeGetter("collateral_return"); +export const _txBodyCollateralReturn = maybeGetter("collateral_return"); // total_collateral(): BigNum | void -export var _txBodyTotalCollateral = maybeGetter("total_collateral"); +export const _txBodyTotalCollateral = maybeGetter("total_collateral"); // foreign import _unpackWithdrawals :: ContainerHelper -> CSL.Withdrawals -> Array(Tuple CSL.RewardAddress CSL.BigNum) export function _unpackWithdrawals(containerhelper) { @@ -187,9 +178,9 @@ export function _convertCert(certConvHelper) { mir.pot() )(mir.as_to_other_pot()); case lib.MIRKind.ToStakeCredentials: - return certConvHelper.moveInstantaneousRewardsToStakeCreds(mir.pot())( - mir.as_to_stake_creds() - ); + return certConvHelper.moveInstantaneousRewardsToStakeCreds( + mir.pot() + )(mir.as_to_stake_creds()); default: throw ( "MoveInstantaneousReward convertion failed for kind" + mir.kind() @@ -312,24 +303,22 @@ export function _unpackExUnitsPrices(cslEup) { }; } -export var poolParamsOperator = call("operator"); -export var poolParamsVrfKeyhash = call("vrf_keyhash"); -export var poolParamsPledge = call("pledge"); -export var poolParamsCost = call("cost"); -export var poolParamsMargin = call("margin"); -export var poolParamsRewardAccount = call("reward_account"); +export const poolParamsOperator = call("operator"); +export const poolParamsVrfKeyhash = call("vrf_keyhash"); +export const poolParamsPledge = call("pledge"); +export const poolParamsCost = call("cost"); +export const poolParamsMargin = call("margin"); +export const poolParamsRewardAccount = call("reward_account"); export function poolParamsPoolOwners(containerHelper) { - return poolParams => - containerHelper.unpack(poolParams.pool_owners()); + return poolParams => containerHelper.unpack(poolParams.pool_owners()); } export function poolParamsRelays(containerHelper) { - return poolParams => - containerHelper.unpack(poolParams.relays()); + return poolParams => containerHelper.unpack(poolParams.relays()); } -export var poolParamsPoolMetadata = callMaybe("pool_metadata"); +export const poolParamsPoolMetadata = callMaybe("pool_metadata"); export function convertRelay_(helper) { return relay => { diff --git a/src/Internal/Deserialization/UnspentOutput.js b/src/Internal/Deserialization/UnspentOutput.js index 9b22f6678f..976b56fb66 100644 --- a/src/Internal/Deserialization/UnspentOutput.js +++ b/src/Internal/Deserialization/UnspentOutput.js @@ -40,13 +40,13 @@ const extractDict = tuple => dict => { return res; }; -export var getInput = call("input"); -export var getOutput = call("output"); -export var getTransactionHash = call("transaction_id"); -export var getTransactionIndex = call("index"); -export var getAddress = call("address"); -export var getPlutusData = callMaybe("plutus_data"); -export var getScriptRef = callMaybe("script_ref"); +export const getInput = call("input"); +export const getOutput = call("output"); +export const getTransactionHash = call("transaction_id"); +export const getTransactionIndex = call("index"); +export const getAddress = call("address"); +export const getPlutusData = callMaybe("plutus_data"); +export const getScriptRef = callMaybe("script_ref"); export function withScriptRef(ccNativeScript) { return ccPlutusScript => scriptRef => { @@ -60,14 +60,13 @@ export function withScriptRef(ccNativeScript) { }; } -export var getAmount = call("amount"); -export var getCoin = call("coin"); -export var getMultiAsset = callMaybe("multiasset"); -export {extractDict as extractMultiAsset}; -export {extractDict as extractAssets}; -export var getDataHash = callMaybe("data_hash"); +export const getAmount = call("amount"); +export const getCoin = call("coin"); +export const getMultiAsset = callMaybe("multiasset"); +export { extractDict as extractMultiAsset }; +export { extractDict as extractAssets }; +export const getDataHash = callMaybe("data_hash"); export function mkTransactionUnspentOutput(input) { - return output => - lib.TransactionUnspentOutput.new(input, output); + return output => lib.TransactionUnspentOutput.new(input, output); } diff --git a/src/Internal/Deserialization/WitnessSet.js b/src/Internal/Deserialization/WitnessSet.js index e9b388b29f..ea8b41a80d 100644 --- a/src/Internal/Deserialization/WitnessSet.js +++ b/src/Internal/Deserialization/WitnessSet.js @@ -18,39 +18,39 @@ const containerExtractor = obj => { return res; }; -export var getVkeywitnesses = callMaybe("vkeys"); -export {containerExtractor as extractWitnesses}; -export var getVkey = call("vkey"); -export var getSignature = call("signature"); -export var vkeyPublicKey = call("public_key"); -export var publicKeyToBech32 = call("to_bech32"); -export var signatureToBech32 = call("to_bech32"); -export var getNativeScripts = callMaybe("native_scripts"); -export {containerExtractor as extractNativeScripts}; +export const getVkeywitnesses = callMaybe("vkeys"); +export { containerExtractor as extractWitnesses }; +export const getVkey = call("vkey"); +export const getSignature = call("signature"); +export const vkeyPublicKey = call("public_key"); +export const publicKeyToBech32 = call("to_bech32"); +export const signatureToBech32 = call("to_bech32"); +export const getNativeScripts = callMaybe("native_scripts"); +export { containerExtractor as extractNativeScripts }; export function nativeScriptAs(maybe) { return prop => res => ns => ns[prop]() == null ? maybe.nothing : maybe.just(res); } -export var getBootstraps = callMaybe("bootstraps"); -export {containerExtractor as extractBootstraps}; -export var getBootstrapVkey = call("vkey"); -export var getBootstrapSignature = call("signature"); -export var getBootstrapChainCode = call("chain_code"); -export var getBootstrapAttributes = call("attributes"); -export var getPlutusScripts = callMaybe("plutus_scripts"); -export {containerExtractor as extractPlutusScripts}; -export var plutusScriptBytes = call("bytes"); -export var plutusScriptVersion = call("language_version"); -export var getWitnessSetPlutusData = callMaybe("plutus_data"); -export {containerExtractor as extractPlutusData}; -export var getRedeemers = callMaybe("redeemers"); -export var getRedeemerTag = call("tag"); -export var getRedeemerIndex = call("index"); -export {containerExtractor as extractRedeemers}; -export var getRedeemerTagKind = call("kind"); -export var getRedeemerPlutusData = call("data"); -export var getExUnits = call("ex_units"); -export var getExUnitsMem = call("mem"); -export var getExUnitsSteps = call("steps"); +export const getBootstraps = callMaybe("bootstraps"); +export { containerExtractor as extractBootstraps }; +export const getBootstrapVkey = call("vkey"); +export const getBootstrapSignature = call("signature"); +export const getBootstrapChainCode = call("chain_code"); +export const getBootstrapAttributes = call("attributes"); +export const getPlutusScripts = callMaybe("plutus_scripts"); +export { containerExtractor as extractPlutusScripts }; +export const plutusScriptBytes = call("bytes"); +export const plutusScriptVersion = call("language_version"); +export const getWitnessSetPlutusData = callMaybe("plutus_data"); +export { containerExtractor as extractPlutusData }; +export const getRedeemers = callMaybe("redeemers"); +export const getRedeemerTag = call("tag"); +export const getRedeemerIndex = call("index"); +export { containerExtractor as extractRedeemers }; +export const getRedeemerTagKind = call("kind"); +export const getRedeemerPlutusData = call("data"); +export const getExUnits = call("ex_units"); +export const getExUnitsMem = call("mem"); +export const getExUnitsSteps = call("steps"); diff --git a/src/Internal/JsWebSocket.js b/src/Internal/JsWebSocket.js index 305c14915d..38873999ec 100644 --- a/src/Internal/JsWebSocket.js +++ b/src/Internal/JsWebSocket.js @@ -71,8 +71,7 @@ export function _onWsError(ws) { } export function _removeOnWsError(ws) { - return listener => () => - ws.removeEventListener("error", listener); + return listener => () => ws.removeEventListener("error", listener); } export function _onWsMessage(ws) { diff --git a/src/Internal/Plutus/Types/AssocMap.purs b/src/Internal/Plutus/Types/AssocMap.purs index 15e16e3846..cb773d6398 100644 --- a/src/Internal/Plutus/Types/AssocMap.purs +++ b/src/Internal/Plutus/Types/AssocMap.purs @@ -20,7 +20,13 @@ module Ctl.Internal.Plutus.Types.AssocMap import Prelude -import Aeson (Aeson, class DecodeAeson, class EncodeAeson, decodeAeson, encodeAeson) +import Aeson + ( class DecodeAeson + , class EncodeAeson + , Aeson + , decodeAeson + , encodeAeson + ) import Ctl.Internal.FromData (class FromData, fromData) import Ctl.Internal.ToData (class ToData, toData) import Ctl.Internal.Types.PlutusData (PlutusData(Map)) as PD @@ -74,8 +80,9 @@ instance (EncodeAeson k, EncodeAeson v) => EncodeAeson (Map k v) where instance (DecodeAeson k, DecodeAeson v) => DecodeAeson (Map k v) where decodeAeson x = Map <$> - (traverse (rtraverse decodeAeson) - =<< (decodeAeson x :: _ (Array (Tuple k Aeson)))) + ( traverse (rtraverse decodeAeson) + =<< (decodeAeson x :: _ (Array (Tuple k Aeson))) + ) instance (Show k, Show v) => Show (Map k v) where show = genericShow diff --git a/src/Internal/Serialization.js b/src/Internal/Serialization.js index d39b29bb70..4473a01b46 100644 --- a/src/Internal/Serialization.js +++ b/src/Internal/Serialization.js @@ -19,15 +19,13 @@ export function newValue(coin) { } export function newValueFromAssets(multiasset) { - return () => - lib.Value.new_from_assets(multiasset); + return () => lib.Value.new_from_assets(multiasset); } -export var valueSetCoin = setter("coin"); +export const valueSetCoin = setter("coin"); export function newTransactionInput(transaction_id) { - return index => () => - lib.TransactionInput.new(transaction_id, index); + return index => () => lib.TransactionInput.new(transaction_id, index); } export function newTransactionInputs() { @@ -39,8 +37,7 @@ export function addTransactionInput(inputs) { } export function newTransactionOutput(address) { - return amount => () => - lib.TransactionOutput.new(address, amount); + return amount => () => lib.TransactionOutput.new(address, amount); } export function newTransactionOutputs() { @@ -66,13 +63,11 @@ export function newTransaction(body) { } export function newTransaction_(body) { - return witness_set => () => - lib.Transaction.new(body, witness_set); + return witness_set => () => lib.Transaction.new(body, witness_set); } export function newTransactionUnspentOutput(input) { - return output => () => - lib.TransactionUnspentOutput.new(input, output); + return output => () => lib.TransactionUnspentOutput.new(input, output); } export function newMultiAsset() { @@ -80,8 +75,7 @@ export function newMultiAsset() { } export function insertMultiAsset(multiasset) { - return key => value => () => - multiasset.insert(key, value); + return key => value => () => multiasset.insert(key, value); } export function newAssets() { @@ -89,17 +83,16 @@ export function newAssets() { } export function insertAssets(assets) { - return key => value => () => - assets.insert(key, value); + return key => value => () => assets.insert(key, value); } export function newAssetName(name) { return () => lib.AssetName.new(name); } -export var transactionOutputSetDataHash = setter("data_hash"); -export var transactionOutputSetPlutusData = setter("plutus_data"); -export var transactionOutputSetScriptRef = setter("script_ref"); +export const transactionOutputSetDataHash = setter("data_hash"); +export const transactionOutputSetPlutusData = setter("plutus_data"); +export const transactionOutputSetScriptRef = setter("script_ref"); export function scriptRefNewNativeScript(nativeScript) { return lib.ScriptRef.new_native_script(nativeScript); @@ -118,8 +111,7 @@ export function makeVkeywitness(hash) { } export function newVkeywitness(vkey) { - return signature => () => - lib.Vkeywitness.new(vkey, signature); + return signature => () => lib.Vkeywitness.new(vkey, signature); } export function addVkeywitness(witnesses) { @@ -134,7 +126,7 @@ export function publicKeyHash(pk) { return pk.hash(); } -export var transactionWitnessSetSetVkeys = setter("vkeys"); +export const transactionWitnessSetSetVkeys = setter("vkeys"); export function newCostmdls() { return lib.Costmdls.new(); @@ -173,8 +165,7 @@ export function _hashScriptData(rs) { } export function _hashScriptDataNoDatums(rs) { - return cms => () => - lib.hash_script_data(rs, cms); + return cms => () => lib.hash_script_data(rs, cms); } export function newRedeemers() { @@ -186,12 +177,11 @@ export function addRedeemer(rs) { } export function setTxBodyReferenceInputs(txBody) { - return referenceInputs => () => - txBody.set_reference_inputs(referenceInputs); + return referenceInputs => () => txBody.set_reference_inputs(referenceInputs); } -export var setTxBodyScriptDataHash = setter("script_data_hash"); -export var setTxBodyMint = setter("mint"); +export const setTxBodyScriptDataHash = setter("script_data_hash"); +export const setTxBodyMint = setter("mint"); export function newMint() { return lib.Mint.new(); @@ -214,16 +204,14 @@ export function _bigIntToInt(maybe) { }; } -export var newMintAssets = lib.MintAssets.new; +export const newMintAssets = lib.MintAssets.new; export function insertMintAssets(mint) { - return scriptHash => mintAssets => () => - mint.insert(scriptHash, mintAssets); + return scriptHash => mintAssets => () => mint.insert(scriptHash, mintAssets); } export function insertMintAsset(mintAssets) { - return assetName => int => () => - mintAssets.insert(assetName, int); + return assetName => int => () => mintAssets.insert(assetName, int); } export function networkIdTestnet() { @@ -240,12 +228,11 @@ export function setTxBodyCollateralReturn(txBody) { } export function setTxBodyTotalCollateral(txBody) { - return totalCollateral => () => - txBody.set_total_collateral(totalCollateral); + return totalCollateral => () => txBody.set_total_collateral(totalCollateral); } -export var setTxBodyTtl = setter("ttl"); -export var setTxBodyCerts = setter("certs"); +export const setTxBodyTtl = setter("ttl"); +export const setTxBodyCerts = setter("certs"); export function newCertificates() { return lib.Certificates.new(); @@ -274,34 +261,33 @@ export function newStakeDelegationCertificate(stakeCredential) { export function newPoolRegistrationCertificate(operator) { return vrfKeyhash => - pledge => - cost => - margin => - reward_account => - poolOwners => - relays => - poolMetadata => - () => - lib.Certificate.new_pool_registration( - lib.PoolRegistration.new( - lib.PoolParams.new( - operator, - vrfKeyhash, - pledge, - cost, - margin, - reward_account, - poolOwners, - relays, - poolMetadata + pledge => + cost => + margin => + reward_account => + poolOwners => + relays => + poolMetadata => + () => + lib.Certificate.new_pool_registration( + lib.PoolRegistration.new( + lib.PoolParams.new( + operator, + vrfKeyhash, + pledge, + cost, + margin, + reward_account, + poolOwners, + relays, + poolMetadata + ) ) - ) - ); + ); } export function newUnitInterval(numerator) { - return denominator => () => - lib.UnitInterval.new(numerator, denominator); + return denominator => () => lib.UnitInterval.new(numerator, denominator); } export function newPoolRetirementCertificate(poolKeyHash) { @@ -319,12 +305,11 @@ export function newGenesisKeyDelegationCertificate(genesisHash) { } export function addCert(certificates) { - return certificate => () => - certificates.add(certificate); + return certificate => () => certificates.add(certificate); } -export var setTxBodyCollateral = setter("collateral"); -export var setTxBodyNetworkId = setter("network_id"); +export const setTxBodyCollateral = setter("collateral"); +export const setTxBodyNetworkId = setter("network_id"); export function transactionBodySetRequiredSigners(containerHelper) { return body => keyHashes => () => @@ -333,13 +318,12 @@ export function transactionBodySetRequiredSigners(containerHelper) { ); } -export var transactionBodySetValidityStartInterval = setter( +export const transactionBodySetValidityStartInterval = setter( "validity_start_interval_bignum" ); export function transactionBodySetAuxiliaryDataHash(txBody) { - return hash => () => - txBody.set_auxiliary_data_hash(hash); + return hash => () => txBody.set_auxiliary_data_hash(hash); } export function convertPoolOwners(containerHelper) { @@ -348,8 +332,7 @@ export function convertPoolOwners(containerHelper) { } export function packRelays(containerHelper) { - return relays => - containerHelper.pack(lib.Relays, relays); + return relays => containerHelper.pack(lib.Relays, relays); } export function newIpv4(data) { @@ -380,8 +363,7 @@ export function newMultiHostName(dnsName) { } export function newPoolMetadata(url) { - return hash => () => - lib.PoolMetadata.new(lib.URL.new(url), hash); + return hash => () => lib.PoolMetadata.new(lib.URL.new(url), hash); } export function newMoveInstantaneousRewardToOtherPot(pot) { @@ -407,56 +389,51 @@ export function newMoveInstantaneousRewardsCertificate(mir) { } export function newWithdrawals(containerHelper) { - return entries => () => - containerHelper.packMap(lib.Withdrawals, entries); + return entries => () => containerHelper.packMap(lib.Withdrawals, entries); } -export var setTxBodyWithdrawals = setter("withdrawals"); -export var setTxBodyUpdate = setter("update"); +export const setTxBodyWithdrawals = setter("withdrawals"); +export const setTxBodyUpdate = setter("update"); export function newUpdate(ppUpdates) { - return epoch => () => - lib.Update.new(ppUpdates, epoch); -} - -export var ppuSetMinfeeA = setter("minfee_a"); -export var ppuSetMinfeeB = setter("minfee_b"); -export var ppuSetMaxBlockBodySize = setter("max_block_body_size"); -export var ppuSetMaxTxSize = setter("max_tx_size"); -export var ppuSetMaxBlockHeaderSize = setter("max_block_header_size"); -export var ppuSetKeyDeposit = setter("key_deposit"); -export var ppuSetPoolDeposit = setter("pool_deposit"); -export var ppuSetMaxEpoch = setter("max_epoch"); -export var ppuSetNOpt = setter("n_opt"); -export var ppuSetPoolPledgeInfluence = setter("pool_pledge_influence"); -export var ppuSetExpansionRate = setter("expansion_rate"); -export var ppuSetTreasuryGrowthRate = setter("treasury_growth_rate"); + return epoch => () => lib.Update.new(ppUpdates, epoch); +} + +export const ppuSetMinfeeA = setter("minfee_a"); +export const ppuSetMinfeeB = setter("minfee_b"); +export const ppuSetMaxBlockBodySize = setter("max_block_body_size"); +export const ppuSetMaxTxSize = setter("max_tx_size"); +export const ppuSetMaxBlockHeaderSize = setter("max_block_header_size"); +export const ppuSetKeyDeposit = setter("key_deposit"); +export const ppuSetPoolDeposit = setter("pool_deposit"); +export const ppuSetMaxEpoch = setter("max_epoch"); +export const ppuSetNOpt = setter("n_opt"); +export const ppuSetPoolPledgeInfluence = setter("pool_pledge_influence"); +export const ppuSetExpansionRate = setter("expansion_rate"); +export const ppuSetTreasuryGrowthRate = setter("treasury_growth_rate"); export function newProtocolVersion(major) { - return minor => () => - lib.ProtocolVersion.new(major, minor); + return minor => () => lib.ProtocolVersion.new(major, minor); } export function ppuSetProtocolVersion(ppu) { - return version => () => - ppu.set_protocol_version(version); + return version => () => ppu.set_protocol_version(version); } -export var ppuSetMinPoolCost = setter("min_pool_cost"); -export var ppuSetAdaPerUtxoByte = setter("ada_per_utxo_byte"); -export var ppuSetCostModels = setter("cost_models"); +export const ppuSetMinPoolCost = setter("min_pool_cost"); +export const ppuSetAdaPerUtxoByte = setter("ada_per_utxo_byte"); +export const ppuSetCostModels = setter("cost_models"); export function newExUnitPrices(mem_price) { - return step_price => () => - lib.ExUnitPrices.new(mem_price, step_price); + return step_price => () => lib.ExUnitPrices.new(mem_price, step_price); } -export var ppuSetExecutionCosts = setter("execution_costs"); -export var ppuSetMaxTxExUnits = setter("max_tx_ex_units"); -export var ppuSetMaxBlockExUnits = setter("max_block_ex_units"); -export var ppuSetMaxValueSize = setter("max_value_size"); -export var ppuSetCollateralPercentage = setter("collateral_percentage"); -export var ppuSetMaxCollateralInputs = setter("max_collateral_inputs"); +export const ppuSetExecutionCosts = setter("execution_costs"); +export const ppuSetMaxTxExUnits = setter("max_tx_ex_units"); +export const ppuSetMaxBlockExUnits = setter("max_block_ex_units"); +export const ppuSetMaxValueSize = setter("max_value_size"); +export const ppuSetCollateralPercentage = setter("collateral_percentage"); +export const ppuSetMaxCollateralInputs = setter("max_collateral_inputs"); export function newProtocolParamUpdate() { return lib.ProtocolParamUpdate.new(); diff --git a/src/Internal/Serialization/Address.js b/src/Internal/Serialization/Address.js index 7764c11603..8341ec7f87 100644 --- a/src/Internal/Serialization/Address.js +++ b/src/Internal/Serialization/Address.js @@ -39,12 +39,12 @@ export function withStakeCredential(cbObj) { }; } -export var keyHashCredential = lib.StakeCredential.from_keyhash; -export var scriptHashCredential = lib.StakeCredential.from_scripthash; -export {callToBytes as addressBytes}; -export {callToBytes as byronAddressBytes}; -export {callToBytes as stakeCredentialToBytes}; -export {callToBech32 as addressBech32}; +export const keyHashCredential = lib.StakeCredential.from_keyhash; +export const scriptHashCredential = lib.StakeCredential.from_scripthash; +export { callToBytes as addressBytes }; +export { callToBytes as byronAddressBytes }; +export { callToBytes as stakeCredentialToBytes }; +export { callToBech32 as addressBech32 }; export function _addressNetworkId(toAdt) { return addr => { @@ -58,64 +58,69 @@ export function _byronAddressNetworkId(toAdt) { }; } -export var _addressFromBytes = callClassStaticMaybe("Address", "from_bytes"); +export const _addressFromBytes = callClassStaticMaybe("Address", "from_bytes"); -export var _stakeCredentialFromBytes = callClassStaticMaybe( +export const _stakeCredentialFromBytes = callClassStaticMaybe( "StakeCredential", "from_bytes" ); -export var _byronAddressFromBytes = callClassStaticMaybe( +export const _byronAddressFromBytes = callClassStaticMaybe( "ByronAddress", "from_bytes" ); -export var _addressFromBech32 = callClassStaticMaybe("Address", "from_bech32"); +export const _addressFromBech32 = callClassStaticMaybe( + "Address", + "from_bech32" +); -export var _byronAddressFromBase58 = callClassStaticMaybe( +export const _byronAddressFromBase58 = callClassStaticMaybe( "ByronAddress", "from_base58" ); -export var _baseAddressFromAddress = callClassStaticMaybe( +export const _baseAddressFromAddress = callClassStaticMaybe( "BaseAddress", "from_address" ); -export var _byronAddressFromAddress = callClassStaticMaybe( +export const _byronAddressFromAddress = callClassStaticMaybe( "ByronAddress", "from_address" ); -export var _enterpriseAddressFromAddress = callClassStaticMaybe( +export const _enterpriseAddressFromAddress = callClassStaticMaybe( "EnterpriseAddress", "from_address" ); -export var _pointerAddressFromAddress = callClassStaticMaybe( +export const _pointerAddressFromAddress = callClassStaticMaybe( "PointerAddress", "from_address" ); -export var _rewardAddressFromAddress = callClassStaticMaybe( +export const _rewardAddressFromAddress = callClassStaticMaybe( "RewardAddress", "from_address" ); -export {callToAddress as baseAddressToAddress}; -export {callToAddress as byronAddressToAddress}; -export {callToAddress as enterpriseAddressToAddress}; -export {callToAddress as pointerAddressToAddress}; -export {callToAddress as rewardAddressToAddress}; -export {callPaymentCred as baseAddressPaymentCred}; -export {callPaymentCred as rewardAddressPaymentCred}; -export {callPaymentCred as enterpriseAddressPaymentCred}; -export {callPaymentCred as pointerAddressPaymentCred}; -export {callStakeCred as baseAddressDelegationCred}; -export var byronAddressAttributes = callMethodParameterless("attributes"); -export var byronAddressIsValid = lib.ByronAddress.is_valid; -export var byronAddressToBase58 = callMethodParameterless("to_base58"); -export var byronProtocolMagic = callMethodParameterless("byron_protocol_magic"); +export { callToAddress as baseAddressToAddress }; +export { callToAddress as byronAddressToAddress }; +export { callToAddress as enterpriseAddressToAddress }; +export { callToAddress as pointerAddressToAddress }; +export { callToAddress as rewardAddressToAddress }; +export { callPaymentCred as baseAddressPaymentCred }; +export { callPaymentCred as rewardAddressPaymentCred }; +export { callPaymentCred as enterpriseAddressPaymentCred }; +export { callPaymentCred as pointerAddressPaymentCred }; +export { callStakeCred as baseAddressDelegationCred }; +export const byronAddressAttributes = callMethodParameterless("attributes"); +export const byronAddressIsValid = lib.ByronAddress.is_valid; +export const byronAddressToBase58 = callMethodParameterless("to_base58"); +export const byronProtocolMagic = callMethodParameterless( + "byron_protocol_magic" +); export function icarusFromKey(bip32pubkey) { return byronProtocolMagic => { @@ -143,7 +148,10 @@ export function _enterpriseAddress(netIdToInt) { export function _rewardAddress(netIdToInt) { return inpRec => { - return lib.RewardAddress.new(netIdToInt(inpRec.network), inpRec.paymentCred); + return lib.RewardAddress.new( + netIdToInt(inpRec.network), + inpRec.paymentCred + ); }; } diff --git a/src/Internal/Serialization/AuxiliaryData.js b/src/Internal/Serialization/AuxiliaryData.js index 0d58cce2f6..816666acf8 100644 --- a/src/Internal/Serialization/AuxiliaryData.js +++ b/src/Internal/Serialization/AuxiliaryData.js @@ -18,9 +18,9 @@ export function _hashAuxiliaryData(auxiliaryData) { return lib.hash_auxiliary_data(auxiliaryData); } -export var setAuxiliaryDataNativeScripts = setter("native_scripts"); -export var setAuxiliaryDataPlutusScripts = setter("plutus_scripts"); -export var setAuxiliaryDataGeneralTransactionMetadata = setter("metadata"); +export const setAuxiliaryDataNativeScripts = setter("native_scripts"); +export const setAuxiliaryDataPlutusScripts = setter("plutus_scripts"); +export const setAuxiliaryDataGeneralTransactionMetadata = setter("metadata"); export function newGeneralTransactionMetadata(containerHelper) { return entries => () => @@ -46,8 +46,7 @@ export function newMetadataInt(int) { } export function newMetadataBytes(bytes) { - return () => - lib.TransactionMetadatum.new_bytes(bytes); + return () => lib.TransactionMetadatum.new_bytes(bytes); } export function newMetadataText(text) { diff --git a/src/Internal/Serialization/Keys.js b/src/Internal/Serialization/Keys.js index 36f6b4a079..3c80c09b4f 100644 --- a/src/Internal/Serialization/Keys.js +++ b/src/Internal/Serialization/Keys.js @@ -2,8 +2,8 @@ const bytesFromKey = key => key.as_bytes(); -export {bytesFromKey as bytesFromPublicKey}; -export {bytesFromKey as bytesFromPrivateKey}; +export { bytesFromKey as bytesFromPublicKey }; +export { bytesFromKey as bytesFromPrivateKey }; export function publicKeyFromPrivateKey(private_key) { return private_key.to_public(); @@ -11,6 +11,6 @@ export function publicKeyFromPrivateKey(private_key) { const bech32FromX = key => key.to_bech32(); -export {bech32FromX as bech32FromPublicKey}; -export {bech32FromX as bech32FromPrivateKey}; -export {bech32FromX as bech32FromEd25519Signature}; +export { bech32FromX as bech32FromPublicKey }; +export { bech32FromX as bech32FromPrivateKey }; +export { bech32FromX as bech32FromEd25519Signature }; diff --git a/src/Internal/Serialization/MinFee.js b/src/Internal/Serialization/MinFee.js index 9733f55ab0..c2b2caee3d 100644 --- a/src/Internal/Serialization/MinFee.js +++ b/src/Internal/Serialization/MinFee.js @@ -20,6 +20,5 @@ export function _minFee(maybe) { } export function _minScriptFee(exUnitPrices) { - return tx => - lib.min_script_fee(tx, exUnitPrices); + return tx => lib.min_script_fee(tx, exUnitPrices); } diff --git a/src/Internal/Serialization/NativeScript.js b/src/Internal/Serialization/NativeScript.js index f4fa1fb425..5dfa7c46fc 100644 --- a/src/Internal/Serialization/NativeScript.js +++ b/src/Internal/Serialization/NativeScript.js @@ -14,16 +14,15 @@ export function mkScriptPubkey(keyHash) { return lib.ScriptPubkey.new(keyHash); } -export var nativeScript_new_script_pubkey = mkScript("new_script_pubkey"); -export var nativeScript_new_script_all = mkScript("new_script_all"); -export var nativeScript_new_script_any = mkScript("new_script_any"); -export var nativeScript_new_script_n_of_k = mkScript("new_script_n_of_k"); -export var nativeScript_new_timelock_start = mkScript("new_timelock_start"); -export var nativeScript_new_timelock_expiry = mkScript("new_timelock_expiry"); +export const nativeScript_new_script_pubkey = mkScript("new_script_pubkey"); +export const nativeScript_new_script_all = mkScript("new_script_all"); +export const nativeScript_new_script_any = mkScript("new_script_any"); +export const nativeScript_new_script_n_of_k = mkScript("new_script_n_of_k"); +export const nativeScript_new_timelock_start = mkScript("new_timelock_start"); +export const nativeScript_new_timelock_expiry = mkScript("new_timelock_expiry"); export function _packNativeScripts(helper) { - return nss => - helper.pack(lib.NativeScripts, nss); + return nss => helper.pack(lib.NativeScripts, nss); } export function mkScriptAll(nss) { diff --git a/src/Internal/Serialization/PlutusData.js b/src/Internal/Serialization/PlutusData.js index abe7cc7934..3933618d8c 100644 --- a/src/Internal/Serialization/PlutusData.js +++ b/src/Internal/Serialization/PlutusData.js @@ -29,8 +29,7 @@ export function _mkPlutusData_constr(constr) { } export function _packPlutusList(containerHelper) { - return elems => - containerHelper.pack(lib.PlutusList, elems); + return elems => containerHelper.pack(lib.PlutusList, elems); } export function _mkConstrPlutusData(n) { diff --git a/src/Internal/Serialization/WitnessSet.js b/src/Internal/Serialization/WitnessSet.js index 8394a1ad5a..36d16f488a 100644 --- a/src/Internal/Serialization/WitnessSet.js +++ b/src/Internal/Serialization/WitnessSet.js @@ -25,8 +25,7 @@ export function newVkeywitnesses() { } export function newVkeywitness(vkey) { - return signature => () => - lib.Vkeywitness.new(vkey, signature); + return signature => () => lib.Vkeywitness.new(vkey, signature); } export function addVkeywitness(witnesses) { @@ -42,18 +41,15 @@ export function addPlutusScript(scripts) { } export function transactionWitnessSetSetVkeys(ws) { - return vkeys => () => - ws.set_vkeys(vkeys); + return vkeys => () => ws.set_vkeys(vkeys); } export function txWitnessSetSetPlutusScripts(ws) { - return scripts => () => - ws.set_plutus_scripts(scripts); + return scripts => () => ws.set_plutus_scripts(scripts); } export function transactionWitnessSetSetNativeScripts(ws) { - return scripts => () => - ws.set_native_scripts(scripts); + return scripts => () => ws.set_native_scripts(scripts); } export function _wsSetBootstraps(helper) { @@ -91,8 +87,7 @@ export function _wsSetRedeemers(helper) { } export function _mkRedeemers(helper) { - return redeemers => - helper.pack(lib.Redeemers, redeemers); + return redeemers => helper.pack(lib.Redeemers, redeemers); } export function _wsSetPlutusScripts(helper) { diff --git a/src/Internal/Types/BigNum.js b/src/Internal/Types/BigNum.js index da69caf7f0..07c32d15cf 100644 --- a/src/Internal/Types/BigNum.js +++ b/src/Internal/Types/BigNum.js @@ -12,8 +12,8 @@ export function bnCompare(lhs) { return rhs => lhs.compare(rhs); } -export var zero = lib.BigNum.zero(); -export var one = lib.BigNum.one(); +export const zero = lib.BigNum.zero(); +export const one = lib.BigNum.one(); export function bnAdd(maybe) { return lhs => rhs => { diff --git a/src/Internal/Types/Int.js b/src/Internal/Types/Int.js index fe21eb664b..c955aa3310 100644 --- a/src/Internal/Types/Int.js +++ b/src/Internal/Types/Int.js @@ -8,8 +8,8 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { } lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); -export var newPositive = lib.Int.new; -export var newNegative = lib.Int.new_negative; +export const newPositive = lib.Int.new; +export const newNegative = lib.Int.new_negative; export function _intToStr(n) { return n.to_str(); diff --git a/src/Internal/Types/TokenName.js b/src/Internal/Types/TokenName.js index 8f1b9c785b..aac83b304a 100644 --- a/src/Internal/Types/TokenName.js +++ b/src/Internal/Types/TokenName.js @@ -22,4 +22,4 @@ export function _decodeUtf8(buffer) { // FIXME: https://github.com/Plutonomicon/cardano-transaction-lib/issues/548 const call = property => object => object[property](); -export var assetNameName = call("name"); +export const assetNameName = call("name"); diff --git a/src/Internal/Wallet.js b/src/Internal/Wallet.js index ea7d712c48..2b0966f554 100644 --- a/src/Internal/Wallet.js +++ b/src/Internal/Wallet.js @@ -40,7 +40,7 @@ const enableWallet = wallet => () => { } }; -export {enableWallet as _enableWallet}; +export { enableWallet as _enableWallet }; const isWalletAvailable = walletName => () => { checkNotNode(); @@ -51,7 +51,7 @@ const isWalletAvailable = walletName => () => { ); }; -export {isWalletAvailable as _isWalletAvailable}; +export { isWalletAvailable as _isWalletAvailable }; export function _isEnabled(walletName) { return () => { diff --git a/src/Internal/Wallet/Cip30.js b/src/Internal/Wallet/Cip30.js index efd296d2e5..23fd9d37b5 100644 --- a/src/Internal/Wallet/Cip30.js +++ b/src/Internal/Wallet/Cip30.js @@ -6,7 +6,9 @@ export function _getNetworkId(conn) { export function _getUtxos(maybe) { return conn => () => - conn.getUtxos().then(res => (res === null ? maybe.nothing : maybe.just(res))); + conn + .getUtxos() + .then(res => (res === null ? maybe.nothing : maybe.just(res))); } export function _getCollateral(maybe) { diff --git a/test/ApplyArgs.js b/test/ApplyArgs.js index cd7684ad22..52efdd22fa 100644 --- a/test/ApplyArgs.js +++ b/test/ApplyArgs.js @@ -164,4 +164,4 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { ); } -export {scripts}; +export { scripts }; diff --git a/test/Wallet/Cip30/SignData.js b/test/Wallet/Cip30/SignData.js index 33b62a195f..4ce524546d 100644 --- a/test/Wallet/Cip30/SignData.js +++ b/test/Wallet/Cip30/SignData.js @@ -45,7 +45,7 @@ export function verifySignature(coseSign1) { // ----------------------------------------------------------------------------- // _fromBytesCoseSign1 :: CborBytes -> Effect COSESign1 -export var fromBytesCoseSign1 = fromBytes("COSESign1"); +export const fromBytesCoseSign1 = fromBytes("COSESign1"); // getSignedData :: COSESign1 -> Effect CborBytes export function getSignedData(coseSign1) { @@ -63,7 +63,13 @@ const getCoseSign1ProtectedHeaders = coseSign1 => { export function _getCoseSign1ProtectedHeaderAlg(maybe) { return coseSign1 => { const protectedHeaders = getCoseSign1ProtectedHeaders(coseSign1); - return opt_chain(maybe, protectedHeaders, "algorithm_id", "as_int", "as_i32"); + return opt_chain( + maybe, + protectedHeaders, + "algorithm_id", + "as_int", + "as_i32" + ); }; } @@ -91,7 +97,7 @@ export function _getCoseSign1ProtectedHeaderKid(maybe) { // ----------------------------------------------------------------------------- // _fromBytesCoseKey :: CborBytes -> Effect COSEKey -export var fromBytesCoseKey = fromBytes("COSEKey"); +export const fromBytesCoseKey = fromBytes("COSEKey"); // _getCoseKeyHeaderKty :: MaybeFfiHelper -> COSEKey -> Maybe Int export function _getCoseKeyHeaderKty(maybe) { From b41ca18317ea5c3a7ed3ad347e04128f2ef16803 Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Fri, 30 Jun 2023 16:18:23 +0200 Subject: [PATCH 10/85] build: bump `purs` to v0.15.8 --- flake.lock | 8 ++++---- flake.nix | 2 +- nix/default.nix | 2 +- src/Internal/Affjax.purs | 5 +---- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index c5bad3c6da..2406373ba5 100644 --- a/flake.lock +++ b/flake.lock @@ -3496,17 +3496,17 @@ "easy-purescript-nix": { "flake": false, "locked": { - "lastModified": 1666686938, - "narHash": "sha256-/UOLRdnEhIOcxcm5ouOipOiSgHRzJde0ccAx4xB1dnU=", + "lastModified": 1679861376, + "narHash": "sha256-LLqaLPJNiap2U8I77K5XVPGJA/Be30Z8lyGOyYXmBlc=", "owner": "justinwoo", "repo": "easy-purescript-nix", - "rev": "da7acb2662961fd355f0a01a25bd32bf33577fa8", + "rev": "0c10ff170461aed0c336f5c21ed0f430c2c3574b", "type": "github" }, "original": { "owner": "justinwoo", "repo": "easy-purescript-nix", - "rev": "da7acb2662961fd355f0a01a25bd32bf33577fa8", + "rev": "0c10ff170461aed0c336f5c21ed0f430c2c3574b", "type": "github" } }, diff --git a/flake.nix b/flake.nix index e1c7996ec9..85a25d2457 100644 --- a/flake.nix +++ b/flake.nix @@ -35,7 +35,7 @@ flake = false; }; easy-purescript-nix = { - url = "github:justinwoo/easy-purescript-nix/da7acb2662961fd355f0a01a25bd32bf33577fa8"; + url = "github:justinwoo/easy-purescript-nix/0c10ff170461aed0c336f5c21ed0f430c2c3574b"; flake = false; }; diff --git a/nix/default.nix b/nix/default.nix index ac278b4449..c95d66ea24 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -25,7 +25,7 @@ let inherit (pkgs) system; - purs = pkgs.easy-ps.purs-0_15_4; + purs = pkgs.easy-ps.purs-0_15_8; spagoPkgs = import spagoPackages { inherit pkgs; }; diff --git a/src/Internal/Affjax.purs b/src/Internal/Affjax.purs index a03371e656..d462a6fd41 100644 --- a/src/Internal/Affjax.purs +++ b/src/Internal/Affjax.purs @@ -2,11 +2,8 @@ module Ctl.Internal.Affjax ( request ) where -import Prelude - import Affjax (AffjaxDriver) -import Affjax (Error, Request, Response) as Affjax -import Affjax (request) as Affjax +import Affjax (Error, Request, Response, request) as Affjax import Data.Either (Either) import Effect.Aff (Aff) From 8cb2766eab3b884d8403abc31f619d403377ae28 Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Mon, 3 Jul 2023 17:38:37 +0200 Subject: [PATCH 11/85] build: fix `ToData` and `FromData` instances --- src/Internal/Types/Interval.purs | 11 +++++++++-- test/Data.purs | 17 ++++++++++++++--- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/Internal/Types/Interval.purs b/src/Internal/Types/Interval.purs index 16a331cd01..57773de752 100644 --- a/src/Internal/Types/Interval.purs +++ b/src/Internal/Types/Interval.purs @@ -168,10 +168,17 @@ instance ) instance ToData a => ToData (Extended a) where - toData = genericToData + toData = case _ of + Finite a -> genericToData $ Finite $ toData a + NegInf -> genericToData (NegInf :: Extended Void) + PosInf -> genericToData (PosInf :: Extended Void) instance FromData a => FromData (Extended a) where - fromData = genericFromData + fromData pd = + (genericFromData pd :: _ (Extended PlutusData)) >>= case _ of + Finite a -> Finite <$> fromData a + NegInf -> pure NegInf + PosInf -> pure PosInf derive instance Generic (Extended a) _ derive instance Eq a => Eq (Extended a) diff --git a/test/Data.purs b/test/Data.purs index fb13b6781c..277cb6141a 100644 --- a/test/Data.purs +++ b/test/Data.purs @@ -43,7 +43,7 @@ import Data.Newtype (wrap) import Data.NonEmpty ((:|)) import Data.Show.Generic (genericShow) import Data.Traversable (for_, traverse_) -import Data.Tuple (Tuple, uncurry) +import Data.Tuple (Tuple(Tuple), uncurry) import Data.Tuple.Nested ((/\)) import Effect.Aff (Aff) import Effect.Exception (Error) @@ -536,6 +536,10 @@ data Tree a = Node a (Tuple (Tree a) (Tree a)) | Leaf a derive instance G.Generic (Tree a) _ +instance Functor Tree where + map f (Leaf a) = Leaf (f a) + map f (Node a (ltree /\ rtree)) = Node (f a) (map f ltree /\ map f rtree) + instance HasPlutusSchema (Tree a) ( "Node" := PNil @@ Z @@ -546,10 +550,17 @@ instance ) instance (ToData a) => ToData (Tree a) where - toData x = genericToData x -- https://github.com/purescript/documentation/blob/master/guides/Type-Class-Deriving.md#avoiding-stack-overflow-errors-with-recursive-types + -- https://github.com/purescript/documentation/blob/master/guides/Type-Class-Deriving.md#avoiding-stack-overflow-errors-with-recursive-types + toData t = genericToData $ map toData t instance (FromData a) => FromData (Tree a) where - fromData x = genericFromData x + fromData pd = worker =<< (genericFromData pd :: _ (Tree PlutusData)) + where + worker :: Tree PlutusData -> Maybe (Tree a) + worker = case _ of + Leaf a -> Leaf <$> fromData a + Node a (ltree /\ rtree) -> + Node <$> fromData a <*> (Tuple <$> worker ltree <*> worker rtree) fromBytesFromData :: forall a. FromData a => String -> Maybe a fromBytesFromData binary = fromData <<< PDD.convertPlutusData =<< fromBytes From 43678ef6297863368d52233745920b28c2be7238 Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Mon, 3 Jul 2023 18:18:02 +0200 Subject: [PATCH 12/85] build: use `frequency` with `NonEmptyArray` --- src/Internal/Plutip/Server.purs | 3 ++- src/Internal/Types/Interval.purs | 17 ++++++++--------- test/Data.purs | 13 +++++++------ test/Ogmios/Aeson.purs | 4 ++-- test/Plutip/UtxoDistribution.purs | 7 ++++--- 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/Internal/Plutip/Server.purs b/src/Internal/Plutip/Server.purs index 4b2e52c3d6..ef597c51d0 100644 --- a/src/Internal/Plutip/Server.purs +++ b/src/Internal/Plutip/Server.purs @@ -12,7 +12,7 @@ module Ctl.Internal.Plutip.Server import Prelude import Aeson (decodeAeson, encodeAeson, parseJsonStringToAeson, stringifyAeson) -import Affjax as Affjax +import Affjax (defaultRequest) as Affjax import Affjax.RequestBody as RequestBody import Affjax.RequestHeader as Header import Affjax.ResponseFormat as Affjax.ResponseFormat @@ -24,6 +24,7 @@ import Control.Monad.Error.Class (liftEither) import Control.Monad.State (State, execState, modify_) import Control.Monad.Trans.Class (lift) import Control.Monad.Writer (censor, execWriterT, tell) +import Ctl.Internal.Affjax (request) as Affjax import Ctl.Internal.Contract.Hooks (emptyHooks) import Ctl.Internal.Contract.Monad ( buildBackend diff --git a/src/Internal/Types/Interval.purs b/src/Internal/Types/Interval.purs index 57773de752..ad78852c6f 100644 --- a/src/Internal/Types/Interval.purs +++ b/src/Internal/Types/Interval.purs @@ -117,6 +117,8 @@ import Ctl.Internal.Types.PlutusData (PlutusData(Constr)) import Ctl.Internal.Types.SystemStart (SystemStart, sysStartUnixTime) import Data.Argonaut.Encode.Encoders (encodeString) import Data.Array (find, head, index, length) +import Data.Array.NonEmpty (singleton) as NEArray +import Data.Array.NonEmpty ((:)) import Data.Bifunctor (bimap, lmap) import Data.BigInt (BigInt) import Data.BigInt (fromInt, fromNumber, fromString, toNumber) as BigInt @@ -128,10 +130,8 @@ import Data.Lattice , class JoinSemilattice , class MeetSemilattice ) -import Data.List (List(Nil), (:)) import Data.Maybe (Maybe(Just, Nothing), fromJust, maybe) import Data.Newtype (class Newtype, unwrap, wrap) -import Data.NonEmpty ((:|)) import Data.Number (trunc, (%)) as Math import Data.Show.Generic (genericShow) import Data.Tuple (uncurry) @@ -355,14 +355,13 @@ instance (DecodeAeson a, Ord a, Ring a) => DecodeAeson (Interval a) where pure $ haskIntervalToInterval haskInterval instance (Arbitrary a, Ord a, Semiring a) => Arbitrary (Interval a) where - arbitrary = frequency $ wrap $ + arbitrary = frequency $ (0.25 /\ genFiniteInterval arbitrary) - :| (0.25 /\ genUpperRay arbitrary) - : (0.25 /\ genLowerRay arbitrary) - : (0.1 /\ genSingletonInterval) - : (0.075 /\ pure always) - : (0.075 /\ pure never) - : Nil + : (0.25 /\ genUpperRay arbitrary) + : (0.25 /\ genLowerRay arbitrary) + : (0.1 /\ genSingletonInterval) + : (0.075 /\ pure always) + : NEArray.singleton (0.075 /\ pure never) -- | those accept a generator since we want to use them -- | for Positive Integers in tests diff --git a/test/Data.purs b/test/Data.purs index 277cb6141a..4b784b6e4b 100644 --- a/test/Data.purs +++ b/test/Data.purs @@ -33,6 +33,7 @@ import Ctl.Internal.TypeLevel.RowList.Unordered.Indexed import Ctl.Internal.Types.BigNum as BigNum import Ctl.Internal.Types.ByteArray (hexToByteArrayUnsafe) import Ctl.Internal.Types.PlutusData (PlutusData(Constr, Integer)) +import Data.Array.NonEmpty (fromNonEmpty) as NEArray import Data.BigInt (BigInt) import Data.BigInt as BigInt import Data.Either (Either(Left, Right)) @@ -408,9 +409,9 @@ instance ToData FType' where instance Arbitrary CType where arbitrary = - (frequency <<< wrap) $ + (frequency <<< NEArray.fromNonEmpty) $ (0.25 /\ pure C0) - :| List.fromFoldable + :| [ 0.25 /\ (C1 <$> arbitrary) , 0.25 /\ (C2 <$> arbitrary <*> arbitrary) , 0.25 /\ (C3 <$> arbitrary <*> arbitrary <*> arbitrary) @@ -420,17 +421,17 @@ instance Arbitrary EType where arbitrary = genericArbitrary instance Arbitrary DType where - arbitrary = fix \_ -> (frequency <<< wrap) $ + arbitrary = fix \_ -> frequency $ NEArray.fromNonEmpty $ 0.4 /\ (D0 <$> arbitrary <*> arbitrary <*> arbitrary) - :| List.fromFoldable + :| [ 0.4 /\ (D2 <$> arbitrary) , 0.2 /\ (D1 <$> arbitrary) ] instance Arbitrary FType where - arbitrary = fix \_ -> (frequency <<< wrap) $ + arbitrary = fix \_ -> frequency $ NEArray.fromNonEmpty $ 0.4 /\ (F0 <$> ({ f0A: _ } <<< unwrap <$> arbitrary)) - :| List.fromFoldable + :| [ 0.4 /\ ( F1 <$> ( { f1A: _, f1B: _, f1C: _ } <$> arbitrary <*> arbitrary <*> diff --git a/test/Ogmios/Aeson.purs b/test/Ogmios/Aeson.purs index 7d6ca074af..f5f6cd2416 100644 --- a/test/Ogmios/Aeson.purs +++ b/test/Ogmios/Aeson.purs @@ -127,8 +127,8 @@ loadFixtures = do printEvaluateTxFailures :: Effect Unit printEvaluateTxFailures = launchAff_ do - fixtures <- loadFixtures <#> filter (fst >>> (_ == "EvaluateTx")) >>> map snd - flip (traverse >>> traverse) fixtures \{ aeson } -> do + fixtures <- loadFixtures <#> filter (fst >>> eq "EvaluateTx") >>> map snd + void $ flip (traverse >>> traverse) fixtures \{ aeson } -> do let response = hush $ Aeson.decodeAeson aeson :: _ O.TxEvaluationR mbFailure = response >>= unwrap >>> either pure (const Nothing) diff --git a/test/Plutip/UtxoDistribution.purs b/test/Plutip/UtxoDistribution.purs index 8596de608b..36e91ae977 100644 --- a/test/Plutip/UtxoDistribution.purs +++ b/test/Plutip/UtxoDistribution.purs @@ -44,6 +44,7 @@ import Control.Lazy (fix) import Ctl.Internal.Test.TestPlanM (TestPlanM) import Ctl.Internal.Test.UtxoDistribution (encodeDistribution, keyWallets) import Data.Array (foldl, head, replicate, zip) +import Data.Array.NonEmpty (fromNonEmpty) as NEArray import Data.BigInt (BigInt) import Data.BigInt (fromInt, toString) as BigInt import Data.Foldable (intercalate) @@ -137,9 +138,9 @@ genInitialUtxo = map (BigInt.fromInt >>> (_ * BigInt.fromInt 1_000_000)) <$> arrayOf (chooseInt 1 1000) instance Arbitrary ArbitraryUtxoDistr where - arbitrary = fix \_ -> sized $ \size -> resize size $ frequency <<< wrap $ - (1.0 /\ pure UDUnit) :| - List.fromFoldable + arbitrary = + fix \_ -> sized $ \size -> resize size $ frequency $ NEArray.fromNonEmpty $ + (1.0 /\ pure UDUnit) :| [ 2.0 /\ (UDInitialUtxos <$> genInitialUtxo) , 2.0 /\ ( UDInitialUtxosWithStake <$> From 389c5ce435c0fdfb2798f24cbb8ae8baddd0ed4c Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Mon, 3 Jul 2023 19:08:15 +0200 Subject: [PATCH 13/85] build: use `exists` from `Node.FS.Sync` (ctl compiles!) --- src/Internal/Test/E2E/Runner.purs | 18 ++++++++++-------- src/Internal/Test/KeyDir.purs | 5 +++-- test/Blockfrost/GenerateFixtures/Helpers.purs | 5 +++-- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/Internal/Test/E2E/Runner.purs b/src/Internal/Test/E2E/Runner.purs index c640a10530..c14aec7ae6 100644 --- a/src/Internal/Test/E2E/Runner.purs +++ b/src/Internal/Test/E2E/Runner.purs @@ -7,12 +7,13 @@ module Ctl.Internal.Test.E2E.Runner import Prelude -import Affjax (defaultRequest, request) as Affjax +import Affjax (defaultRequest) as Affjax import Affjax (printError) import Affjax.ResponseFormat as Affjax.ResponseFormat import Control.Alt ((<|>)) import Control.Monad.Error.Class (liftMaybe) import Control.Promise (Promise, toAffE) +import Ctl.Internal.Affjax (request) as Affjax import Ctl.Internal.Contract.Hooks (emptyHooks) import Ctl.Internal.Contract.QueryBackend (QueryBackend(CtlBackend)) import Ctl.Internal.Deserialization.Keys (privateKeyFromBytes) @@ -127,8 +128,9 @@ import Node.ChildProcess ) import Node.ChildProcess as ChildProcess import Node.Encoding as Encoding -import Node.FS.Aff (exists, stat, writeFile) +import Node.FS.Aff (stat, writeFile) import Node.FS.Stats (isDirectory) +import Node.FS.Sync (exists) import Node.Path (FilePath, concat, dirname, relative) import Node.Process (lookupEnv) import Node.Stream (onDataString) @@ -172,7 +174,7 @@ runE2ECommand = case _ of ensureDir :: FilePath -> Aff Unit ensureDir dir = do - dirExists <- exists dir + dirExists <- liftEffect $ exists dir unless dirExists $ do liftEffect $ log $ "Creating directory " <> dir void $ spawnAndCollectOutput "mkdir" [ "-p", dir ] @@ -635,7 +637,7 @@ findSettingsArchive testOptions = do ) pure $ testOptions.settingsArchive - doesExist <- exists settingsArchive + doesExist <- liftEffect $ exists settingsArchive unless doesExist $ do -- Download settings archive from URL if file does not exist @@ -665,7 +667,7 @@ findChromeProfile testOptions = do ) pure $ testOptions.chromeUserDataDir - doesExist <- exists chromeDataDir + doesExist <- liftEffect $ exists chromeDataDir unless doesExist $ ensureChromeUserDataDir chromeDataDir isDir <- isDirectory <$> stat chromeDataDir @@ -725,7 +727,7 @@ readExtensionParams extName wallets = do case crxFile, password, extensionId of Nothing, Nothing, Nothing -> pure Nothing Just crx, Just pwd, Just extId -> do - doesExist <- exists crx + doesExist <- liftEffect $ exists crx unless doesExist $ do -- Download from specified URL if crx file does not exist crxFileUrl <- @@ -759,7 +761,7 @@ packSettings :: SettingsArchive -> ChromeUserDataDir -> Aff Unit packSettings settingsArchive userDataDir = do -- Passing a non-existent directory to tar will error, -- but we can't rely on the existence of these directories. - paths <- filterExistingPaths userDataDir + paths <- liftEffect $ filterExistingPaths userDataDir [ "./Default/IndexedDB/" , "./Default/Local Storage/" , "./Default/Extension State" @@ -786,7 +788,7 @@ packSettings settingsArchive userDataDir = do defaultErrorReader -- | Filter out non-existing paths, relative to the given directory -filterExistingPaths :: FilePath -> Array FilePath -> Aff (Array FilePath) +filterExistingPaths :: FilePath -> Array FilePath -> Effect (Array FilePath) filterExistingPaths base paths = do catMaybes <$> for paths \path -> do exists (concat [ base, path ]) >>= case _ of diff --git a/src/Internal/Test/KeyDir.purs b/src/Internal/Test/KeyDir.purs index 5b471652e6..3598fbe1ae 100644 --- a/src/Internal/Test/KeyDir.purs +++ b/src/Internal/Test/KeyDir.purs @@ -106,7 +106,8 @@ import Effect.Exception (error, throw) import Effect.Ref as Ref import Mote.Monad (mapTest) import Node.Encoding (Encoding(UTF8)) -import Node.FS.Aff (exists, mkdir, readTextFile, readdir, writeTextFile) +import Node.FS.Aff (mkdir, readTextFile, readdir, writeTextFile) +import Node.FS.Sync (exists) import Node.Path (FilePath) import Node.Path (concat) as Path import Type.Prelude (Proxy(Proxy)) @@ -254,7 +255,7 @@ restoreWallets backup = do [ backup, walletDir, "stake_signing_key" ] inactiveFlagFile = Path.concat [ backup, walletDir, "inactive" ] -- Skip this wallet if it was marked as inactive - exists inactiveFlagFile >>= case _ of + liftEffect (exists inactiveFlagFile) >>= case _ of true -> pure Nothing false -> do paymentKeyEnvelope <- readTextFile UTF8 paymentKeyFilePath diff --git a/test/Blockfrost/GenerateFixtures/Helpers.purs b/test/Blockfrost/GenerateFixtures/Helpers.purs index a5effdce4d..5adb2fdbc6 100644 --- a/test/Blockfrost/GenerateFixtures/Helpers.purs +++ b/test/Blockfrost/GenerateFixtures/Helpers.purs @@ -29,7 +29,8 @@ import Data.Maybe (Maybe(Just, Nothing), maybe) import Data.String (take) as String import Effect.Exception (throw) import Node.Encoding (Encoding(UTF8)) -import Node.FS.Aff (exists, writeTextFile) +import Node.FS.Aff (writeTextFile) +import Node.FS.Sync (exists) import Node.Path (concat) import Node.Process (lookupEnv) @@ -90,7 +91,7 @@ storeBlockfrostFixture i query resp = do let filename = query <> "-" <> respHash <> ".json" fp = concat [ "fixtures", "test", "blockfrost", query, filename ] - exists fp >>= flip unless + liftEffect (exists fp) >>= flip unless ( writeTextFile UTF8 fp resp *> log ("Successfully saved fixture #" <> show i <> " to: " <> fp) ) From 3ac0f743259e0e8fea0f3932dbf8c8ebda723c9b Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Tue, 4 Jul 2023 18:04:02 +0200 Subject: [PATCH 14/85] build: multiple changes 1. use esm imports 2. do not re-export `Undefined` from `Contract.Prelude` 3. fix CIP-30 mock, use `global` object in Node.js environment --- examples/AlwaysMints.js | 5 ++-- examples/AlwaysSucceeds.js | 5 ++-- examples/ECDSA.js | 5 ++-- examples/ExUnits.js | 5 ++-- examples/IncludeDatum.js | 5 ++-- examples/Lose7Ada.js | 5 ++-- examples/MintsMultipleTokens.js | 5 ++-- examples/MultipleRedeemers.js | 5 ++-- examples/OneShotMinting.js | 5 ++-- examples/OtherTypeTextEnvelope.js | 8 ++---- examples/PlutusV2/InlineDatum.js | 8 ++---- examples/PlutusV2/OneShotMinting.js | 8 ++---- examples/PlutusV2/Scripts/AlwaysMints.js | 5 ++-- examples/PlutusV2/Scripts/AlwaysSucceeds.js | 5 ++-- examples/Schnorr.js | 5 ++-- package.json | 2 +- spago.dhall | 1 - src/Contract/Prelude.purs | 2 -- src/Internal/ApplyArgs.js | 13 +++++----- src/Internal/BalanceTx/UtxoMinAda.js | 7 +++--- src/Internal/Base64.js | 2 +- src/Internal/Deserialization/FromBytes.js | 7 +++--- src/Internal/Deserialization/Keys.js | 7 +++--- src/Internal/Deserialization/Language.js | 7 +++--- src/Internal/Deserialization/NativeScript.js | 7 +++--- src/Internal/Deserialization/PlutusData.js | 7 +++--- src/Internal/Deserialization/Transaction.js | 7 +++--- src/Internal/Deserialization/UnspentOutput.js | 7 +++--- src/Internal/Hashing.js | 7 +++--- src/Internal/JsWebSocket.js | 3 ++- src/Internal/Serialization.js | 7 +++--- src/Internal/Serialization/Address.js | 7 +++--- src/Internal/Serialization/AuxiliaryData.js | 7 +++--- src/Internal/Serialization/BigInt.js | 7 +++--- src/Internal/Serialization/Hash.js | 7 +++--- src/Internal/Serialization/MinFee.js | 7 +++--- src/Internal/Serialization/NativeScript.js | 7 +++--- src/Internal/Serialization/PlutusData.js | 7 +++--- src/Internal/Serialization/PlutusScript.js | 7 +++--- src/Internal/Serialization/WitnessSet.js | 7 +++--- src/Internal/Types/BigNum.js | 7 +++--- src/Internal/Types/Int.js | 7 +++--- src/Internal/Types/TokenName.js | 3 ++- src/Internal/Wallet.js | 22 +++++++++------- src/Internal/Wallet/Bip32.js | 8 +++--- src/Internal/Wallet/Cip30/SignData.js | 4 +-- src/Internal/Wallet/Cip30Mock.js | 25 ++++++++----------- test/ApplyArgs.js | 5 ++-- test/Wallet/Bip32.purs | 4 +-- test/Wallet/Cip30/SignData.js | 13 +++++----- 50 files changed, 168 insertions(+), 170 deletions(-) diff --git a/examples/AlwaysMints.js b/examples/AlwaysMints.js index f859dd0747..02f260c016 100644 --- a/examples/AlwaysMints.js +++ b/examples/AlwaysMints.js @@ -4,10 +4,9 @@ let script; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { script = require("Scripts/always-mints.plutus"); } else { - const fs = require("fs"); - const path = require("path"); + const fs = await import("fs"); script = fs.readFileSync( - path.resolve(__dirname, "../../fixtures/scripts/always-mints.plutus"), + new URL("../../fixtures/scripts/always-mints.plutus", import.meta.url), "utf8" ); } diff --git a/examples/AlwaysSucceeds.js b/examples/AlwaysSucceeds.js index 7ee323003d..5d75bf263b 100644 --- a/examples/AlwaysSucceeds.js +++ b/examples/AlwaysSucceeds.js @@ -4,10 +4,9 @@ let script; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { script = require("Scripts/always-succeeds.plutus"); } else { - const fs = require("fs"); - const path = require("path"); + const fs = await import("fs"); script = fs.readFileSync( - path.resolve(__dirname, "../../fixtures/scripts/always-succeeds.plutus"), + new URL("../../fixtures/scripts/always-succeeds.plutus", import.meta.url), "utf8" ); } diff --git a/examples/ECDSA.js b/examples/ECDSA.js index a1d874fd3b..00f53cbbbb 100644 --- a/examples/ECDSA.js +++ b/examples/ECDSA.js @@ -4,10 +4,9 @@ let script; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { script = require("Scripts/validate-ecdsa.plutus"); } else { - const fs = require("fs"); - const path = require("path"); + const fs = await import("fs"); script = fs.readFileSync( - path.resolve(__dirname, "../../fixtures/scripts/validate-ecdsa.plutus"), + new URL("../../fixtures/scripts/validate-ecdsa.plutus", import.meta.url), "utf8" ); } diff --git a/examples/ExUnits.js b/examples/ExUnits.js index 3e0039a9a1..fc79dcf4a4 100644 --- a/examples/ExUnits.js +++ b/examples/ExUnits.js @@ -4,10 +4,9 @@ let script; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { script = require("Scripts/exunits.plutus"); } else { - const fs = require("fs"); - const path = require("path"); + const fs = await import("fs"); script = fs.readFileSync( - path.resolve(__dirname, "../../fixtures/scripts/exunits.plutus"), + new URL("../../fixtures/scripts/exunits.plutus", import.meta.url), "utf8" ); } diff --git a/examples/IncludeDatum.js b/examples/IncludeDatum.js index fa1910b6ba..fb9f62e27d 100644 --- a/examples/IncludeDatum.js +++ b/examples/IncludeDatum.js @@ -4,10 +4,9 @@ let script; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { script = require("Scripts/include-datum.plutus"); } else { - const fs = require("fs"); - const path = require("path"); + const fs = await import("fs"); script = fs.readFileSync( - path.resolve(__dirname, "../../fixtures/scripts/include-datum.plutus"), + new URL("../../fixtures/scripts/include-datum.plutus", import.meta.url), "utf8" ); } diff --git a/examples/Lose7Ada.js b/examples/Lose7Ada.js index 0b7f92ab79..a1e8d12c82 100644 --- a/examples/Lose7Ada.js +++ b/examples/Lose7Ada.js @@ -4,10 +4,9 @@ let script; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { script = require("Scripts/always-fails.plutus"); } else { - const fs = require("fs"); - const path = require("path"); + const fs = await import("fs"); script = fs.readFileSync( - path.resolve(__dirname, "../../fixtures/scripts/always-fails.plutus"), + new URL("../../fixtures/scripts/always-fails.plutus", import.meta.url), "utf8" ); } diff --git a/examples/MintsMultipleTokens.js b/examples/MintsMultipleTokens.js index 98f9152cd2..99429d16db 100644 --- a/examples/MintsMultipleTokens.js +++ b/examples/MintsMultipleTokens.js @@ -7,11 +7,10 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { redeemerInt2 = require("Scripts/redeemer2.plutus"); redeemerInt3 = require("Scripts/redeemer3.plutus"); } else { - const fs = require("fs"); - const path = require("path"); + const fs = await import("fs"); const readScript = name => fs.readFileSync( - path.resolve(__dirname, `../../fixtures/scripts/${name}.plutus`), + new URL(`../../fixtures/scripts/${name}.plutus`, import.meta.url), "utf8" ); redeemerInt1 = readScript("redeemer1"); diff --git a/examples/MultipleRedeemers.js b/examples/MultipleRedeemers.js index f24ce0146c..09bf66dbe3 100644 --- a/examples/MultipleRedeemers.js +++ b/examples/MultipleRedeemers.js @@ -7,11 +7,10 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { vredeemerInt2 = require("Scripts/redeemer2-validator.plutus"); vredeemerInt3 = require("Scripts/redeemer3-validator.plutus"); } else { - const fs = require("fs"); - const path = require("path"); + const fs = await import("fs"); const readScript = name => fs.readFileSync( - path.resolve(__dirname, `../../fixtures/scripts/${name}.plutus`), + new URL(`../../fixtures/scripts/${name}.plutus`, import.meta.url), "utf8" ); vredeemerInt1 = readScript("redeemer1-validator"); diff --git a/examples/OneShotMinting.js b/examples/OneShotMinting.js index 214afcd266..9a7374aa8f 100644 --- a/examples/OneShotMinting.js +++ b/examples/OneShotMinting.js @@ -4,10 +4,9 @@ let script; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { script = require("Scripts/one-shot-minting.plutus"); } else { - const fs = require("fs"); - const path = require("path"); + const fs = await import("fs"); script = fs.readFileSync( - path.resolve(__dirname, "../../fixtures/scripts/one-shot-minting.plutus"), + new URL("../../fixtures/scripts/one-shot-minting.plutus", import.meta.url), "utf8" ); } diff --git a/examples/OtherTypeTextEnvelope.js b/examples/OtherTypeTextEnvelope.js index 6a27e2121a..3f2ec80bc8 100644 --- a/examples/OtherTypeTextEnvelope.js +++ b/examples/OtherTypeTextEnvelope.js @@ -4,13 +4,9 @@ let script; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { script = require("Scripts/other-type-text-envelope.plutus"); } else { - const fs = require("fs"); - const path = require("path"); + const fs = await import("fs"); script = fs.readFileSync( - path.resolve( - __dirname, - "../../fixtures/scripts/other-type-text-envelope.plutus" - ), + new URL("../../fixtures/scripts/other-type-text-envelope.plutus", import.meta.url), "utf8" ); } diff --git a/examples/PlutusV2/InlineDatum.js b/examples/PlutusV2/InlineDatum.js index 4d65a94e99..4be7191c5f 100644 --- a/examples/PlutusV2/InlineDatum.js +++ b/examples/PlutusV2/InlineDatum.js @@ -4,13 +4,9 @@ let script; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { script = require("Scripts/check-datum-is-inline.plutus"); } else { - const fs = require("fs"); - const path = require("path"); + const fs = await import("fs"); script = fs.readFileSync( - path.resolve( - __dirname, - "../../fixtures/scripts/check-datum-is-inline.plutus" - ), + new URL("../../fixtures/scripts/check-datum-is-inline.plutus", import.meta.url), "utf8" ); } diff --git a/examples/PlutusV2/OneShotMinting.js b/examples/PlutusV2/OneShotMinting.js index c4e3a66a6c..b94acb8ecb 100644 --- a/examples/PlutusV2/OneShotMinting.js +++ b/examples/PlutusV2/OneShotMinting.js @@ -4,13 +4,9 @@ let script; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { script = require("Scripts/one-shot-minting-v2.plutus"); } else { - const fs = require("fs"); - const path = require("path"); + const fs = await import("fs"); script = fs.readFileSync( - path.resolve( - __dirname, - "../../fixtures/scripts/one-shot-minting-v2.plutus" - ), + new URL("../../fixtures/scripts/one-shot-minting-v2.plutus", import.meta.url), "utf8" ); } diff --git a/examples/PlutusV2/Scripts/AlwaysMints.js b/examples/PlutusV2/Scripts/AlwaysMints.js index 995ee1f572..dee3ecf8e1 100644 --- a/examples/PlutusV2/Scripts/AlwaysMints.js +++ b/examples/PlutusV2/Scripts/AlwaysMints.js @@ -4,10 +4,9 @@ let script; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { script = require("Scripts/always-mints-v2.plutus"); } else { - const fs = require("fs"); - const path = require("path"); + const fs = await import("fs"); script = fs.readFileSync( - path.resolve(__dirname, "../../fixtures/scripts/always-mints-v2.plutus"), + new URL("../../fixtures/scripts/always-mints-v2.plutus", import.meta.url), "utf8" ); } diff --git a/examples/PlutusV2/Scripts/AlwaysSucceeds.js b/examples/PlutusV2/Scripts/AlwaysSucceeds.js index 63748d5aa4..849cceaeb3 100644 --- a/examples/PlutusV2/Scripts/AlwaysSucceeds.js +++ b/examples/PlutusV2/Scripts/AlwaysSucceeds.js @@ -4,10 +4,9 @@ let script; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { script = require("Scripts/always-succeeds-v2.plutus"); } else { - const fs = require("fs"); - const path = require("path"); + const fs = await import("fs"); script = fs.readFileSync( - path.resolve(__dirname, "../../fixtures/scripts/always-succeeds-v2.plutus"), + new URL("../../fixtures/scripts/always-succeeds-v2.plutus", import.meta.url), "utf8" ); } diff --git a/examples/Schnorr.js b/examples/Schnorr.js index 2bb28622c9..49e261a898 100644 --- a/examples/Schnorr.js +++ b/examples/Schnorr.js @@ -4,10 +4,9 @@ let script; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { script = require("Scripts/validate-schnorr.plutus"); } else { - const fs = require("fs"); - const path = require("path"); + const fs = await import("fs"); script = fs.readFileSync( - path.resolve(__dirname, "../../fixtures/scripts/validate-schnorr.plutus"), + new URL("../../fixtures/scripts/validate-schnorr.plutus", import.meta.url), "utf8" ); } diff --git a/package.json b/package.json index 02c5bbc144..4851ef3fb3 100755 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "repository": { "type": "git", "url": "https://github.com/Plutonomicon/cardano-transaction-lib.git" - }, + }, "directories": { "test": "test" }, diff --git a/spago.dhall b/spago.dhall index b7ca7cfcd5..3fe7222b57 100644 --- a/spago.dhall +++ b/spago.dhall @@ -88,7 +88,6 @@ You can edit this file as you like. , "typelevel" , "typelevel-prelude" , "uint" - , "undefined" , "unfoldable" , "untagged-union" , "variant" diff --git a/src/Contract/Prelude.purs b/src/Contract/Prelude.purs index abf720b6a7..721c776f55 100644 --- a/src/Contract/Prelude.purs +++ b/src/Contract/Prelude.purs @@ -16,7 +16,6 @@ module Contract.Prelude , module Traversable , module Tuple , module TupleNested - , module Undefined ) where -- Imports for extra functions: @@ -334,7 +333,6 @@ import Prelude , (>>>) , (||) ) as PurescriptPrelude -import Undefined (undefined) as Undefined mconcat :: forall (f :: Type -> Type) (m :: Type). Foldable f => Monoid m => f m -> m diff --git a/src/Internal/ApplyArgs.js b/src/Internal/ApplyArgs.js index b2b9a457c6..5d382749fd 100644 --- a/src/Internal/ApplyArgs.js +++ b/src/Internal/ApplyArgs.js @@ -3,14 +3,15 @@ let lib; let apply_args; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); - apply_args = require("apply-args-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); + apply_args = await import("apply-args-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); - apply_args = require("apply-args-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + apply_args = await import("apply-args-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); -apply_args = require("@mlabs-haskell/csl-gc-wrapper")(apply_args); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); +// apply_args = gcWrapper(apply_args); /** * @param {} left diff --git a/src/Internal/BalanceTx/UtxoMinAda.js b/src/Internal/BalanceTx/UtxoMinAda.js index e42976d2bb..023f7a2907 100644 --- a/src/Internal/BalanceTx/UtxoMinAda.js +++ b/src/Internal/BalanceTx/UtxoMinAda.js @@ -2,11 +2,12 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); export function minAdaForOutput(maybe) { return txOutput => dataCost => { diff --git a/src/Internal/Base64.js b/src/Internal/Base64.js index bd67608948..f05f0819e8 100644 --- a/src/Internal/Base64.js +++ b/src/Internal/Base64.js @@ -1,4 +1,4 @@ -import base64 from "base64-js"; +import * as base64 from "base64-js"; export const fromByteArray = base64.fromByteArray; export const toByteArray = base64.toByteArray; diff --git a/src/Internal/Deserialization/FromBytes.js b/src/Internal/Deserialization/FromBytes.js index 4f8820334c..62589355c6 100644 --- a/src/Internal/Deserialization/FromBytes.js +++ b/src/Internal/Deserialization/FromBytes.js @@ -2,11 +2,12 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); export function _fromBytes(helper) { return name => bytes => { diff --git a/src/Internal/Deserialization/Keys.js b/src/Internal/Deserialization/Keys.js index 0e76d24adb..c256eff377 100644 --- a/src/Internal/Deserialization/Keys.js +++ b/src/Internal/Deserialization/Keys.js @@ -2,11 +2,12 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); export function freshPrivateKey() { return lib.PrivateKey.generate_ed25519(); diff --git a/src/Internal/Deserialization/Language.js b/src/Internal/Deserialization/Language.js index 3dfeb32ced..03868dff95 100644 --- a/src/Internal/Deserialization/Language.js +++ b/src/Internal/Deserialization/Language.js @@ -2,11 +2,12 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); export function _convertLanguage(langCtors) { return cslLang => { diff --git a/src/Internal/Deserialization/NativeScript.js b/src/Internal/Deserialization/NativeScript.js index fdc5dc64c4..3e8ff3f628 100644 --- a/src/Internal/Deserialization/NativeScript.js +++ b/src/Internal/Deserialization/NativeScript.js @@ -2,11 +2,12 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); export function _convertNativeScript(handler) { return ns => { diff --git a/src/Internal/Deserialization/PlutusData.js b/src/Internal/Deserialization/PlutusData.js index eee1077500..62f5dc7752 100644 --- a/src/Internal/Deserialization/PlutusData.js +++ b/src/Internal/Deserialization/PlutusData.js @@ -2,11 +2,12 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); export function _convertPlutusData(handle) { return pd => { diff --git a/src/Internal/Deserialization/Transaction.js b/src/Internal/Deserialization/Transaction.js index 4de02b2e2c..0c049c0251 100644 --- a/src/Internal/Deserialization/Transaction.js +++ b/src/Internal/Deserialization/Transaction.js @@ -2,11 +2,12 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); const call = property => object => object[property](); const callMaybe = property => maybe => object => { diff --git a/src/Internal/Deserialization/UnspentOutput.js b/src/Internal/Deserialization/UnspentOutput.js index 976b56fb66..733f2ca976 100644 --- a/src/Internal/Deserialization/UnspentOutput.js +++ b/src/Internal/Deserialization/UnspentOutput.js @@ -2,11 +2,12 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); const call = property => object => object[property](); const callMaybe = property => maybe => object => { diff --git a/src/Internal/Hashing.js b/src/Internal/Hashing.js index 319382353d..2d174a493a 100644 --- a/src/Internal/Hashing.js +++ b/src/Internal/Hashing.js @@ -7,11 +7,12 @@ import SHA3 from "jssha/dist/sha3"; let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); export function blake2b224Hash(bytesToHash) { return Blake2.blake2b(bytesToHash, null, 28); diff --git a/src/Internal/JsWebSocket.js b/src/Internal/JsWebSocket.js index 38873999ec..8a41647af2 100644 --- a/src/Internal/JsWebSocket.js +++ b/src/Internal/JsWebSocket.js @@ -4,7 +4,8 @@ import ReconnectingWebSocket from "reconnecting-websocket"; let OurWebSocket; if (typeof BROWSER_RUNTIME == "undefined" || !BROWSER_RUNTIME) { - OurWebSocket = require("ws"); + const { default: WebSocket } = await import("ws"); + OurWebSocket = WebSocket; } else { OurWebSocket = WebSocket; } diff --git a/src/Internal/Serialization.js b/src/Internal/Serialization.js index 4473a01b46..59d2f9c15a 100644 --- a/src/Internal/Serialization.js +++ b/src/Internal/Serialization.js @@ -2,11 +2,12 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); const setter = prop => obj => value => () => obj["set_" + prop](value); diff --git a/src/Internal/Serialization/Address.js b/src/Internal/Serialization/Address.js index 8341ec7f87..b844a972d1 100644 --- a/src/Internal/Serialization/Address.js +++ b/src/Internal/Serialization/Address.js @@ -2,11 +2,12 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); const callClassStaticMaybe = (classname, functionname) => maybe => input => { let ret = null; diff --git a/src/Internal/Serialization/AuxiliaryData.js b/src/Internal/Serialization/AuxiliaryData.js index 816666acf8..f1dd931461 100644 --- a/src/Internal/Serialization/AuxiliaryData.js +++ b/src/Internal/Serialization/AuxiliaryData.js @@ -2,11 +2,12 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); const setter = prop => obj => value => () => obj["set_" + prop](value); diff --git a/src/Internal/Serialization/BigInt.js b/src/Internal/Serialization/BigInt.js index 79f0d2bc8d..7128252129 100644 --- a/src/Internal/Serialization/BigInt.js +++ b/src/Internal/Serialization/BigInt.js @@ -2,11 +2,12 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); export function _BigInt_from_str(helper) { return str => { diff --git a/src/Internal/Serialization/Hash.js b/src/Internal/Serialization/Hash.js index 861e937d63..783ec38c8e 100644 --- a/src/Internal/Serialization/Hash.js +++ b/src/Internal/Serialization/Hash.js @@ -2,11 +2,12 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); export function hashToBytes(hash) { return hash.to_bytes(); diff --git a/src/Internal/Serialization/MinFee.js b/src/Internal/Serialization/MinFee.js index c2b2caee3d..3a3d0cd86b 100644 --- a/src/Internal/Serialization/MinFee.js +++ b/src/Internal/Serialization/MinFee.js @@ -2,11 +2,12 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); export function _minFee(maybe) { return tx => txFeeFixed => txFeePerByte => { diff --git a/src/Internal/Serialization/NativeScript.js b/src/Internal/Serialization/NativeScript.js index 5dfa7c46fc..cbdb38801f 100644 --- a/src/Internal/Serialization/NativeScript.js +++ b/src/Internal/Serialization/NativeScript.js @@ -2,11 +2,12 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); const mkScript = prop => arg => lib.NativeScript[prop](arg); diff --git a/src/Internal/Serialization/PlutusData.js b/src/Internal/Serialization/PlutusData.js index 3933618d8c..4c1c8681eb 100644 --- a/src/Internal/Serialization/PlutusData.js +++ b/src/Internal/Serialization/PlutusData.js @@ -2,11 +2,12 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); export function _mkPlutusData_bytes(bytes) { return lib.PlutusData.new_bytes(bytes); diff --git a/src/Internal/Serialization/PlutusScript.js b/src/Internal/Serialization/PlutusScript.js index 607f6575e7..eec7011813 100644 --- a/src/Internal/Serialization/PlutusScript.js +++ b/src/Internal/Serialization/PlutusScript.js @@ -2,11 +2,12 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); export function newPlutusV1Script(bytes) { return lib.PlutusScript.new(bytes); diff --git a/src/Internal/Serialization/WitnessSet.js b/src/Internal/Serialization/WitnessSet.js index 36d16f488a..28a736895c 100644 --- a/src/Internal/Serialization/WitnessSet.js +++ b/src/Internal/Serialization/WitnessSet.js @@ -2,11 +2,12 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); export function newTransactionWitnessSet() { return lib.TransactionWitnessSet.new(); diff --git a/src/Internal/Types/BigNum.js b/src/Internal/Types/BigNum.js index 07c32d15cf..d0acc28e10 100644 --- a/src/Internal/Types/BigNum.js +++ b/src/Internal/Types/BigNum.js @@ -2,11 +2,12 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); export function bnCompare(lhs) { return rhs => lhs.compare(rhs); diff --git a/src/Internal/Types/Int.js b/src/Internal/Types/Int.js index c955aa3310..0446f9d776 100644 --- a/src/Internal/Types/Int.js +++ b/src/Internal/Types/Int.js @@ -2,11 +2,12 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); export const newPositive = lib.Int.new; export const newNegative = lib.Int.new_negative; diff --git a/src/Internal/Types/TokenName.js b/src/Internal/Types/TokenName.js index aac83b304a..f432d39277 100644 --- a/src/Internal/Types/TokenName.js +++ b/src/Internal/Types/TokenName.js @@ -3,7 +3,8 @@ // `TextDecoder` is not available in `node`, use polyfill in that case let OurTextDecoder; if (typeof BROWSER_RUNTIME == "undefined" || !BROWSER_RUNTIME) { - OurTextDecoder = require("util").TextDecoder; + const util = await import("util"); + OurTextDecoder = util.TextDecoder; } else { OurTextDecoder = TextDecoder; } diff --git a/src/Internal/Wallet.js b/src/Internal/Wallet.js index 2b0966f554..74afb8afef 100644 --- a/src/Internal/Wallet.js +++ b/src/Internal/Wallet.js @@ -1,5 +1,9 @@ /* global BROWSER_RUNTIME */ +function getWindow() { + return typeof window != "undefined" ? window : global.window_; +} + const getIsWalletAvailableTagName = wallet => { const strs = { nami: "NamiWallet", @@ -18,14 +22,14 @@ const nodeEnvError = new Error( ); const checkNotNode = () => { - if (typeof window != "object") { + if (typeof getWindow() != "object") { throw nodeEnvError; } }; const enableWallet = wallet => () => { if (isWalletAvailable(wallet)()) { - return window.cardano[wallet].enable().catch(e => { + return getWindow().cardano[wallet].enable().catch(e => { throw new Error( "enableWallet failed: " + (typeof e.info == "string" ? e.info : e.toString()) @@ -45,9 +49,9 @@ export { enableWallet as _enableWallet }; const isWalletAvailable = walletName => () => { checkNotNode(); return ( - typeof window.cardano != "undefined" && - typeof window.cardano[walletName] != "undefined" && - typeof window.cardano[walletName].enable == "function" + typeof getWindow().cardano != "undefined" && + typeof getWindow().cardano[walletName] != "undefined" && + typeof getWindow().cardano[walletName].enable == "function" ); }; @@ -56,7 +60,7 @@ export { isWalletAvailable as _isWalletAvailable }; export function _isEnabled(walletName) { return () => { if (isWalletAvailable(walletName)()) { - return window.cardano[walletName].isEnabled(); + return getWindow().cardano[walletName].isEnabled(); } else { throw new Error("Wallet `" + walletName + "` is not available"); } @@ -66,7 +70,7 @@ export function _isEnabled(walletName) { export function _apiVersion(walletName) { return () => { if (isWalletAvailable(walletName)()) { - return window.cardano[walletName].apiVersion; + return getWindow().cardano[walletName].apiVersion; } else { throw new Error("Wallet `" + walletName + "` is not available"); } @@ -76,7 +80,7 @@ export function _apiVersion(walletName) { export function _name(walletName) { return () => { if (isWalletAvailable(walletName)()) { - return window.cardano[walletName].name; + return getWindow().cardano[walletName].name; } else { throw new Error("Wallet `" + walletName + "` is not available"); } @@ -86,7 +90,7 @@ export function _name(walletName) { export function _icon(walletName) { return () => { if (isWalletAvailable(walletName)()) { - return window.cardano[walletName].icon; + return getWindow().cardano[walletName].icon; } else { throw new Error("Wallet `" + walletName + "` is not available"); } diff --git a/src/Internal/Wallet/Bip32.js b/src/Internal/Wallet/Bip32.js index bdff56d6af..493c3ffba3 100644 --- a/src/Internal/Wallet/Bip32.js +++ b/src/Internal/Wallet/Bip32.js @@ -2,11 +2,13 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); + import bip39 from "bip39"; const HARDENED = 0x80000000; diff --git a/src/Internal/Wallet/Cip30/SignData.js b/src/Internal/Wallet/Cip30/SignData.js index 7cc4117b86..b105a9ee30 100644 --- a/src/Internal/Wallet/Cip30/SignData.js +++ b/src/Internal/Wallet/Cip30/SignData.js @@ -2,9 +2,9 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-message-signing-browser"); + lib = await import("@emurgo/cardano-message-signing-browser"); } else { - lib = require("@emurgo/cardano-message-signing-nodejs"); + lib = await import("@emurgo/cardano-message-signing-nodejs"); } // ----------------------------------------------------------------------------- diff --git a/src/Internal/Wallet/Cip30Mock.js b/src/Internal/Wallet/Cip30Mock.js index a92d55cb81..db6e2bdd82 100644 --- a/src/Internal/Wallet/Cip30Mock.js +++ b/src/Internal/Wallet/Cip30Mock.js @@ -2,12 +2,12 @@ export function injectCip30Mock(walletName) { return mock => () => { - const hadWindow = typeof window != "undefined"; + let window_ = typeof window != "undefined" ? window : (global.window_ = {}); if ( - typeof window == "object" && - typeof window.cardano == "object" && - typeof window.cardano[walletName] != "undefined" + typeof window_ == "object" && + typeof window_.cardano == "object" && + typeof window_.cardano[walletName] != "undefined" ) { throw ( "injectCip30Mock: refusing to overwrite existing wallet (" + @@ -15,14 +15,9 @@ export function injectCip30Mock(walletName) { ")" ); } - - if (typeof window == "undefined") { - window = { cardano: {} }; - } else if (typeof window.cardano == "undefined") { - window.cardano = {}; - } - - window.cardano[walletName] = { + + window_.cardano = {}; + window_.cardano[walletName] = { enable: () => { return new Promise((resolve, _reject) => resolve({ @@ -44,9 +39,9 @@ export function injectCip30Mock(walletName) { }; return () => { - delete window.cardano[walletName]; - if (!hadWindow) { - window = undefined; + delete window_.cardano[walletName]; + if (typeof window == "undefined") { + global.window_ = undefined; } }; }; diff --git a/test/ApplyArgs.js b/test/ApplyArgs.js index 52efdd22fa..757995134f 100644 --- a/test/ApplyArgs.js +++ b/test/ApplyArgs.js @@ -80,11 +80,10 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { "redeemer1-validator-unit" ] = require("Scripts/applied/redeemer1-validator-unit.plutus"); } else { - const fs = require("fs"); - const path = require("path"); + const fs = await import("fs"); const read_script = fp => { return fs.readFileSync( - path.resolve(__dirname, "../../fixtures/scripts/".concat(fp)), + new URL("../../fixtures/scripts/".concat(fp), import.meta.url), "utf8" ); }; diff --git a/test/Wallet/Bip32.purs b/test/Wallet/Bip32.purs index 0247eb6f86..22e5e1ac19 100644 --- a/test/Wallet/Bip32.purs +++ b/test/Wallet/Bip32.purs @@ -17,11 +17,11 @@ import Ctl.Internal.Wallet.Key (KeyWallet(KeyWallet)) import Data.Lens (_Left, preview) import Data.UInt as UInt import Effect.Aff (Aff) -import Mote (group, only, test) +import Mote (group, test) import Test.Spec.Assertions (shouldEqual) suite :: TestPlanM (Aff Unit) Unit -suite = only do +suite = do group "BIP32/BIP39/CIP1852 wallets" do group "generates valid wallets for valid phrases" do for_ accs \(accountIndex /\ addressIndex /\ addressStr) -> do diff --git a/test/Wallet/Cip30/SignData.js b/test/Wallet/Cip30/SignData.js index 4ce524546d..331d342604 100644 --- a/test/Wallet/Cip30/SignData.js +++ b/test/Wallet/Cip30/SignData.js @@ -2,14 +2,15 @@ let lib, csl; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = require("@emurgo/cardano-message-signing-browser"); - csl = require("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@emurgo/cardano-message-signing-browser"); + csl = await import("@emurgo/cardano-serialization-lib-browser"); } else { - lib = require("@emurgo/cardano-message-signing-nodejs"); - csl = require("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@emurgo/cardano-message-signing-nodejs"); + csl = await import("@emurgo/cardano-serialization-lib-nodejs"); } -lib = require("@mlabs-haskell/csl-gc-wrapper")(lib); -csl = require("@mlabs-haskell/csl-gc-wrapper")(csl); +import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +lib = gcWrapper(lib); +csl = gcWrapper(csl); function opt_chain(maybe, obj) { const isNothing = x => x === null || x === undefined; From 6e061e1f1a4ac86d045cff48be1513914c258961 Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Tue, 4 Jul 2023 18:19:35 +0200 Subject: [PATCH 15/85] build: fix `package.json`, re-gen `spago-packages.nix`, fix formatting --- examples/OtherTypeTextEnvelope.js | 5 +- examples/PlutusV2/InlineDatum.js | 5 +- examples/PlutusV2/OneShotMinting.js | 5 +- examples/PlutusV2/Scripts/AlwaysSucceeds.js | 5 +- package.json | 3 +- spago-packages.nix | 800 +++++++++----------- src/Internal/Wallet.js | 14 +- src/Internal/Wallet/Cip30Mock.js | 2 +- 8 files changed, 403 insertions(+), 436 deletions(-) diff --git a/examples/OtherTypeTextEnvelope.js b/examples/OtherTypeTextEnvelope.js index 3f2ec80bc8..2c087801e0 100644 --- a/examples/OtherTypeTextEnvelope.js +++ b/examples/OtherTypeTextEnvelope.js @@ -6,7 +6,10 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { } else { const fs = await import("fs"); script = fs.readFileSync( - new URL("../../fixtures/scripts/other-type-text-envelope.plutus", import.meta.url), + new URL( + "../../fixtures/scripts/other-type-text-envelope.plutus", + import.meta.url + ), "utf8" ); } diff --git a/examples/PlutusV2/InlineDatum.js b/examples/PlutusV2/InlineDatum.js index 4be7191c5f..724620f74a 100644 --- a/examples/PlutusV2/InlineDatum.js +++ b/examples/PlutusV2/InlineDatum.js @@ -6,7 +6,10 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { } else { const fs = await import("fs"); script = fs.readFileSync( - new URL("../../fixtures/scripts/check-datum-is-inline.plutus", import.meta.url), + new URL( + "../../fixtures/scripts/check-datum-is-inline.plutus", + import.meta.url + ), "utf8" ); } diff --git a/examples/PlutusV2/OneShotMinting.js b/examples/PlutusV2/OneShotMinting.js index b94acb8ecb..bfe827a719 100644 --- a/examples/PlutusV2/OneShotMinting.js +++ b/examples/PlutusV2/OneShotMinting.js @@ -6,7 +6,10 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { } else { const fs = await import("fs"); script = fs.readFileSync( - new URL("../../fixtures/scripts/one-shot-minting-v2.plutus", import.meta.url), + new URL( + "../../fixtures/scripts/one-shot-minting-v2.plutus", + import.meta.url + ), "utf8" ); } diff --git a/examples/PlutusV2/Scripts/AlwaysSucceeds.js b/examples/PlutusV2/Scripts/AlwaysSucceeds.js index 849cceaeb3..5308d431fd 100644 --- a/examples/PlutusV2/Scripts/AlwaysSucceeds.js +++ b/examples/PlutusV2/Scripts/AlwaysSucceeds.js @@ -6,7 +6,10 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { } else { const fs = await import("fs"); script = fs.readFileSync( - new URL("../../fixtures/scripts/always-succeeds-v2.plutus", import.meta.url), + new URL( + "../../fixtures/scripts/always-succeeds-v2.plutus", + import.meta.url + ), "utf8" ); } diff --git a/package.json b/package.json index 4851ef3fb3..c5b938f647 100755 --- a/package.json +++ b/package.json @@ -1,11 +1,12 @@ { + "type": "module", "name": "cardano-transaction-lib", "version": "5.0.0", "description": "", "repository": { "type": "git", "url": "https://github.com/Plutonomicon/cardano-transaction-lib.git" - }, + }, "directories": { "test": "test" }, diff --git a/spago-packages.nix b/spago-packages.nix index 465ce61278..71f297fae2 100644 --- a/spago-packages.nix +++ b/spago-packages.nix @@ -7,11 +7,11 @@ let "aeson" = pkgs.stdenv.mkDerivation { name = "aeson"; - version = "bfd8f4dcd0522a076320f9dc710c24817438e02e"; + version = "f092a1fc9b0ecc2445accf5bf0aad10e6eade89b"; src = pkgs.fetchgit { - url = "https://github.com/mlabs-haskell/purescript-aeson.git"; - rev = "bfd8f4dcd0522a076320f9dc710c24817438e02e"; - sha256 = "1ywm51wqvwjqfrmhav6m4hyl9il3h77yyhzgyhvkvg0lkc0nn575"; + url = "https://github.com/errfrom/purescript-aeson.git"; + rev = "f092a1fc9b0ecc2445accf5bf0aad10e6eade89b"; + sha256 = "057cndwgcl8y8qh2afw3210hqcizr1ccsx1zkygn3bs2gpyx7h3q"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -19,11 +19,11 @@ let "aff" = pkgs.stdenv.mkDerivation { name = "aff"; - version = "v6.0.0"; + version = "v7.1.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-aff.git"; - rev = "d0eb009f2f47cb1f5ba1d8592d90c95e8e7ff75d"; - sha256 = "1780sgqyvbdgh8ynxmxn5d44vvhaz7kn9sv3l44c2s9q8xfjkfgm"; + rev = "6adec6ff048a7876f74c294c440374cd21342d39"; + sha256 = "1viplap030ym9ya033xl6x41hvdc12v9ngwp1v64ayl40a5m1d47"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -31,11 +31,11 @@ let "aff-promise" = pkgs.stdenv.mkDerivation { name = "aff-promise"; - version = "v3.0.0"; + version = "v4.0.0"; src = pkgs.fetchgit { url = "https://github.com/nwolverson/purescript-aff-promise.git"; - rev = "45cfba7f663fce12fe69285fe5acaa4ff025144c"; - sha256 = "12fnlwcrj5p6kc5rls7qxwg53zd83gkdpklpmp8jyav945hlgbj2"; + rev = "3aa74e68e3e4c3e38d821375703e0b2f49d831eb"; + sha256 = "10gv3b05dxnlmr9zmigqs1hz4xqrx7da30aqh12kqg3zrg49k9cc"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -43,11 +43,11 @@ let "aff-retry" = pkgs.stdenv.mkDerivation { name = "aff-retry"; - version = "v1.2.1"; + version = "v2.0.0"; src = pkgs.fetchgit { url = "https://github.com/Unisay/purescript-aff-retry.git"; - rev = "936fad803e3610f149df724ead288657a905cb84"; - sha256 = "08651ly153ywzviab0ipd0zrhwdr8nz4xfym45dlpbgabgrh8pra"; + rev = "4464f4bf62151651c8a86b33fc3c3149f7c71580"; + sha256 = "00xmfrx41giflrbdxm6hzmr23iqzr34x656kjpbmk3zvm49n6726"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -55,11 +55,11 @@ let "affjax" = pkgs.stdenv.mkDerivation { name = "affjax"; - version = "v12.0.0"; + version = "v13.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-affjax.git"; - rev = "5be197edc213fbededb8da908f77b69908eaa6f8"; - sha256 = "1f2snaimnl9ry8f3kankfcyy50wkba54vvin4wsrglahqgs1nrgb"; + rev = "87a8ffce89a476c1425370eb4b2b7e15408e0d1c"; + sha256 = "02hd0pfa1lb06a8qg2mqmkhyn3cz8hbvh6r9h2i6xcfqh0r8jg7s"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -67,11 +67,11 @@ let "ansi" = pkgs.stdenv.mkDerivation { name = "ansi"; - version = "v6.1.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/hdgarrood/purescript-ansi.git"; - rev = "e89e6fede616bd16b001841cf30ac320c95313a6"; - sha256 = "1jsll0h7nz13zgscs036cnkkc6frnlcnk6fwjdwsyp6wbmjri2zm"; + rev = "7d898732d643a977a78004851112a4417909e126"; + sha256 = "1aml84m5p1s14kj29m39182byg44nf275p4cinx3kgwhv1gj0qcp"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -79,11 +79,11 @@ let "argonaut" = pkgs.stdenv.mkDerivation { name = "argonaut"; - version = "v8.0.0"; + version = "v9.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-argonaut.git"; - rev = "e5137df76065c14e5de70c4e2820222bd7c78fc2"; - sha256 = "05sq1102rl1phm2gadx0gp966yvk9q1r492bb30q1m0nz762q4v2"; + rev = "7505a47f2edb0c9cacaac4f11dcedf4723a3e9c8"; + sha256 = "18yxhlrwri6q858krz1klyq29fx8nvfm16c04wm2rn91mgyasn6x"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -91,11 +91,11 @@ let "argonaut-codecs" = pkgs.stdenv.mkDerivation { name = "argonaut-codecs"; - version = "v8.1.0"; + version = "v9.1.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-argonaut-codecs.git"; - rev = "b0a041d92bfd548e2cd793cc7c02363464325a13"; - sha256 = "11vmlq98s4jmg5grvdrrlfkqj9vk3la44ky8158a440ipcpinjkq"; + rev = "f8fdc1e34142fa84e66022ea5d417a008d709146"; + sha256 = "1ncpl512k2xdaf7r5ixwxkm6i4vym7a6a3ih71z489h9ad781q73"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -103,11 +103,11 @@ let "argonaut-core" = pkgs.stdenv.mkDerivation { name = "argonaut-core"; - version = "v6.0.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-argonaut-core.git"; - rev = "673971dee79667882a83f9fda7097e50530726f1"; - sha256 = "13ka4xybc8ql54xlkkhy4919nnapfigdlk51ja85f8xwhr64x9kq"; + rev = "68da81dd80ec36d3b013eff46dc067a972c22e5d"; + sha256 = "0hxl17ddbflkk0hchjgk5xj6j9fwp3b182w4g073p0dwscdl4f08"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -115,11 +115,11 @@ let "argonaut-traversals" = pkgs.stdenv.mkDerivation { name = "argonaut-traversals"; - version = "v9.0.0"; + version = "v10.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-argonaut-traversals.git"; - rev = "36f2e368ceea1ed681bd8e2884eaca451945fc44"; - sha256 = "0bj88s7rz50jfhyawq4h97lvbr3h7pksbqnz4lmh714f5fda6ncx"; + rev = "8d2403d8d57afb568933dbb36063d5670ce770a0"; + sha256 = "0v965bcl1hdp1hacbzxcm35kxxclixj0kpsdm816gs7m548z6l43"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -127,11 +127,11 @@ let "arraybuffer-types" = pkgs.stdenv.mkDerivation { name = "arraybuffer-types"; - version = "v3.0.1"; + version = "v3.0.2"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-arraybuffer-types.git"; - rev = "48cd7f4887791db1d9c2daf5fd98b62ba00e15bd"; - sha256 = "09r6bhsiq9iqdsjf9p8m3p31qkszsipsafvy836mfdi8af6h5fv6"; + rev = "9b0b7a0f9ee034e039f3d3a2a9c3f74eb7c9264a"; + sha256 = "1q3111jk6jj64bxy86lc7ik6q5mgdz87bc086wj5rm57dmlivlxx"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -139,11 +139,11 @@ let "arrays" = pkgs.stdenv.mkDerivation { name = "arrays"; - version = "v6.0.1"; + version = "v7.1.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-arrays.git"; - rev = "c0aa3176b077ad7a46b11ef34487485c28142e53"; - sha256 = "0lm0m5hapimchzgfywr648pkw1hpggr6qibh8d19p2impbnc94c0"; + rev = "bb1b821530d368110eebf8a3541af90823e8af65"; + sha256 = "1mb9a4pb1bd7fj4vqj6msv5z27jbb5f89w3nczgjjhs02909phk9"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -151,11 +151,11 @@ let "assert" = pkgs.stdenv.mkDerivation { name = "assert"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-assert.git"; - rev = "71a3b1f3b9917c23691fdbb1858de171be871a10"; - sha256 = "0r1l7j67an8dy1w4xdpr8nc30lsxv31xwqph9mkfh3nd49jlyyd3"; + rev = "27c0edb57d2ee497eb5fab664f5601c35b613eda"; + sha256 = "02qpcsijil64qq4kcikv2ynxl85zkryvv0vmzjm6752956ymzi0j"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -163,11 +163,11 @@ let "avar" = pkgs.stdenv.mkDerivation { name = "avar"; - version = "v4.0.0"; + version = "v5.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-avar.git"; - rev = "ac3cbbb8d4b71ff19a78a3178355c089e44d3b4d"; - sha256 = "005046wl61w6r5v3qwd16srhcx82vdz3yvp4xzad2xaasb6iq55l"; + rev = "d00f5784d9cc8f079babd62740f5c52b87e5caa5"; + sha256 = "132g0ccmjr8328xpaycww8b5wmx1vi3li4irxxqcjk5wi47i8c9h"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -175,11 +175,11 @@ let "bifunctors" = pkgs.stdenv.mkDerivation { name = "bifunctors"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-bifunctors.git"; - rev = "a31d0fc4bbebf19d5e9b21b65493c28b8d3fba62"; - sha256 = "0xc2hf8ccdgqw3m9qcmr38kmzv05fsxvakd07wyrqshvkzg3xn0d"; + rev = "16ba2fb6dd7f05528ebd9e2f9ca3a068b325e5b3"; + sha256 = "1qz5aaiq5w4g1rhjb63z47h6nqhw8hw23x1zw5alam047pq4vfkg"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -187,11 +187,11 @@ let "bigints" = pkgs.stdenv.mkDerivation { name = "bigints"; - version = "v6.0.0"; + version = "v7.0.1"; src = pkgs.fetchgit { - url = "https://github.com/sharkdp/purescript-bigints.git"; - rev = "d5151e04db7e18641fbb2b5892f4198b1cab5907"; - sha256 = "0x8s6d6q2rpfkk56bmayg57a7hl2h7sq9ljrxfc8sjnwd7mfs193"; + url = "https://github.com/purescript-contrib/purescript-bigints.git"; + rev = "e73f55b866e437c7bf04c7d262de7c205c47bbca"; + sha256 = "0msh5sv6g0k69fi0qv4xi1g89bfwai099f0ycjb8a69mnjq8x21n"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -199,11 +199,11 @@ let "bignumber" = pkgs.stdenv.mkDerivation { name = "bignumber"; - version = "705923edd892a3397b90d28ce7db9a7181dcd599"; + version = "9b3179ad07428d189e42a7a205aab9c7c4849d4a"; src = pkgs.fetchgit { - url = "https://github.com/mlabs-haskell/purescript-bignumber"; - rev = "705923edd892a3397b90d28ce7db9a7181dcd599"; - sha256 = "0wddkx161xk457r1mb1f1r79l8qgxja0xhdvxjd1ai43nwp9cgkf"; + url = "https://github.com/errfrom/purescript-bignumber"; + rev = "9b3179ad07428d189e42a7a205aab9c7c4849d4a"; + sha256 = "03py821gnkgi5p7zaxwr4rqsiv67v83y5c04i6x4v15nr6aaf7vz"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -211,11 +211,11 @@ let "catenable-lists" = pkgs.stdenv.mkDerivation { name = "catenable-lists"; - version = "v6.0.1"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-catenable-lists.git"; - rev = "ee03395f2c5d59a7fd8529a0faac6ec1ebcbb682"; - sha256 = "1lz06fx0za5sl65wccn5fl37mw3x4jnvrriz1gg0aqsmm9lag7ss"; + rev = "09abe1f4888bc00841ad2b59e56a9e7ce7ebd4ab"; + sha256 = "0fn6caspdnb0nrlj31sy7d5hxrhndfz7a2b9wfkxf5bv5vpjyawb"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -235,11 +235,11 @@ let "console" = pkgs.stdenv.mkDerivation { name = "console"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-console.git"; - rev = "d7cb69ef8fed8a51466afe1b623868bb29e8586e"; - sha256 = "0fzzzqjgrz33pb2jf7cdqpg09ilxb7bsrc7sbfq52wjg0sx9aq6g"; + rev = "3b83d7b792d03872afeea5e62b4f686ab0f09842"; + sha256 = "0fr5l1myhscp910mybp04cg6g8f2hy3ikjfc8fkqlb2dm2cqzdfs"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -247,11 +247,11 @@ let "const" = pkgs.stdenv.mkDerivation { name = "const"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-const.git"; - rev = "3a3a4bdc44f71311cf27de9bd22039b110277540"; - sha256 = "0aq9qjbrvf8mf8hmas6imv4mg6n3zi13hkf449ns1hn12lw8qv4g"; + rev = "ab9570cf2b6e67f7e441178211db1231cfd75c37"; + sha256 = "0mcpwqqf5bcwxlzk53smvsjjz1ymlnq0ypphg6sc83ibw70g64f6"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -259,11 +259,11 @@ let "contravariant" = pkgs.stdenv.mkDerivation { name = "contravariant"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-contravariant.git"; - rev = "ae1a765f7ddbfd96ae1f12e399e46d554d8e3b38"; - sha256 = "029hb8i3n4759x4gc06wkfgr7wim5x1w5jy2bsiy42n0g731h5qc"; + rev = "9ad3e105b8855bcc25f4e0893c784789d05a58de"; + sha256 = "1xkd3rfs8v20w7mj6sj6dmhfb2vb1zpmjv245xj1rahk3g16qm7m"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -271,11 +271,11 @@ let "control" = pkgs.stdenv.mkDerivation { name = "control"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-control.git"; - rev = "18d582e311f1f8523f9eb55fb93c91bd21e22837"; - sha256 = "06dc06yli4g5yr8fb9sdpqbhiaff37g977qcsbds9q2mlhnjgfx9"; + rev = "a6033808790879a17b2729e73747a9ed3fb2264e"; + sha256 = "05sdgywprwpav62d2bvlb80yd39brxhnmhhl1f116mm9hw5clqia"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -283,11 +283,11 @@ let "crypto" = pkgs.stdenv.mkDerivation { name = "crypto"; - version = "v4.0.0"; + version = "v5.0.1"; src = pkgs.fetchgit { url = "https://github.com/oreshinya/purescript-crypto.git"; - rev = "cbc19e06c5e4d528e7733633e50c070b1aa0f77e"; - sha256 = "142p9f0mg1yi4bccg3jwhhyn4k4yy5fskh08p05n9sfym27ss126"; + rev = "c72b4b789e52a1fb31c65cd318ea82bf295af1ec"; + sha256 = "07p7153j3brsfyc1pik4y760g054zx1kwy2ap67pfs41zv982s03"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -295,11 +295,11 @@ let "datetime" = pkgs.stdenv.mkDerivation { name = "datetime"; - version = "v5.0.2"; + version = "v6.1.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-datetime.git"; - rev = "e110462829ea656d2bc0924266d4edff222108d4"; - sha256 = "1mhzn2ymdkzki7wjlr9xrdbngm0886wmfbh2c46flnf9lmfyw54y"; + rev = "7f6062346055e654942caed6c44612b59031f059"; + sha256 = "0z5f62arrli0dgmggv6z2qkv1qc9isdivcn7njywsa8wmc4vd47n"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -307,11 +307,11 @@ let "debug" = pkgs.stdenv.mkDerivation { name = "debug"; - version = "v5.0.0"; + version = "v6.0.2"; src = pkgs.fetchgit { url = "https://github.com/garyb/purescript-debug.git"; - rev = "144305842dba81169a93b3a3cc75429d5c8389e9"; - sha256 = "09j69bgrq8nzw1l3aj1hka3y5ycmcsn9dlgf22k5ifrd74iic60y"; + rev = "a37b82f62c89734934c0962ece3412913020460a"; + sha256 = "0q3r21zh0kjy9aq8q2siaf8841q63cmxjl2fbk0z3r0z4cfihccg"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -319,11 +319,11 @@ let "distributive" = pkgs.stdenv.mkDerivation { name = "distributive"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-distributive.git"; - rev = "11f3f87ca5720899e1739cedb58dd6227cae6ad5"; - sha256 = "0788znmdyh6b1c9pln624ah397l88xmd3fxlxiy3z1qy8bzr4r54"; + rev = "6005e513642e855ebf6f884d24a35c2803ca252a"; + sha256 = "0x6cfsx9ff66kvw9l10pxd5vv16r91mmfxrfc68w1xfdfi81lhdx"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -331,11 +331,11 @@ let "effect" = pkgs.stdenv.mkDerivation { name = "effect"; - version = "v3.0.0"; + version = "v4.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-effect.git"; - rev = "985d97bd5721ddcc41304c55a7ca2bb0c0bfdc2a"; - sha256 = "1n9qr85knvpm4i0qhm8xbgfk46v9y843p76j278phfs9l6aywzsn"; + rev = "a192ddb923027d426d6ea3d8deb030c9aa7c7dda"; + sha256 = "0aa10lc6h9mlf4xf3g3ziig7v6kxdqvbh20kma8ay59w0b1bhmj1"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -343,11 +343,11 @@ let "either" = pkgs.stdenv.mkDerivation { name = "either"; - version = "v5.0.0"; + version = "v6.1.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-either.git"; - rev = "c1a1af35684f10eecaf6ac7d38dbf6bd48af2ced"; - sha256 = "18dk159yyv7vs0xsnh9m5fajd7zy6zw5b2mpyd6nqdh3c6bb9wh6"; + rev = "af655a04ed2fd694b6688af39ee20d7907ad0763"; + sha256 = "05zps4klvgmvlm06f4hrycssm8q0pysbqnjsrk26lfvmid6mmg63"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -355,11 +355,11 @@ let "encoding" = pkgs.stdenv.mkDerivation { name = "encoding"; - version = "v0.0.7"; + version = "v0.0.8"; src = pkgs.fetchgit { url = "https://github.com/menelaos/purescript-encoding.git"; - rev = "0a4187136f9ea4ea51ddf635e3b3c2cd2461faac"; - sha256 = "1rsnn8g2lx24k9wflr1jj12281i0smprb76nfm2f61yqqiwgij4d"; + rev = "a9d1913de736821c133ecd7944a08b2ab07ad774"; + sha256 = "0c23bpfw67ik1n821bq3s0w036sk7yqi4fy5fd7dgf4325abk6zn"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -367,11 +367,11 @@ let "enums" = pkgs.stdenv.mkDerivation { name = "enums"; - version = "v5.0.0"; + version = "v6.0.1"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-enums.git"; - rev = "170d959644eb99e0025f4ab2e38f5f132fd85fa4"; - sha256 = "1lci5iy6s6cmh93bpkfcmp0j4n5dnij7dswb0075bk0kzd9xp7rs"; + rev = "cd373c580b69fdc00e412bddbc299adabe242cc5"; + sha256 = "1wk98ddmgyii1ifqawnhqkiqlrs405qcp3m12jsg1yp8jv6ppv47"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -379,11 +379,11 @@ let "exceptions" = pkgs.stdenv.mkDerivation { name = "exceptions"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-exceptions.git"; - rev = "410d0b8813592bda3c25028540eeb2cda312ddc9"; - sha256 = "1yjbrx34a0rnxgpvywb63n9jzhkdgb2q2acyzbwh290mrrggc95x"; + rev = "afab3c07c820bb49b6c5be50049db46a964a6161"; + sha256 = "04xrbrcjwsv8gj465ygrlqhv1majxmr6m242iazg6apxlr89hgvg"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -391,11 +391,11 @@ let "exists" = pkgs.stdenv.mkDerivation { name = "exists"; - version = "v5.1.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-exists.git"; - rev = "c34820f8b2d15be29abdd5097c3d636f5df8f28c"; - sha256 = "15qp52cpp2yvxihkzfmn6gabyvx5s6iz5lafvqhyfgp4wfnz0bds"; + rev = "f765b4ace7869c27b9c05949e18c843881f9173b"; + sha256 = "0xnxi8fsmi15wrpq5d99gg94glk8a45hpx7pf4pmxg5r6rn1vjvx"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -415,11 +415,11 @@ let "fixed-points" = pkgs.stdenv.mkDerivation { name = "fixed-points"; - version = "v6.0.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-fixed-points.git"; - rev = "3b643d948479aee7cd3e36c95258f1f84df0c35f"; - sha256 = "0w2j0sarylzsmg8b228pmn3qndif0bzw2vmxrx30ar15qy7jdb5d"; + rev = "2b7f480038a15c707adf49178181cefed167afb2"; + sha256 = "1iib0yxl749lg4m7ysqmb9aby67a9829x38xc2rma5fk9fv30cw7"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -427,11 +427,11 @@ let "foldable-traversable" = pkgs.stdenv.mkDerivation { name = "foldable-traversable"; - version = "v5.0.1"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-foldable-traversable.git"; - rev = "d581caf260772b1b446c11ac3c8be807b290b220"; - sha256 = "182na4np7hk2dqyxywy4jij2csrzx4bz02m6bq8yx1j27hlgjvsd"; + rev = "b3926f870532d287ea59e2d5cd3873b81ef2a93a"; + sha256 = "0xg8qvyc6r9wqgy7wnw1rjqljl4wpgdrkxsm5x9rsagj2k5brxip"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -439,11 +439,11 @@ let "foreign" = pkgs.stdenv.mkDerivation { name = "foreign"; - version = "v6.0.1"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-foreign.git"; - rev = "7ee18c6689c56c89755172ea53326f948da10bd3"; - sha256 = "16j7712cck79p8q53xbhn4hs886bm0ls5wvmchrhqnaghj48m85g"; + rev = "2dd222d1ec7363fa0a0a7adb0d8eaf81bb7006dd"; + sha256 = "0ycjaal8b2rsg3zl3b7acv166vjfdvziiza3fs8nhfw0rx0xmm1m"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -451,11 +451,11 @@ let "foreign-object" = pkgs.stdenv.mkDerivation { name = "foreign-object"; - version = "v3.0.0"; + version = "v4.1.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-foreign-object.git"; - rev = "c9a7b7bb8bed1b87c5545c4ebe85a70f86c0e6b1"; - sha256 = "0accw6qd93qqry19rskjgl7y54xi2wd70rglbqyjx6c5ybcjnavr"; + rev = "9bfb4eb6271b151414594cfec669fb4b18b91bd1"; + sha256 = "1fr5hwzkan7yv2kbgvii2b8kanhjkqrbixcyj7kyv9fwkk8dk96a"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -463,11 +463,11 @@ let "fork" = pkgs.stdenv.mkDerivation { name = "fork"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-fork.git"; - rev = "153cc29e6e51fb1108368efc622d41d9f80bd707"; - sha256 = "1hyvaixza8151zbylk2kv859x48yyhla536lcjghcwd62vzfwmdn"; + rev = "a5c3bc6f357e97669e8c29c6f79f5f55be0d42c0"; + sha256 = "0yzh55vfrhrr660ni3sbbljypjirbka5jlks4zibqmhwrmy3wnj9"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -475,11 +475,11 @@ let "form-urlencoded" = pkgs.stdenv.mkDerivation { name = "form-urlencoded"; - version = "v6.0.2"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-form-urlencoded.git"; - rev = "860b2c4bf0a848322d2077faaefbeb98762cb8d6"; - sha256 = "1pi3vxix10crisisnd94li1vmmgiawlh5lgl51z7ssd9azygg0b0"; + rev = "e0e3eebc76f62f2594a0e823e8d6241ca00b2459"; + sha256 = "1ay946w7gkgqrxxv5qf28w83mh59r1q4j8kk6pndhripz9pby68w"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -487,11 +487,11 @@ let "formatters" = pkgs.stdenv.mkDerivation { name = "formatters"; - version = "v6.0.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-formatters.git"; - rev = "b2e65b2bccd09a3c17a396f07e13e5cdca90e4e4"; - sha256 = "02c43sv6ci2698mjkmvkv3cjv99ilxv8ii8x7n9wqf18r4hlmk0y"; + rev = "0b4deda4c6664209173e3e21b8fcbc6151a4549c"; + sha256 = "0z3w5qbfd8z8bakir3rwanq6dcf554f3apacxw5l2vxscvikyra3"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -499,11 +499,11 @@ let "free" = pkgs.stdenv.mkDerivation { name = "free"; - version = "v6.2.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-free.git"; - rev = "c185c0b2144ddfb2bc3ac2b345df32e33221b21d"; - sha256 = "10zsw49wzlzz78882b3grl19gpca5llpdk3ph608075h0ygk3q3k"; + rev = "e2d8fa8023a864363857834e11393483bced5e38"; + sha256 = "0gyy0k297m26gw76w7kx8k1zjczlqbqb3nmh2h4gb3r84gl05g6r"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -511,11 +511,11 @@ let "freet" = pkgs.stdenv.mkDerivation { name = "freet"; - version = "v6.0.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-freet.git"; - rev = "507c2edd9173cda5ad44dd0638133edd69fd9acd"; - sha256 = "0f5bibw604sd9ffmp51b3jppka88r54mh7sdz91zy5b92wgsy5yr"; + rev = "21be6fba22599a25812430dda6ba2ca8135920a1"; + sha256 = "006wbr7f19k7vs1jg4wgkwyx1q4wvvs2wqscfcxsp8fzfpn2yqw8"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -523,11 +523,11 @@ let "functions" = pkgs.stdenv.mkDerivation { name = "functions"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-functions.git"; - rev = "691b3345bc2feaf914e5299796c606b6a6bf9ca9"; - sha256 = "1gnk6xh5x04zcahn82gwp49qpglxd5jkfqn0i58m27jfihvblaxd"; + rev = "f626f20580483977c5b27a01aac6471e28aff367"; + sha256 = "1bsf2y8hx103a92yrc6m05q2dv51ckag1srd7q5n9vaf2k9byrj9"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -535,11 +535,11 @@ let "functors" = pkgs.stdenv.mkDerivation { name = "functors"; - version = "v4.1.1"; + version = "v5.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-functors.git"; - rev = "e936f7a8d2ec53a344c478ccada5add93273848c"; - sha256 = "0i1x14r54758s5jx5d7zy4l07mg6gabljadgybldnbpmdqk6b966"; + rev = "022ffd7a2a7ec12080314f3d217b400674a247b4"; + sha256 = "1pnw3r1nk0rx8mrw3ajjml40zvx9v26qrqwj77pz7hpwxigxfbff"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -547,11 +547,11 @@ let "gen" = pkgs.stdenv.mkDerivation { name = "gen"; - version = "v3.0.0"; + version = "v4.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-gen.git"; - rev = "85c369f56545a3de834b7e7475a56bc9193bb4b4"; - sha256 = "1h396rqn1fc2c155i58vnaksqjrpajly128ah6wq1w426vwr1vrf"; + rev = "9fbcc2a1261c32e30d79c5418edef4d96fe76931"; + sha256 = "0kajzcp9a8dmqvb3ga27hlf18m2smbp98a0bmzzb9vv156ckw0b4"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -559,11 +559,11 @@ let "heterogeneous" = pkgs.stdenv.mkDerivation { name = "heterogeneous"; - version = "v0.5.1"; + version = "v0.6.0"; src = pkgs.fetchgit { url = "https://github.com/natefaubion/purescript-heterogeneous.git"; - rev = "550445cf7932e158395423fc087cdc05bab41c40"; - sha256 = "08bpgm9p8ib1jzrmssqpa1bqqzfmba43lsih1xvr3pf1jfizayxg"; + rev = "5b7542bdd9547c5aef95b8878f103f0ce4ee1383"; + sha256 = "0ff1wjq2ayhy67ydggbb2qlzbhvmv1m1z8dcp48p9zhxiq9fpfsz"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -571,11 +571,11 @@ let "http-methods" = pkgs.stdenv.mkDerivation { name = "http-methods"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-http-methods.git"; - rev = "d373066a45017e886d1580cd359372368231de47"; - sha256 = "1g0ywd5zpckmhq28mr14yr4k28hiii1px8r8xbdx8nv45ryw69l3"; + rev = "99b48d54b978e4e6438d850015d59e57ac64824e"; + sha256 = "126x1cqr1769a3yzigpp8sp33n6s4fadai7w30mb2nk9dbxy0hw5"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -583,11 +583,11 @@ let "identity" = pkgs.stdenv.mkDerivation { name = "identity"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-identity.git"; - rev = "5c150ac5ee4fa6f145932f6322a1020463dae8e9"; - sha256 = "0a58y71ihvb5b7plnn2sxsbphqzd9nzfafak4d5a576agn76q0ql"; + rev = "ef6768f8a52ab0bc943a85f5761ba07c257f639f"; + sha256 = "1lh0pkwwdyd8q9bgf4l1m96gdnardki4r2s359cnhrwp94b43fyr"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -595,11 +595,11 @@ let "integers" = pkgs.stdenv.mkDerivation { name = "integers"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-integers.git"; - rev = "8a783f2d92596c43afca53066ac18eb389d15981"; - sha256 = "1rrygw0ai61brnvgap7dfhdzacyhg5439pz6yrmmyg32cvf0znhv"; + rev = "54d712b25c594833083d15dc9ff2418eb9c52822"; + sha256 = "04j9sqvkgyxxvbm8jfc2118wzmgswn8jva9fysgbsnmsg9vcxfm6"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -607,11 +607,11 @@ let "invariant" = pkgs.stdenv.mkDerivation { name = "invariant"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-invariant.git"; - rev = "c421b49dec7a1511073bb408a08bdd8c9d17d7b1"; - sha256 = "0vwkbh7kv00g50xjgvxc0mv5b99mrj6q0sxznxwk32hb9hkbhy5l"; + rev = "1d2a196d51e90623adb88496c2cfd759c6736894"; + sha256 = "07rqag47ykdiqc5yfbc1a64ijaqliljhcw1vgbv81m7ljzzd2xna"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -619,23 +619,11 @@ let "js-date" = pkgs.stdenv.mkDerivation { name = "js-date"; - version = "v7.0.0"; + version = "v8.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-js-date.git"; - rev = "a6834eef986e3af0490cb672dc4a8b4b089dcb15"; - sha256 = "1dpiwn65qww862ilpfbd06gwfazpxvz3jwvsjsdrcxqqfcbjp8n8"; - }; - phases = "installPhase"; - installPhase = "ln -s $src $out"; - }; - - "js-timers" = pkgs.stdenv.mkDerivation { - name = "js-timers"; - version = "v5.0.1"; - src = pkgs.fetchgit { - url = "https://github.com/purescript-contrib/purescript-js-timers.git"; - rev = "86afef13f457b9506acdfe88559ee18f1cd2c2d8"; - sha256 = "0008paz0qkz5n1pfrzagkkac6jny9z2rd1ij10ww2k1pkb9cy59z"; + rev = "1ea020316946cc4b87195bca9c54d0c16abaa490"; + sha256 = "03535g8hc4bzyzig25hf75dls9ypsgrdk2nc45h8zw4xyy4ha0gz"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -643,11 +631,11 @@ let "js-uri" = pkgs.stdenv.mkDerivation { name = "js-uri"; - version = "v2.0.0"; + version = "v3.1.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-js-uri.git"; - rev = "6145d5e631be3d57d8a4a9cf976ae140713dee35"; - sha256 = "1q34ir93cqbcl9g49vv1qfj8jxbbdj7f85a14y4mzd7yjq0a042g"; + rev = "06f7ae755ccb36bfa80bc3702533165af5c7ef06"; + sha256 = "0c9k1fpf4ljlqsnb07i3gwa6jiwlli0046pnglmk56ls53l6d4aj"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -667,11 +655,11 @@ let "lazy" = pkgs.stdenv.mkDerivation { name = "lazy"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-lazy.git"; - rev = "2f73f61e7ac1ae1cfe05564112e3313530e673ff"; - sha256 = "1wxfx019911gbkifq266hgn67zwm89pxhi83bai77mva5n9j3f6l"; + rev = "48347841226b27af5205a1a8ec71e27a93ce86fd"; + sha256 = "0dxlc3b2bdqsri45i7a9bvwvv0gg43cc1gq61zi41f290a29ny2q"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -679,11 +667,11 @@ let "lcg" = pkgs.stdenv.mkDerivation { name = "lcg"; - version = "v3.0.0"; + version = "v4.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-lcg.git"; - rev = "8fb2eb16bbba2cee1d115a6729659ac649da811b"; - sha256 = "04r9bmx9kc3jqx59hh9yqqkl95mf869la9as5h36jv85ynn464dx"; + rev = "67c6c6483a563a59ae036d9dca0f1be2835326a5"; + sha256 = "1shzn6zvc1cxd7v0bvfsk7x3xf59vxby8c5lfjvd746r6396zn65"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -691,11 +679,11 @@ let "lists" = pkgs.stdenv.mkDerivation { name = "lists"; - version = "v6.0.1"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-lists.git"; - rev = "6383c4f202b3f69474f9f7da182c2d42fcc3111c"; - sha256 = "0xmg918s3mqvfvwgjfqcs1yvcz6hy2n7h3ygqz2iyvk868gz25qs"; + rev = "b113451e5b41cad87d669a3165f955c71cd863e2"; + sha256 = "1mg7vy44k8jlqkri7x4ikciixx92b17wi35887x09dwdsicjf0sx"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -703,23 +691,11 @@ let "literals" = pkgs.stdenv.mkDerivation { name = "literals"; - version = "v0.2.0"; - src = pkgs.fetchgit { - url = "https://github.com/jvliwanag/purescript-literals.git"; - rev = "11457380e1b28c9526c41381eeb0ee840982db5c"; - sha256 = "1jjnpfmh9qfmffyrmcfnn9p25irmsmaji6lwrsrd2r9xdhpzmqg7"; - }; - phases = "installPhase"; - installPhase = "ln -s $src $out"; - }; - - "math" = pkgs.stdenv.mkDerivation { - name = "math"; - version = "v3.0.0"; + version = "v1.0.2"; src = pkgs.fetchgit { - url = "https://github.com/purescript/purescript-math.git"; - rev = "59746cc74e23fb1f04e09342884c5d1e3943a04f"; - sha256 = "0hkf0vyiga21992d9vbvdbnzdkvgljmsi497jjas1rk3vhblx8sq"; + url = "https://github.com/rowtype-yoga/purescript-literals.git"; + rev = "ae3ef4e9c1ae7c57ec77bd13906fa60ae8abba4a"; + sha256 = "1dvzi3qx6jbfw2g28wgbh1s9zv8z59wrf7r7jhib4g5ibgzq5r8q"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -727,11 +703,11 @@ let "maybe" = pkgs.stdenv.mkDerivation { name = "maybe"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-maybe.git"; - rev = "8e96ca0187208e78e8df6a464c281850e5c9400c"; - sha256 = "0vyk3r9gklvv7awzpph7ra53zxxbin1ngmqflb5vvr2365v5xyqy"; + rev = "c6f98ac1088766287106c5d9c8e30e7648d36786"; + sha256 = "0n33g8c579vcs06ii0r7f14jjdwzjw7p583w4nmrv9h442q2cvlz"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -739,11 +715,11 @@ let "medea" = pkgs.stdenv.mkDerivation { name = "medea"; - version = "8b215851959aa8bbf33e6708df6bd683c89d1a5a"; + version = "00981e4ce7249808413a6db8d88d849bbe85245a"; src = pkgs.fetchgit { - url = "https://github.com/juspay/medea-ps.git"; - rev = "8b215851959aa8bbf33e6708df6bd683c89d1a5a"; - sha256 = "05gnar9l1li0v1vv12kga0sssskfm4f1x9y6smpmqbqg9396pmsq"; + url = "https://github.com/errfrom/medea-ps.git"; + rev = "00981e4ce7249808413a6db8d88d849bbe85245a"; + sha256 = "0sxv9l53hqjx5n7gdnpr5ydxp0zr2wv0ikk2sc0ch9whq5rridcy"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -751,11 +727,11 @@ let "media-types" = pkgs.stdenv.mkDerivation { name = "media-types"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-media-types.git"; - rev = "b6efa4c1e6808b31f399d8030b5938acec87cb48"; - sha256 = "0l51nd1w52756pyy3zliwmhfbin0px4pxr7d2h5vchl1wq895fja"; + rev = "af853de226592f319a953637069a943dd261cba3"; + sha256 = "0bxpsd2yw3zg58ay649v3xld7n17n7j7n9y8l841cjih9bc7ccxx"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -763,11 +739,11 @@ let "mmorph" = pkgs.stdenv.mkDerivation { name = "mmorph"; - version = "v6.0.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/Thimoteus/purescript-mmorph.git"; - rev = "ebe16afbfa16dd600f3379ccedc7529417402393"; - sha256 = "0ds88hray8v0519n9k546qsc4qs8bj1k5h5az7nwfp0gaq0r5wpk"; + rev = "94bc558ac34184d5236a7a9b2463dcc7551ced8e"; + sha256 = "0m3m1kjy4i9lwzj8l5qlafxawyhbdxj035wa5ys4j8v4013a92xg"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -811,11 +787,11 @@ let "newtype" = pkgs.stdenv.mkDerivation { name = "newtype"; - version = "v4.0.0"; + version = "v5.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-newtype.git"; - rev = "7b292fcd2ac7c4a25d7a7a8d3387d0ee7de89b13"; - sha256 = "1fgzbxslckva2psn0sia30hfakx8xchz3wx2kkh3w8rr4nn2py8v"; + rev = "29d8e6dd77aec2c975c948364ec3faf26e14ee7b"; + sha256 = "0kfc644zn2f9rpx8fy4gjvmz04k9mv1c2xrqis8m3s0ydnhbffd7"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -823,11 +799,11 @@ let "noble-secp256k1" = pkgs.stdenv.mkDerivation { name = "noble-secp256k1"; - version = "710c15c48c5afae5e0623664d982a587ff2bd177"; + version = "9fc5db67e2b6e8b027c415e4dd1625c3f1d8b623"; src = pkgs.fetchgit { - url = "https://github.com/mlabs-haskell/purescript-noble-secp256k1.git"; - rev = "710c15c48c5afae5e0623664d982a587ff2bd177"; - sha256 = "014wapsgg6xa76i3f368aag4kps644g8qqqha9xbgyxmrhxsln6q"; + url = "https://github.com/errfrom/purescript-noble-secp256k1.git"; + rev = "9fc5db67e2b6e8b027c415e4dd1625c3f1d8b623"; + sha256 = "0n2q83n210ih5l54p6wrrjqmy40xhhdd3mam5mzixgr2hszm8969"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -835,11 +811,11 @@ let "node-buffer" = pkgs.stdenv.mkDerivation { name = "node-buffer"; - version = "v7.0.1"; + version = "v8.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-node-buffer.git"; - rev = "0721f1e8d768df48ae429547c8c60b121ca120cb"; - sha256 = "14bf3llsa20ivkwp5hlyk8v8zfzpzhhsni9pd8rfqdyzp6zrdx3b"; + rev = "7be7bd082b7d3e15de2ed5a626d43af746bdb35e"; + sha256 = "1l1j4ml0lyhnxs1zcy3jchlc0mbsn40g1pxyb4lv6slhp0qdhjhp"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -847,11 +823,11 @@ let "node-child-process" = pkgs.stdenv.mkDerivation { name = "node-child-process"; - version = "v7.1.0"; + version = "v9.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-node-child-process.git"; - rev = "5c4e560eceead04efc1d5a3ec1f6de91bb1d512e"; - sha256 = "18va367xims00hmjwiasiifdfak3cbs0sp4sr52ihb20n19n6h5b"; + rev = "ceaa5dcd21697da24a916b81c73ba013592cf378"; + sha256 = "1h93r8q0gpdp3vz89b9aazdr0dc99kyx0wx8xb1ap8v2img8xid1"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -859,11 +835,11 @@ let "node-fs" = pkgs.stdenv.mkDerivation { name = "node-fs"; - version = "v6.2.0"; + version = "v8.1.1"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-node-fs.git"; - rev = "3cb63cc55a02e506fe07d3940a50d6f0eb6ca2f2"; - sha256 = "1b89sxr6asxvgx59myhfbahiiz1z6sg2qfrm9bqd46h93ai8bhn1"; + rev = "a9da8b9860f8a1f67e38701f5cce72a0f2c3901d"; + sha256 = "0ywv0d8w2fbqnj9z1dxbm2a9na10g960b5gznjcf7d70gs22ixhj"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -871,11 +847,11 @@ let "node-fs-aff" = pkgs.stdenv.mkDerivation { name = "node-fs-aff"; - version = "v7.0.0"; + version = "v9.1.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-node-fs-aff.git"; - rev = "1da5d326573c3b17c6d4dba3d0e0157e60869f91"; - sha256 = "10aglq89gbchykwlckmg5xsln705qha76f125snkmk056kq2w89h"; + rev = "ac9b6fd272eb52c906b490be1c714423dd36a5bf"; + sha256 = "0mi91kd1b0ix8ygaaj5jspw0m53b8rv5mingrk2lvxhimsxa3f81"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -883,11 +859,11 @@ let "node-http" = pkgs.stdenv.mkDerivation { name = "node-http"; - version = "v6.0.0"; + version = "v8.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-node-http.git"; - rev = "48a4da07051f0cc9a9d08fbfe8179ebf55aff39a"; - sha256 = "1521ab70jx7a9d7kk4gn1sk4w6knfi13pai1kanhrvwp5lfys5wl"; + rev = "9baab9d9b45064e8cc1d53913bb1668bfa799b16"; + sha256 = "1bi7kwai15l4lqcnaq14mi906cppcjm3iqax4qq3vjihf68b66r4"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -895,11 +871,11 @@ let "node-net" = pkgs.stdenv.mkDerivation { name = "node-net"; - version = "v2.0.1"; + version = "v4.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-node-net.git"; - rev = "e25a2c538dfa524cd9b75bf12fd7a393efe2f7e9"; - sha256 = "17sx9r74kdjq85dafm5kisbvgdb0wn11lq9gaazpdirhshpm2wl5"; + rev = "812ce3142b67c33db225a0f94fabd6a6776bf0be"; + sha256 = "18z42zqinm357qzr8r7w7lwhjnmd2693ywqkb1ndjd2p3dz7x4zm"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -907,11 +883,11 @@ let "node-path" = pkgs.stdenv.mkDerivation { name = "node-path"; - version = "v4.0.0"; + version = "v5.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-node-path.git"; - rev = "a2d7cf05e40b607ef7d048a3684cda788cd42890"; - sha256 = "1384qyf4v84wbahafzvqdxjllqy8qkd5dpkhsl3js444vsm2aplr"; + rev = "d5f08cfde829b831408c4c6587cec83f2cd6a58e"; + sha256 = "1d38ipij4lb1nq8wkv7kmpk77z5ac0spfc89hfc9yn6jnscl6sky"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -919,11 +895,11 @@ let "node-process" = pkgs.stdenv.mkDerivation { name = "node-process"; - version = "v8.2.0"; + version = "v10.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-node-process.git"; - rev = "e1e807ac7831d1a8a15e242964f7e5005e42f76b"; - sha256 = "0nl9r271s8f71a9wqfkadq9b490h8phwgqc61jbzhm4ags23pqpg"; + rev = "9d126d9d4f898723e7cab69895770bbac0c3a0b8"; + sha256 = "07gcg33g56f74ph2bqmj5lysy752f6y31y7mkrgd2m0jzi7wknn3"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -931,11 +907,11 @@ let "node-readline" = pkgs.stdenv.mkDerivation { name = "node-readline"; - version = "v5.0.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-node-readline.git"; - rev = "c59deb30c7ff5cc91d6b062120c5a3979bd4ccff"; - sha256 = "0c299bvkhrdbij88fxb75sdm7bl4wpgv9fz7wsj0hw6gkxmplpj9"; + rev = "fbe80a949275f15643b80f9db7c01d5a6b4031ed"; + sha256 = "1gxldf016w8xjm6jj95mshglgb4gcs9scxfr5ckxry1rzk6fzz1d"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -943,11 +919,11 @@ let "node-streams" = pkgs.stdenv.mkDerivation { name = "node-streams"; - version = "v5.0.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-node-streams.git"; - rev = "886bb2045685e3b9031687d69ccfed29972147bb"; - sha256 = "1jc3d4x0v77h8qcwq7hpwprsdr3gqmdfiyr1ph0kiy7r9bbrqwfx"; + rev = "8395652f9f347101fe042f58726edc592ae5086c"; + sha256 = "1cgkh3dwnhv90r7dak3x4dq698gh30ghfxncrw0ngwrv5pismn0x"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -955,11 +931,11 @@ let "node-url" = pkgs.stdenv.mkDerivation { name = "node-url"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-node-url.git"; - rev = "d5671f5e38051f4fa7acacd9ec157ed9dc6ded46"; - sha256 = "0w78q23vxa2nldy0dfj4nb5kv0pcrc1yq7dp1mysz7cdi9f72zp9"; + rev = "de7b279df13a9eeef2455af561525f37568c190e"; + sha256 = "14qkni1138jn02s8hpchc0i73n7brj1j9d3gwc8kh1wz1ddhjypw"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -967,11 +943,11 @@ let "nonempty" = pkgs.stdenv.mkDerivation { name = "nonempty"; - version = "v6.1.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-nonempty.git"; - rev = "7696eaf915da5333173bca7d779a51f91a525b83"; - sha256 = "0hhhw5x5xvs2bd9373gklja1545glnzi1xc2sj16kkznnayrmvsn"; + rev = "28150ecc7419238b187abd609a92a645273348bb"; + sha256 = "1mwdc2sny2ygp67kyk7h2493vq7syf7j18s3d9a5gwf1y7jlf7gh"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -979,11 +955,11 @@ let "now" = pkgs.stdenv.mkDerivation { name = "now"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-now.git"; - rev = "4c994dae8bb650787de1e4d9e709f2565fb354fb"; - sha256 = "1wa4j2h5rlw1lgfpm7rif3v6ksm8lplxl1x69zpk8hdf0cfyz4qm"; + rev = "b5ffed2381e5fefc063f484e607e8499e79eaf32"; + sha256 = "01khmqs4iz7dhlvd43zxj19q0c0vvqf1m128vgvgxz5mv430zfgr"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -991,11 +967,11 @@ let "nullable" = pkgs.stdenv.mkDerivation { name = "nullable"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-nullable.git"; - rev = "8b19c16b16593102ae5d5d9f5b42eea0e213e2f5"; - sha256 = "0jbmks8kwhpb5fr2b9nb70fjwh6zdnwirycvzr77jafcny24yrnl"; + rev = "3202744c6c65e8d1fbba7f4256a1c482078e7fb5"; + sha256 = "10s3b54pjmr2rxlyzvc8yc99k1dpn0qrijnc4y65yj5z6bxf2791"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1003,11 +979,11 @@ let "numbers" = pkgs.stdenv.mkDerivation { name = "numbers"; - version = "v8.0.0"; + version = "v9.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-numbers.git"; - rev = "f5bbd96cbed58403c4445bd4c73df50fc8d86f46"; - sha256 = "00pm2x4kh4fm91r7nmik1v5jclkgh7gpxz13ambyqxbxbiqjq0vg"; + rev = "2a53528f18f9415334bae28e7bb3cf3be86342c2"; + sha256 = "1h4v6ir1hq6gvkk0kla38vlcd6bv73xkc8pv71jygwqxrdwfxxgw"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1027,11 +1003,11 @@ let "options" = pkgs.stdenv.mkDerivation { name = "options"; - version = "v6.0.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-options.git"; - rev = "0309a42692251ce5e3d1d0be57d4f63f7143f858"; - sha256 = "04f70wfik1pi6nzfq2cn3la9z735akkadpx5cxbs4mx8xg032sjd"; + rev = "93e4eb4610975cb7b3bb290273396707e7384c38"; + sha256 = "1c8qkln40i1sf2lz8c6wn4ijj7jmfgzmgsrn9ax7m4ix9c05r5sq"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1039,11 +1015,11 @@ let "optparse" = pkgs.stdenv.mkDerivation { name = "optparse"; - version = "v4.1.0"; + version = "v5.0.0"; src = pkgs.fetchgit { url = "https://github.com/f-o-a-m/purescript-optparse.git"; - rev = "04f2ed818f32390a9feff04b892f23c96ccb84cb"; - sha256 = "0b05wczcjnann0xw6vdaq2c1a2n9rcgvq9l29wa5461b5mvjyb80"; + rev = "dbc4c385e6c436eed4299ae2c0bb2cc278cf2410"; + sha256 = "05sd1ziz6rx1k0wz1nnhfnl1gz3s6qld3whkkjz8lilrvycxxn47"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1051,11 +1027,11 @@ let "ordered-collections" = pkgs.stdenv.mkDerivation { name = "ordered-collections"; - version = "v2.0.2"; + version = "v3.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-ordered-collections.git"; - rev = "1929b706b07e251995b6be51baa7995c61eb4d83"; - sha256 = "0g57043ylj3kldkm5vn233yd6hiamryhdfh72cxx9h3mn0ra8ghd"; + rev = "9826b7632d0d0a691173bde308a634195f42a419"; + sha256 = "1wk8mcn1zsxi0yk9ybas2v7m0drb492806gld1xxxic8x1i19ws0"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1063,11 +1039,11 @@ let "orders" = pkgs.stdenv.mkDerivation { name = "orders"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-orders.git"; - rev = "c25b7075426cf82bcb960495f28d2541c9a75510"; - sha256 = "0wwy3ycjll0s590ra35zf5gjvs86w97rln09bj428axhg7cvfl0a"; + rev = "f86db621ec5eef1274145f8b1fd8ebbfe0ed4a2c"; + sha256 = "14fjls3v14ia6fr2w4p0i5dqv10zk343wg28m4c77a17jmvbs9r4"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1075,11 +1051,11 @@ let "parallel" = pkgs.stdenv.mkDerivation { name = "parallel"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-parallel.git"; - rev = "16b38a2e148639b04ae67e0ce63cc220da8857f7"; - sha256 = "0x8mvhgs8ygqj34xgyhk6gixqm32p2ymm00zg0zdw13g3lil9p4x"; + rev = "85290dca837771ac4870071008c933d315ef678f"; + sha256 = "0bpwvzq4dn7vx5mfj12w1zvvnamc6w2c45c2v54b9yw36snnwpcf"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1087,11 +1063,11 @@ let "parsing" = pkgs.stdenv.mkDerivation { name = "parsing"; - version = "v7.0.1"; + version = "v10.2.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-parsing.git"; - rev = "a3e82c26ce2c74b5fa38ff7814d7c35bf9233af5"; - sha256 = "15yx51khg3niqiryc6qdii6lwdvni77ak7dkbf9w5zw4h1y51p9a"; + rev = "6dc1e9cab195f4af3394b48c508b4794328edeac"; + sha256 = "1i2idq5l7vanxrd8k6yg4fjp6l3cigrq266qyjs07ri5cc4k8879"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1099,11 +1075,11 @@ let "partial" = pkgs.stdenv.mkDerivation { name = "partial"; - version = "v3.0.0"; + version = "v4.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-partial.git"; - rev = "2f0a5239efab68179a684603263bcec8f1489b08"; - sha256 = "0acxf686hvaj793hyb7kfn9lf96kv3nk0lls2p9j095ylp55sldb"; + rev = "0fa0646f5ea1ec5f0c46dcbd770c705a6c9ad3ec"; + sha256 = "04s1h0r3slyd8kcamhqqrr6piksl9y76nmf2418j0ifhp16qwxmm"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1111,11 +1087,11 @@ let "pipes" = pkgs.stdenv.mkDerivation { name = "pipes"; - version = "v7.0.1"; + version = "v8.0.0"; src = pkgs.fetchgit { url = "https://github.com/felixschl/purescript-pipes.git"; - rev = "42e43f0961ad0fc3f1cef6986fe23ca9f48f6dda"; - sha256 = "0jzgzi34wqqdcfgznbpfv4b8al2prd36yshnndlvkqfv70smx3kh"; + rev = "e3bdc0b0db0a67e89a717b6118b23e78a380e23f"; + sha256 = "1jz3bfbl8b0hgbcm9y98bv2z29b072v1k8snp19vb2xql1zd40sx"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1123,11 +1099,11 @@ let "posix-types" = pkgs.stdenv.mkDerivation { name = "posix-types"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-posix-types.git"; - rev = "e562680fce64b67e26741a61a51160a04fd3e7fb"; - sha256 = "1knhdnnmxx77qsjz3gk1ga7n713l303dxyn8zs46qh7p2hnkalkc"; + rev = "b79ff37f87846ca5caab2123cf84148e700d40d1"; + sha256 = "1zcm2hikfigh5fbwg12c61gvvjhmwgy6fplfcm6bc5aqb7w3czll"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1135,11 +1111,11 @@ let "prelude" = pkgs.stdenv.mkDerivation { name = "prelude"; - version = "v5.0.1"; + version = "v6.0.1"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-prelude.git"; - rev = "68f8012bc2309d9bf5832cdf7316ad052d586905"; - sha256 = "1x0cacvv9mmw80vy6f40y0p959q1dz28fwjswhyd7ws6npbklcy0"; + rev = "f4cad0ae8106185c9ab407f43cf9abf05c256af4"; + sha256 = "0j6mb9w728ifcp10jdv7l9k7k5pw8j1f0fa7xyb8xmbxzc59xqpy"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1147,11 +1123,11 @@ let "profunctor" = pkgs.stdenv.mkDerivation { name = "profunctor"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-profunctor.git"; - rev = "4551b8e437a00268cc9b687cbe691d75e812e82b"; - sha256 = "0fvd2xiv77sp4jd4spgdp4i9812p6pdzzbg4pa96mbr0h19jf39c"; + rev = "0a966a14e7b0c827d44657dc1710cdc712d2e034"; + sha256 = "07rhk8micbc74my6s53xbj2smvvwah2w1drqrcmcnncxdks3lqg3"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1159,11 +1135,11 @@ let "profunctor-lenses" = pkgs.stdenv.mkDerivation { name = "profunctor-lenses"; - version = "v7.0.1"; + version = "v8.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-profunctor-lenses.git"; - rev = "9c3d87a6dab8eb785a93bff11aa183796dc93183"; - sha256 = "1wknj7g6vwk2ga1rq57l470h322308ddjn5bd3x2hhfkiy039kc3"; + rev = "973d567afe458fd802cf4f0d9725b6dc35ad9297"; + sha256 = "0axz7nznn12iqh6sn9qjg6i8qglpdsqgkp30ndwdj98czcnbnybv"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1183,11 +1159,11 @@ let "psci-support" = pkgs.stdenv.mkDerivation { name = "psci-support"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-psci-support.git"; - rev = "f26fe8266a63494080476333e22f971404ea8846"; - sha256 = "16vhf8hapd7rcgmafmjpiq7smhzdh3300f2idk1q4kk01yxn8ddj"; + rev = "897cdb543548cb6078d69b6413b54841404eda72"; + sha256 = "1ix53r8avkn3fw72mngwzw7v6c6mv7j4miw5mrgjrh9hb8p2ydl1"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1195,11 +1171,11 @@ let "purescript-toppokki" = pkgs.stdenv.mkDerivation { name = "purescript-toppokki"; - version = "6983e07bf0aa55ab779bcef12df3df339a2b5bd9"; + version = "b043e9342463df76972d05981ac4ec25316834bf"; src = pkgs.fetchgit { - url = "https://github.com/firefrorefiddle/purescript-toppokki"; - rev = "6983e07bf0aa55ab779bcef12df3df339a2b5bd9"; - sha256 = "01arx2sp2k287cr4y96frnn6jlghcias9hwdr27yr28k4xa5bhfv"; + url = "https://github.com/errfrom/purescript-toppokki"; + rev = "b043e9342463df76972d05981ac4ec25316834bf"; + sha256 = "0kkk4xfnkq6fqr30d95i3x4r6z9479bx7v0ama7xf36pr0y26lk1"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1207,11 +1183,11 @@ let "quickcheck" = pkgs.stdenv.mkDerivation { name = "quickcheck"; - version = "v7.1.0"; + version = "v8.0.1"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-quickcheck.git"; - rev = "990fa1cf14b48b827d9b2d115b1c6977c4b0a76d"; - sha256 = "1dxchng3r2mad0505a0c7cc35vs1f7y2xb5i13p59jpdz6ijqa9k"; + rev = "bf5029f97e6c0d7552d3a08d2ab793a19e2c5e3d"; + sha256 = "142dvh57fl8b6i7mm37a38v7vkc1znbqz6l6wqa704m53hkikvyd"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1231,11 +1207,11 @@ let "quickcheck-laws" = pkgs.stdenv.mkDerivation { name = "quickcheck-laws"; - version = "v6.0.1"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-quickcheck-laws.git"; - rev = "464597522e5e001adc2619676584871f423b9ea0"; - sha256 = "1m397bh2w5a0wvms8rjgfxh71m7krmfkgk11j5krhz86b72k3izd"; + rev = "04f00fb78d88f38a2f2bb73b75f97ce5bf5624fc"; + sha256 = "0izp71wq253k9wih2hspfs4p1s36yins2a5mh13yl57pf1srbrky"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1243,11 +1219,11 @@ let "random" = pkgs.stdenv.mkDerivation { name = "random"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-random.git"; - rev = "3e02da113c7afbac37ea4e16188c39d3057314d5"; - sha256 = "1v6ykgp8jmx488hq8mgb0l0sf1nyhjs6wq0w279iyibk9jxc6nib"; + rev = "9540bc965a9596da02fefd9949418bb19c92533a"; + sha256 = "0qz14qviz5053j9h1jwpk0gnn692hcdx6fp90wckzrnw31d53174"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1255,11 +1231,11 @@ let "rationals" = pkgs.stdenv.mkDerivation { name = "rationals"; - version = "v5.0.0"; + version = "v5.0.1"; src = pkgs.fetchgit { - url = "https://github.com/anttih/purescript-rationals.git"; - rev = "8c52d8cc891d1223150a31416220aa9b99404442"; - sha256 = "1idvjvvx5kwmi8kj2ps95bcvlsgij1xgin4jfw3rmcqd930wqq6q"; + url = "https://github.com/purescript-contrib/purescript-rationals.git"; + rev = "b480bc41dbfc926977ebdf4e2a4b9fed253c91a1"; + sha256 = "06fczcfc937iwpj4r8qhprgw35ryn0hfqgjxmn2rcljx37q70xka"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1267,11 +1243,11 @@ let "record" = pkgs.stdenv.mkDerivation { name = "record"; - version = "v3.0.0"; + version = "v4.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-record.git"; - rev = "091495d61fcaa9d8d8232e7b800f403a3165a38f"; - sha256 = "0yidfvwiajiv8xflfsi2p8dqnp0qmmcz9jry58jyn9ga82z2pqn6"; + rev = "c89cd1ada6b636692571fc374196b1c39c4c9f70"; + sha256 = "1g7s2h1as5cz824wpm0jhjprrh66shha5i4gq37q73yw0s5p2ahm"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1279,11 +1255,11 @@ let "refs" = pkgs.stdenv.mkDerivation { name = "refs"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-refs.git"; - rev = "f66d3cdf6a6bf4510e5181b3fac215054d8f1e2e"; - sha256 = "1jhc2v784jy8bvkqy4zsh2z7pnqrhwa8n5kx98xhxx73n1bf38sg"; + rev = "f8e6216da4cb9309fde1f20cd6f69ac3a3b7f9e8"; + sha256 = "09bvfxhjfwfwv55py45s71maazwrr68k0rk4v8ynfqv91h34319h"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1291,11 +1267,11 @@ let "safe-coerce" = pkgs.stdenv.mkDerivation { name = "safe-coerce"; - version = "v1.0.0"; + version = "v2.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-safe-coerce.git"; - rev = "e719defd227d932da067a1f0d62a60b3d3ff3637"; - sha256 = "0m942lc23317izspz1sxw957mwl9yb9bgk8dh23f7b3a8w9hh8ff"; + rev = "7fa799ae80a38b8d948efcb52608e58e198b3da7"; + sha256 = "00m4l733gpl0153cbl6n5kly7jr8ids399apza2rbczif40brp9g"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1315,11 +1291,11 @@ let "sequences" = pkgs.stdenv.mkDerivation { name = "sequences"; - version = "v3.0.2"; + version = "cae456c1a7463785ad33981a93e7a9cb5fc7872c"; src = pkgs.fetchgit { - url = "https://github.com/hdgarrood/purescript-sequences"; - rev = "1f1d828ef30070569c812d0af23eb7253bb1e990"; - sha256 = "0mc0jjs1119c2nyd08yhdmliq3s47lhrdknhziga3lnbzja889k4"; + url = "https://github.com/garganscript/purescript-sequences"; + rev = "cae456c1a7463785ad33981a93e7a9cb5fc7872c"; + sha256 = "0dimbcmj7f4mbxq3yq591spizib60iir9igjzb6lbydir7kc6934"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1327,11 +1303,11 @@ let "spec" = pkgs.stdenv.mkDerivation { name = "spec"; - version = "v5.0.1"; + version = "v7.2.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-spec/purescript-spec.git"; - rev = "2cfa11573dbb695c117efce0a8f76a3daba12e87"; - sha256 = "0hpca1sa738029ww74zpw31br5x339q35kzb10iqd55lp6611k80"; + rev = "1ae536c4d9848d26087fe5e0606409740aa421b7"; + sha256 = "1vyk0fn39qfwx4i7vanazr5v0q0w0sxsxzmlliwlpcb9kvd1b2b3"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1339,11 +1315,11 @@ let "spec-quickcheck" = pkgs.stdenv.mkDerivation { name = "spec-quickcheck"; - version = "v4.0.0"; + version = "v5.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-spec/purescript-spec-quickcheck.git"; - rev = "c2991f475b8fa11de8b68bcb5895b36be04d1e82"; - sha256 = "01xcbfyqzax9c5najbfy12q0nvfklfm37llj2vkmi3wgkskg4prz"; + rev = "c83de337db1f74ff75e0d7c574a2f7407bc5f2b2"; + sha256 = "1y9rzb8kbahhchplswdxrjqm4qjkv1bnv9mzg8v62m1ipk3kdndj"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1351,11 +1327,11 @@ let "st" = pkgs.stdenv.mkDerivation { name = "st"; - version = "v5.0.1"; + version = "v6.2.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-st.git"; - rev = "994eb5e650f3caedac385dcc61694f691df57983"; - sha256 = "14hz254f1y0k3v83z719np0ddrgbca0hdsd9dvv244i07vlvm2zj"; + rev = "fc2fe2972bb12e6a2bd3b295baf01577240c23ac"; + sha256 = "17syc11gxhi1law4lskrr4swr62n4r7irj5imdyjjp8z0p5c6p8z"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1363,11 +1339,11 @@ let "strings" = pkgs.stdenv.mkDerivation { name = "strings"; - version = "v5.0.0"; + version = "v6.0.1"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-strings.git"; - rev = "157e372a23e4becd594d7e7bff6f372a6f63dd82"; - sha256 = "0hyaa4d8gyyvac2nxnwqkn2rvi5vax4bi4yv10mpk7rgb8rv7mb8"; + rev = "3d3e2f7197d4f7aacb15e854ee9a645489555fff"; + sha256 = "1dx6l4j4yw6w6nxa687gf04q4caa99ccl4cp4q22nda6ghsz7yjl"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1375,11 +1351,11 @@ let "stringutils" = pkgs.stdenv.mkDerivation { name = "stringutils"; - version = "v0.0.11"; + version = "v0.0.12"; src = pkgs.fetchgit { url = "https://github.com/menelaos/purescript-stringutils.git"; - rev = "e149d04cd5bcc25222c1807f2e1edafb36b5f70e"; - sha256 = "1hbr936bvnm5iil4cfr9qhkbzd1i00yrxf5jd0rnny29df5wsq1w"; + rev = "51d92cacd8c8102fc4e6137b4f709a2b11ca5186"; + sha256 = "0wdmishvnlfw8r6b3ivzr8d7300cxg1m77qd74ip4c0gd4zqvhs4"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1387,23 +1363,11 @@ let "tailrec" = pkgs.stdenv.mkDerivation { name = "tailrec"; - version = "v5.0.1"; + version = "v6.1.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-tailrec.git"; - rev = "5fbf0ac05dc6ab1a228b2897630195eb7483b962"; - sha256 = "1jjl2q2hyhjcdxpamzr1cdlxhmq2bl170x5p3jajb9zgwkqx0x22"; - }; - phases = "installPhase"; - installPhase = "ln -s $src $out"; - }; - - "test-unit" = pkgs.stdenv.mkDerivation { - name = "test-unit"; - version = "v16.0.0"; - src = pkgs.fetchgit { - url = "https://github.com/bodil/purescript-test-unit.git"; - rev = "56d06897b621df5d2f619433d19ababb5bb8ebd1"; - sha256 = "0qz903phxkgrn7qdz1xi49bydkf5cbxssyb4xk029zi4lshb35mw"; + rev = "5661a10afbd4849bd2e45139ea567beb40b20f9f"; + sha256 = "0snhrvkpd429r0d0bzs0mxwwz3am9bpa1m9f5a9hpmyjjkl7gddw"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1411,11 +1375,11 @@ let "these" = pkgs.stdenv.mkDerivation { name = "these"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-these.git"; - rev = "38dcf86a9bd772091e1153f2f1c13223703599b7"; - sha256 = "0d6yg3lwgralh1kcm5cd4myyz66k9qzld61hc5dg3z92d96zbvlr"; + rev = "ad4de7d2bb9ce684a9dff5def6489630736985b8"; + sha256 = "1i73qz7pk11mbiymhfg21i3nq92hqjmqzj4gjp1n6l2zkm0lmql3"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1423,11 +1387,11 @@ let "transformers" = pkgs.stdenv.mkDerivation { name = "transformers"; - version = "v5.2.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-transformers.git"; - rev = "1e5d4193b38c613c97ea1ebdb721c6b94cd8c50a"; - sha256 = "0lggimnq016v98ib6h68gnciraambxrfqm2s033wm34srcy8xs06"; + rev = "be72ab52357d9a665cbf93d73ba1c07c4b0957ee"; + sha256 = "0ijrdsppl8vx0rlbwc9p0vjbmvwlcy4ia7xymvk6y34zbxzjlzm6"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1435,11 +1399,11 @@ let "tuples" = pkgs.stdenv.mkDerivation { name = "tuples"; - version = "v6.0.1"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-tuples.git"; - rev = "d4fe8ffe9e8c512111ee0bc18a6ba0fd056a6773"; - sha256 = "0s2ar2gih4r34km8r8dqngh21s8899yb93mb7mips08ndy3ajq3a"; + rev = "4f52da2729b448c8564369378f1232d8d2dc1d8b"; + sha256 = "1m1ng0xxicb73945jymcl1hn2y2hmynlnmhb2k0kkn1jrjwgcc3d"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1447,11 +1411,11 @@ let "type-equality" = pkgs.stdenv.mkDerivation { name = "type-equality"; - version = "v4.0.0"; + version = "v4.0.1"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-type-equality.git"; - rev = "f7644468f22ed267a15d398173d234fa6f45e2e0"; - sha256 = "126pg4zg3bsrn8dzvv75xp586nznxyswzgjlr7cag3ij3j1z0kl0"; + rev = "0525b7d39e0fbd81b4209518139fb8ab02695774"; + sha256 = "1ass38jdycsjisdimdc4drg2w8vkkwp6lkvz3kvy7q0h98vdmlbr"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1471,11 +1435,11 @@ let "typelevel-prelude" = pkgs.stdenv.mkDerivation { name = "typelevel-prelude"; - version = "v6.0.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-typelevel-prelude.git"; - rev = "83ddcdb23d06c8d5ea6196596a70438f42cd4afd"; - sha256 = "1vwf3yhn8mir5y41wvlyszkgd5fxvrcyfd0l8cn20c8vfq36yzgk"; + rev = "dca2fe3c8cfd5527d4fe70c4bedfda30148405bf"; + sha256 = "0x86mrg33kpnrnsfp4p3c92j5lpyqzy87bxdynwf7smk3inqr2jc"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1483,23 +1447,11 @@ let "uint" = pkgs.stdenv.mkDerivation { name = "uint"; - version = "v6.0.3"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-uint.git"; - rev = "17fda2aff989ad7fa9f29171bf4c1196ca9ed504"; - sha256 = "1lwbkwc3yj0d5qmw7gni924wj47npgy1aqbc0ika4phc4q0shw8d"; - }; - phases = "installPhase"; - installPhase = "ln -s $src $out"; - }; - - "undefined" = pkgs.stdenv.mkDerivation { - name = "undefined"; - version = "v1.0.2"; - src = pkgs.fetchgit { - url = "https://github.com/bklaric/purescript-undefined.git"; - rev = "4012dc06b58feae301140bc081135d0f24c432b0"; - sha256 = "0kj504j3r9wr7m3yhm53bcfdzai0c2g99d2pdxlfinxk4pmixyrd"; + rev = "9e4f76ffd5192472f75583844172fe8ab3c0cb9f"; + sha256 = "173bhrd006q53s7agwyasxhfbr89x9jpz5b47vm2fr74l3jcw3lq"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1507,11 +1459,11 @@ let "unfoldable" = pkgs.stdenv.mkDerivation { name = "unfoldable"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-unfoldable.git"; - rev = "bbcc2b062b9b7d3d61f123cfb32cc8c7fb811aa6"; - sha256 = "1v3bz04wj6hj7s6mcf49hajylg6w58n78q54sqi2ra2zq8h99kpw"; + rev = "493dfe04ed590e20d8f69079df2f58486882748d"; + sha256 = "15z2k639ph8wdkrc2y838m5am1z7szw2vqymmv021skzisyn7zwf"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1519,11 +1471,11 @@ let "unicode" = pkgs.stdenv.mkDerivation { name = "unicode"; - version = "v5.0.1"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-unicode.git"; - rev = "2b66dcdb2ea533c7bc864574e860012c57ace2aa"; - sha256 = "0xh9wwyrl9nsw3h3wzalc1gaph39drj0i6k648cf9bnbb96nxa4z"; + rev = "6454d59d9e1fd1bc5a72e80e985d8282022a567a"; + sha256 = "0w2gsmqcy7pj5vd22qzpig20bdgzmbagyqxrg9mm1njjfsmcm8cv"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1531,11 +1483,11 @@ let "unordered-collections" = pkgs.stdenv.mkDerivation { name = "unordered-collections"; - version = "v2.1.4"; + version = "v3.0.1"; src = pkgs.fetchgit { url = "https://github.com/fehrenbach/purescript-unordered-collections.git"; - rev = "1be289188cef093520098e318ec910cf3ea5b40d"; - sha256 = "0vgfpdymxvgqf3sh8ji2w2b01w3s294v5mh04046s21qaywdi1jh"; + rev = "0192d2c9d0759895b7492cc00651631eb9abc5b5"; + sha256 = "0b60isac4wzakd3hh57wkdm9b5kawbis8v8ymli6b4m13673pvxw"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1543,11 +1495,11 @@ let "unsafe-coerce" = pkgs.stdenv.mkDerivation { name = "unsafe-coerce"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-unsafe-coerce.git"; - rev = "ee24f0d3b94bf925d9c50fcc2b449579580178c0"; - sha256 = "0l2agnm1k910v4yp1hz19wrsrywsr5scb397762y7pigm3frzs8r"; + rev = "ab956f82e66e633f647fb3098e8ddd3ec58d689f"; + sha256 = "0r6d3dx8jalfzvrvkagz9v05yxwkkhgbzlpswg4w1cyl03zjcla4"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1555,11 +1507,11 @@ let "untagged-union" = pkgs.stdenv.mkDerivation { name = "untagged-union"; - version = "v0.3.0"; + version = "v1.0.0"; src = pkgs.fetchgit { - url = "https://github.com/jvliwanag/purescript-untagged-union.git"; - rev = "364e172e759ebe722bd7ec12a599d532b527c0ef"; - sha256 = "06013431acz8xry9dish8p2qyj18bi505fgfikpjiblxgjazl9zx"; + url = "https://github.com/rowtype-yoga/purescript-untagged-union.git"; + rev = "ed8262a966e15e751322c327e2759a9b9c0ef3f3"; + sha256 = "163blv01abd3dhcpqz499851lhwnmb4dlfbzkr3cs53d30w3yldx"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1567,11 +1519,11 @@ let "variant" = pkgs.stdenv.mkDerivation { name = "variant"; - version = "v7.0.3"; + version = "v8.0.0"; src = pkgs.fetchgit { url = "https://github.com/natefaubion/purescript-variant.git"; - rev = "3f12411ede5edd342d25340c1babce9ae81d6793"; - sha256 = "1q2pky3gf177ihy2zjzqvp1cj18ycaki9vm4ghw18p7hf256lqmc"; + rev = "8b2bd73a4202257d80a955c4dd36f6055f149823"; + sha256 = "18nyxnaqqg1zzydwd2hh9hbzr31j509g5yb1lnd0m60bma4l9h5g"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1579,11 +1531,11 @@ let "web-dom" = pkgs.stdenv.mkDerivation { name = "web-dom"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-web/purescript-web-dom.git"; - rev = "03dfc2f512e124615ab183ade357e3d54007c79d"; - sha256 = "06g9cp9fkzyfwbz5cs0wxjxgdydm9hy7756p2w4vx94myki20hgx"; + rev = "568a1ee158b29e6e739e7a9aaed3e35ca4c4305a"; + sha256 = "0angs86ld0h3ld889ag55lh62101dfn3fknyqrfv0imgn40vwm44"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1591,11 +1543,11 @@ let "web-events" = pkgs.stdenv.mkDerivation { name = "web-events"; - version = "v3.0.0"; + version = "v4.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-web/purescript-web-events.git"; - rev = "c8a50893f04f54e2a59be7f885d25caef3589c57"; - sha256 = "1dxwrl2r39vazb3g1ka4dkpy6idyi17aq4hf9vvdsmcwf2jjwbn9"; + rev = "2124356117be7b764a2f3948032255ac4dab7051"; + sha256 = "0l47gsgj71x0gjbhjqwsar2y44ljhq3xa0nkgr1qvqxmcm00llqf"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1603,11 +1555,11 @@ let "web-file" = pkgs.stdenv.mkDerivation { name = "web-file"; - version = "v3.0.0"; + version = "v4.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-web/purescript-web-file.git"; - rev = "3e42263b4392d82c0e379b7a481bbee9b38b1308"; - sha256 = "11x1inhr5pvs2iyg818cywwdskb33q777592sd3b4g4jyczcb1li"; + rev = "023786ae62bbb8bf58156dd7f02011fa38221ef1"; + sha256 = "1wjf1m5y2qsba83is297icv9zyl7jilxdga0192mm1rp0j16jjln"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1615,11 +1567,11 @@ let "web-html" = pkgs.stdenv.mkDerivation { name = "web-html"; - version = "v3.2.0"; + version = "v4.1.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-web/purescript-web-html.git"; - rev = "3a249b966ee72c19874b4a2ec6db4059087500e4"; - sha256 = "1ds26vwyba0chhpa09m938brw9q8pxjk6z1n3d4nc30hvdkrjnbh"; + rev = "40e9a0c5c927e4d9f7ba7c1204e4792f4d24cc27"; + sha256 = "0ifvk7swjn58nbk19pi4f19r247d67zhl5xgvcwb56vlmrk2pk83"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1627,11 +1579,11 @@ let "web-storage" = pkgs.stdenv.mkDerivation { name = "web-storage"; - version = "v4.0.0"; + version = "v5.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-web/purescript-web-storage.git"; - rev = "22fa56bac204c708e521e746ad4ca2b5810f62c5"; - sha256 = "1viy027k9qyr7mckqkvizwbwkfskc6frppsa1v9a0hq6gc08mpjx"; + rev = "6b74461e136755db70c271dc898d51776363d7e2"; + sha256 = "0q1grh8cp6h1szsqg3xmwlzrc1bbz8yzlwxlcl1iym5mjiyzgkcs"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1639,11 +1591,11 @@ let "web-xhr" = pkgs.stdenv.mkDerivation { name = "web-xhr"; - version = "v4.1.0"; + version = "v5.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-web/purescript-web-xhr.git"; - rev = "997b87caa6dcdf66b6db22f29f522d722559956b"; - sha256 = "0hzmqga8l24l20kyd98bcpd8bmz7by14vl311m9yfdg5mjkjg42g"; + rev = "476122fe3ad19031aeb69186209b480e2fc9ef25"; + sha256 = "1swpprc000gfqid6r05pxs8wvlc5xjry5s2kk8lk3ah2dgv297sf"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; diff --git a/src/Internal/Wallet.js b/src/Internal/Wallet.js index 74afb8afef..2404fa0e26 100644 --- a/src/Internal/Wallet.js +++ b/src/Internal/Wallet.js @@ -29,12 +29,14 @@ const checkNotNode = () => { const enableWallet = wallet => () => { if (isWalletAvailable(wallet)()) { - return getWindow().cardano[wallet].enable().catch(e => { - throw new Error( - "enableWallet failed: " + - (typeof e.info == "string" ? e.info : e.toString()) - ); - }); + return getWindow() + .cardano[wallet].enable() + .catch(e => { + throw new Error( + "enableWallet failed: " + + (typeof e.info == "string" ? e.info : e.toString()) + ); + }); } else { throw new Error( "Wallet is not available. Use `isWalletAvailable " + diff --git a/src/Internal/Wallet/Cip30Mock.js b/src/Internal/Wallet/Cip30Mock.js index db6e2bdd82..4ec2e302f4 100644 --- a/src/Internal/Wallet/Cip30Mock.js +++ b/src/Internal/Wallet/Cip30Mock.js @@ -15,7 +15,7 @@ export function injectCip30Mock(walletName) { ")" ); } - + window_.cardano = {}; window_.cardano[walletName] = { enable: () => { From 0cb50b15304bcc1ee08f3cd4b01ea350c82c01b8 Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Tue, 4 Jul 2023 18:33:37 +0200 Subject: [PATCH 16/85] chore: fix warnings --- test/Data.purs | 1 - test/Plutip/UtxoDistribution.purs | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/test/Data.purs b/test/Data.purs index 4b784b6e4b..de27966d2c 100644 --- a/test/Data.purs +++ b/test/Data.purs @@ -38,7 +38,6 @@ import Data.BigInt (BigInt) import Data.BigInt as BigInt import Data.Either (Either(Left, Right)) import Data.Generic.Rep as G -import Data.List as List import Data.Maybe (Maybe(Just, Nothing), fromJust, maybe) import Data.Newtype (wrap) import Data.NonEmpty ((:|)) diff --git a/test/Plutip/UtxoDistribution.purs b/test/Plutip/UtxoDistribution.purs index 36e91ae977..04d1f2f749 100644 --- a/test/Plutip/UtxoDistribution.purs +++ b/test/Plutip/UtxoDistribution.purs @@ -49,10 +49,9 @@ import Data.BigInt (BigInt) import Data.BigInt (fromInt, toString) as BigInt import Data.Foldable (intercalate) import Data.FoldableWithIndex (foldlWithIndex) -import Data.List (fromFoldable) as List import Data.Map (empty, insert, isEmpty) as Map import Data.Maybe (isJust) -import Data.Newtype (unwrap, wrap) +import Data.Newtype (unwrap) import Data.NonEmpty ((:|)) import Data.Traversable (for_) import Data.Tuple.Nested (type (/\), (/\)) From ba71dfa1f86a3e02c3bea102d3e0117f56e0b5ee Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Wed, 5 Jul 2023 11:27:24 +0200 Subject: [PATCH 17/85] build: fix plutip tests --- test/Plutip/Contract/Assert.purs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/Plutip/Contract/Assert.purs b/test/Plutip/Contract/Assert.purs index 708b4461fb..543c4c39ea 100644 --- a/test/Plutip/Contract/Assert.purs +++ b/test/Plutip/Contract/Assert.purs @@ -102,7 +102,7 @@ suite = do ContractTestUtils.mkContract params eiResult `shouldSatisfy` isRight printContractAssertionFailures failures `shouldEqual` - "In addition to the error above, the following `Contract` assertions have failed:\n\n 1. Unexpected token delta (TokenName (hexToRawBytesUnsafe \"546865546f6b656e\")) at address Sender Expected: fromString \"2\", Actual: fromString \"1\"" + "In addition to the error above, the following `Contract` assertions have failed:\n\n 1. Unexpected token delta (TokenName (hexToRawBytesUnsafe \"546865546f6b656e\")) at address Sender Expected: (fromString \"2\"), Actual: (fromString \"1\")" test "ExUnits limit reached" do @@ -137,7 +137,7 @@ suite = do ContractTestUtils.mkContract params eiResult `shouldSatisfy` isRight printContractAssertionFailures failures `shouldEqual` - "In addition to the error above, the following `Contract` assertions have failed:\n\n 1. ExUnits limit exceeded: Expected: { mem: fromString \"800\", steps: fromString \"16110\" }, Actual: { mem: fromString \"800\", steps: fromString \"161100\" }" + "In addition to the error above, the following `Contract` assertions have failed:\n\n 1. ExUnits limit exceeded: Expected: { mem: (fromString \"800\"), steps: (fromString \"16110\") }, Actual: { mem: (fromString \"800\"), steps: (fromString \"161100\") }" test "An exception is thrown - everything is reported" do @@ -176,4 +176,4 @@ suite = do eiResult `shouldSatisfy` isLeft printContractAssertionFailures failures `shouldEqual` - "In addition to the error above, the following `Contract` assertions have failed:\n\n 1. Error while trying to get expected value: Unable to estimate expected loss in wallet\n\n 2. Unexpected token delta (TokenName (hexToRawBytesUnsafe \"546865546f6b656e\")) at address Sender Expected: fromString \"2\", Actual: fromString \"1\" \n\n 3. ExUnits limit exceeded: Expected: { mem: fromString \"800\", steps: fromString \"16110\" }, Actual: { mem: fromString \"800\", steps: fromString \"161100\" } \n\nThe following `Contract` checks have been skipped due to an exception: \n\n 1. Sender's output has a datum\n\n 2. Output has a reference script\n\n 3. Contains CIP-25 metadata" + "In addition to the error above, the following `Contract` assertions have failed:\n\n 1. Error while trying to get expected value: Unable to estimate expected loss in wallet\n\n 2. Unexpected token delta (TokenName (hexToRawBytesUnsafe \"546865546f6b656e\")) at address Sender Expected: (fromString \"2\"), Actual: (fromString \"1\") \n\n 3. ExUnits limit exceeded: Expected: { mem: (fromString \"800\"), steps: (fromString \"16110\") }, Actual: { mem: (fromString \"800\"), steps: (fromString \"161100\") } \n\nThe following `Contract` checks have been skipped due to an exception: \n\n 1. Sender's output has a datum\n\n 2. Output has a reference script\n\n 3. Contains CIP-25 metadata" From 682badcf4e8acee8578c894569b5b6765630a694 Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Thu, 6 Jul 2023 16:04:41 +0200 Subject: [PATCH 18/85] build: bundle and serve using `esbuild` --- .gitignore | 6 +- Makefile | 13 +- dist/esbuild/index.html | 11 + dist/esbuild/wrapper.js | 6 + esbuild/bundle.js | 4 + esbuild/config.js | 30 + esbuild/serve.js | 10 + examples/AlwaysMints.js | 13 - examples/AlwaysMints.purs | 28 +- examples/AlwaysSucceeds.js | 14 - examples/AlwaysSucceeds.purs | 9 +- examples/ECDSA.js | 13 - examples/ECDSA.purs | 16 +- examples/ExUnits.js | 14 - examples/ExUnits.purs | 6 +- examples/Helpers/LoadScript.js | 12 + examples/Helpers/LoadScript.purs | 14 + examples/IncludeDatum.js | 14 - examples/IncludeDatum.purs | 6 +- examples/Lose7Ada.js | 14 - examples/Lose7Ada.purs | 6 +- examples/MintsMultipleTokens.js | 23 - examples/MintsMultipleTokens.purs | 18 +- examples/MultipleRedeemers.js | 23 - examples/MultipleRedeemers.purs | 31 +- examples/OneShotMinting.js | 14 - examples/OneShotMinting.purs | 4 +- examples/OtherTypeTextEnvelope.js | 16 - examples/OtherTypeTextEnvelope.purs | 3 - examples/PlutusV2/InlineDatum.js | 17 - examples/PlutusV2/InlineDatum.purs | 6 +- examples/PlutusV2/OneShotMinting.js | 17 - examples/PlutusV2/OneShotMinting.purs | 4 +- examples/PlutusV2/Scripts/AlwaysMints.js | 13 - examples/PlutusV2/Scripts/AlwaysMints.purs | 6 +- examples/PlutusV2/Scripts/AlwaysSucceeds.js | 17 - examples/PlutusV2/Scripts/AlwaysSucceeds.purs | 6 +- examples/Schnorr.js | 14 - examples/Schnorr.purs | 19 +- package-lock.json | 646 ++++++++++++++++++ package.json | 3 + src/Internal/JsWebSocket.js | 2 +- test/ApplyArgs.js | 166 ----- test/ApplyArgs.purs | 85 ++- test/Deserialization.purs | 5 +- 45 files changed, 909 insertions(+), 508 deletions(-) create mode 100644 dist/esbuild/index.html create mode 100644 dist/esbuild/wrapper.js create mode 100644 esbuild/bundle.js create mode 100755 esbuild/config.js create mode 100644 esbuild/serve.js delete mode 100644 examples/AlwaysMints.js delete mode 100644 examples/AlwaysSucceeds.js delete mode 100644 examples/ECDSA.js delete mode 100644 examples/ExUnits.js create mode 100644 examples/Helpers/LoadScript.js create mode 100644 examples/Helpers/LoadScript.purs delete mode 100644 examples/IncludeDatum.js delete mode 100644 examples/Lose7Ada.js delete mode 100644 examples/MintsMultipleTokens.js delete mode 100644 examples/MultipleRedeemers.js delete mode 100644 examples/OneShotMinting.js delete mode 100644 examples/OtherTypeTextEnvelope.js delete mode 100644 examples/OtherTypeTextEnvelope.purs delete mode 100644 examples/PlutusV2/InlineDatum.js delete mode 100644 examples/PlutusV2/OneShotMinting.js delete mode 100644 examples/PlutusV2/Scripts/AlwaysMints.js delete mode 100644 examples/PlutusV2/Scripts/AlwaysSucceeds.js delete mode 100644 examples/Schnorr.js delete mode 100644 test/ApplyArgs.js diff --git a/.gitignore b/.gitignore index dce01a22ad..3b2eadffe0 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,11 @@ result-* .node .node-cfg .projectile -/dist/ +/dist/* +!/dist/esbuild/ +/dist/esbuild/* +!/dist/esbuild/index.html +!/dist/esbuild/wrapper.js output.js .DS_Store .idea/ diff --git a/Makefile b/Makefile index fbf143289a..54ad3b9bb8 100644 --- a/Makefile +++ b/Makefile @@ -12,11 +12,22 @@ preview-node-ipc = $(shell docker volume inspect store_node-preview-ipc | jq -r preprod-node-ipc = $(shell docker volume inspect store_node-preprod-ipc | jq -r '.[0].Mountpoint') run-dev: - @${ps-bundle} && BROWSER_RUNTIME=1 webpack-dev-server --progress + @${ps-bundle} --minify && BROWSER_RUNTIME=1 webpack-dev-server --progress run-build: @${ps-bundle} && BROWSER_RUNTIME=1 webpack --mode=production +esbuild-bundle: + @spago build \ + && BROWSER_RUNTIME=1 node esbuild/bundle.js ${ps-entrypoint} + +esbuild-serve: + @spago build \ + && cd dist/esbuild \ + && ln -sfn ../../fixtures fixtures \ + && cd ../.. \ + && BROWSER_RUNTIME=1 node esbuild/serve.js ${ps-entrypoint} + .ONESHELL: check-explicit-exports: @if grep -rn '(\.\.)' ${ps-sources}; then diff --git a/dist/esbuild/index.html b/dist/esbuild/index.html new file mode 100644 index 0000000000..7c9b27620b --- /dev/null +++ b/dist/esbuild/index.html @@ -0,0 +1,11 @@ + + + + + + + + + Examples source code is located in examples/ directory.
+ + diff --git a/dist/esbuild/wrapper.js b/dist/esbuild/wrapper.js new file mode 100644 index 0000000000..53e38d4119 --- /dev/null +++ b/dist/esbuild/wrapper.js @@ -0,0 +1,6 @@ +"use strict"; + +import * as m from "./index.js" + +m.main() +console.log("app starting"); diff --git a/esbuild/bundle.js b/esbuild/bundle.js new file mode 100644 index 0000000000..c3a5dd652a --- /dev/null +++ b/esbuild/bundle.js @@ -0,0 +1,4 @@ +import * as esbuild from "esbuild"; +import { buildOptions } from "./config.js"; + +esbuild.build(buildOptions); diff --git a/esbuild/config.js b/esbuild/config.js new file mode 100755 index 0000000000..ea83006c2a --- /dev/null +++ b/esbuild/config.js @@ -0,0 +1,30 @@ +import * as esbuild from "esbuild"; +import { wasmLoader } from "esbuild-plugin-wasm"; +import { polyfillNode } from "esbuild-plugin-polyfill-node"; +import { fileURLToPath } from "node:url"; + +export const buildOptions = { + entryPoints: [`output/${process.argv[2]}/index.js`], + outdir: "dist/esbuild", + define: { + BROWSER_RUNTIME: process.env.BROWSER_RUNTIME, + SCRIPTS_DIR: '"fixtures/scripts/"' + }, + plugins: [ + polyfillNode({ + polyfills: { + crypto: true, + fs: true, + os: true + } + }), + wasmLoader({ + mode: "deferred" + }) + ], + bundle: true, + platform: "browser", + format: "esm", + treeShaking: true, + logLevel: "warning" +}; diff --git a/esbuild/serve.js b/esbuild/serve.js new file mode 100644 index 0000000000..e1f4b62d33 --- /dev/null +++ b/esbuild/serve.js @@ -0,0 +1,10 @@ +import * as esbuild from "esbuild"; +import { buildOptions } from "./config.js"; + +const ctx = await esbuild.context(buildOptions); +await ctx.serve({ + host: "127.0.0.1", + port: 4008, + servedir: "dist/esbuild" +}) + diff --git a/examples/AlwaysMints.js b/examples/AlwaysMints.js deleted file mode 100644 index 02f260c016..0000000000 --- a/examples/AlwaysMints.js +++ /dev/null @@ -1,13 +0,0 @@ -/* global BROWSER_RUNTIME */ - -let script; -if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - script = require("Scripts/always-mints.plutus"); -} else { - const fs = await import("fs"); - script = fs.readFileSync( - new URL("../../fixtures/scripts/always-mints.plutus", import.meta.url), - "utf8" - ); -} -export { script as alwaysMints }; diff --git a/examples/AlwaysMints.purs b/examples/AlwaysMints.purs index cbb1dece4b..2cdefd9542 100644 --- a/examples/AlwaysMints.purs +++ b/examples/AlwaysMints.purs @@ -13,21 +13,15 @@ import Contract.Prelude import Contract.Config (ContractParams, testnetNamiConfig) import Contract.Log (logInfo') -import Contract.Monad (Contract, launchAff_, runContract) +import Contract.Monad (Contract, launchAff_, liftContractAffM, runContract) import Contract.ScriptLookups as Lookups import Contract.Scripts (MintingPolicy(PlutusMintingPolicy)) -import Contract.TextEnvelope - ( decodeTextEnvelope - , plutusScriptV1FromEnvelope - ) +import Contract.TextEnvelope (decodeTextEnvelope, plutusScriptV1FromEnvelope) import Contract.Transaction (awaitTxConfirmed, submitTxFromConstraints) import Contract.TxConstraints as Constraints import Contract.Value as Value -import Control.Monad.Error.Class (liftMaybe) -import Ctl.Examples.Helpers - ( mkCurrencySymbol - , mkTokenName - ) as Helpers +import Ctl.Examples.Helpers (mkCurrencySymbol, mkTokenName) as Helpers +import Ctl.Examples.Helpers.LoadScript (loadScript) import Data.BigInt as BigInt import Effect.Exception (error) @@ -57,14 +51,12 @@ example :: ContractParams -> Effect Unit example cfg = launchAff_ $ do runContract cfg contract -foreign import alwaysMints :: String - -alwaysMintsPolicyMaybe :: Maybe MintingPolicy -alwaysMintsPolicyMaybe = do - envelope <- decodeTextEnvelope alwaysMints - PlutusMintingPolicy <$> plutusScriptV1FromEnvelope envelope +alwaysMintsPolicyMaybe :: Aff (Maybe MintingPolicy) +alwaysMintsPolicyMaybe = + loadScript "always-mints.plutus" <#> \alwaysMints -> do + envelope <- decodeTextEnvelope alwaysMints + PlutusMintingPolicy <$> plutusScriptV1FromEnvelope envelope alwaysMintsPolicy :: Contract MintingPolicy alwaysMintsPolicy = - liftMaybe (error "Error decoding alwaysMintsPolicy") - alwaysMintsPolicyMaybe + liftContractAffM "Error decoding alwaysMintsPolicy" alwaysMintsPolicyMaybe diff --git a/examples/AlwaysSucceeds.js b/examples/AlwaysSucceeds.js deleted file mode 100644 index 5d75bf263b..0000000000 --- a/examples/AlwaysSucceeds.js +++ /dev/null @@ -1,14 +0,0 @@ -/* global BROWSER_RUNTIME */ - -let script; -if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - script = require("Scripts/always-succeeds.plutus"); -} else { - const fs = await import("fs"); - script = fs.readFileSync( - new URL("../../fixtures/scripts/always-succeeds.plutus", import.meta.url), - "utf8" - ); -} - -export { script as alwaysSucceeds }; diff --git a/examples/AlwaysSucceeds.purs b/examples/AlwaysSucceeds.purs index a0e137e110..c756569c08 100644 --- a/examples/AlwaysSucceeds.purs +++ b/examples/AlwaysSucceeds.purs @@ -2,8 +2,7 @@ -- | balance, and submit a smart-contract transaction. It creates a transaction -- | that pays two Ada to the `AlwaysSucceeds` script address. module Ctl.Examples.AlwaysSucceeds - ( alwaysSucceeds - , alwaysSucceedsScript + ( alwaysSucceedsScript , contract , example , main @@ -35,6 +34,7 @@ import Contract.Utxos (utxosAt) import Contract.Value as Value import Contract.Wallet (ownStakePubKeyHashes) import Control.Monad.Error.Class (liftMaybe) +import Ctl.Examples.Helpers.LoadScript (loadScript) import Data.Array (head) import Data.BigInt as BigInt import Data.Lens (view) @@ -118,10 +118,9 @@ spendFromAlwaysSucceeds vhash validator txId = do awaitTxConfirmed spendTxId logInfo' "Successfully spent locked values." -foreign import alwaysSucceeds :: String - alwaysSucceedsScript :: Contract Validator -alwaysSucceedsScript = +alwaysSucceedsScript = do + alwaysSucceeds <- liftAff $ loadScript "always-succeeds.plutus" liftMaybe (error "Error decoding alwaysSucceeds") do envelope <- decodeTextEnvelope alwaysSucceeds Validator <$> plutusScriptV1FromEnvelope envelope diff --git a/examples/ECDSA.js b/examples/ECDSA.js deleted file mode 100644 index 00f53cbbbb..0000000000 --- a/examples/ECDSA.js +++ /dev/null @@ -1,13 +0,0 @@ -/* global BROWSER_RUNTIME */ - -let script; -if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - script = require("Scripts/validate-ecdsa.plutus"); -} else { - const fs = await import("fs"); - script = fs.readFileSync( - new URL("../../fixtures/scripts/validate-ecdsa.plutus", import.meta.url), - "utf8" - ); -} -export { script as validateECDSA }; diff --git a/examples/ECDSA.purs b/examples/ECDSA.purs index 91fc5953a8..a21da1b68c 100644 --- a/examples/ECDSA.purs +++ b/examples/ECDSA.purs @@ -15,7 +15,7 @@ import Contract.Crypto.Secp256k1.Utils , randomSecp256k1PrivateKey ) import Contract.Log (logInfo') -import Contract.Monad (Contract, liftContractM) +import Contract.Monad (Contract, liftContractAffM, liftContractM) import Contract.Numeric.BigNum as BigNum import Contract.PlutusData ( class ToData @@ -36,6 +36,7 @@ import Contract.Transaction import Contract.TxConstraints as Constraints import Contract.Utxos (utxosAt) import Contract.Value as Value +import Ctl.Examples.Helpers.LoadScript (loadScript) import Data.Map as Map import Data.Set as Set @@ -59,7 +60,7 @@ contract = do -- | Prepare the ECDSA test by locking some funds at the validator address prepTest :: Contract TransactionHash prepTest = do - validator <- liftContractM "Caonnot get validator" getValidator + validator <- liftContractAffM "Caonnot get validator" getValidator let valHash = validatorHash validator @@ -85,7 +86,7 @@ testVerification testVerification txId ecdsaRed = do let red = Redeemer $ toData ecdsaRed - validator <- liftContractM "Can't get validator" getValidator + validator <- liftContractAffM "Can't get validator" getValidator let valHash = validatorHash validator netId <- getNetworkId @@ -128,8 +129,7 @@ testECDSA txId = do , pk: publicKey } -getValidator :: Maybe Validator -getValidator = do - decodeTextEnvelope validateECDSA >>= plutusScriptV2FromEnvelope >>> map wrap - -foreign import validateECDSA :: String +getValidator :: Aff (Maybe Validator) +getValidator = + loadScript "validate-ecdsa.plutus" <#> \validateECDSA -> + decodeTextEnvelope validateECDSA >>= plutusScriptV2FromEnvelope >>> map wrap diff --git a/examples/ExUnits.js b/examples/ExUnits.js deleted file mode 100644 index fc79dcf4a4..0000000000 --- a/examples/ExUnits.js +++ /dev/null @@ -1,14 +0,0 @@ -/* global BROWSER_RUNTIME */ - -let script; -if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - script = require("Scripts/exunits.plutus"); -} else { - const fs = await import("fs"); - script = fs.readFileSync( - new URL("../../fixtures/scripts/exunits.plutus", import.meta.url), - "utf8" - ); -} - -export { script as exUnits }; diff --git a/examples/ExUnits.purs b/examples/ExUnits.purs index 14fce6c054..bd4e41c293 100644 --- a/examples/ExUnits.purs +++ b/examples/ExUnits.purs @@ -33,6 +33,7 @@ import Contract.Utxos (utxosAt) import Contract.Value as Value import Contract.Wallet (ownStakePubKeyHashes) import Control.Monad.Error.Class (liftMaybe) +import Ctl.Examples.Helpers.LoadScript (loadScript) import Data.Array (head) import Data.BigInt (BigInt) import Data.BigInt as BigInt @@ -120,10 +121,9 @@ spendFromExUnits iters vhash validator txId = do awaitTxConfirmed spendTxId logInfo' "Successfully spent locked values." -foreign import exUnits :: String - exUnitsScript :: Contract Validator -exUnitsScript = +exUnitsScript = do + exUnits <- liftAff $ loadScript "exunits.plutus" liftMaybe (error "Error decoding exUnits") do envelope <- decodeTextEnvelope exUnits Validator <$> plutusScriptV2FromEnvelope envelope diff --git a/examples/Helpers/LoadScript.js b/examples/Helpers/LoadScript.js new file mode 100644 index 0000000000..464abe2896 --- /dev/null +++ b/examples/Helpers/LoadScript.js @@ -0,0 +1,12 @@ +/* global BROWSER_RUNTIME SCRIPTS_DIR */ + +export const _loadScript = path => async () => { + if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { + const response = await fetch(`${SCRIPTS_DIR}/${path}`); + return await response.text(); + } else { + const fs = await import("fs"); + const url = new URL(`../../fixtures/scripts/${path}`, import.meta.url); + return fs.readFileSync(url, "utf8"); + } +}; diff --git a/examples/Helpers/LoadScript.purs b/examples/Helpers/LoadScript.purs new file mode 100644 index 0000000000..7ecec45f79 --- /dev/null +++ b/examples/Helpers/LoadScript.purs @@ -0,0 +1,14 @@ +module Ctl.Examples.Helpers.LoadScript + ( loadScript + ) where + +import Prelude + +import Control.Promise (Promise, toAffE) +import Effect (Effect) +import Effect.Aff (Aff) + +foreign import _loadScript :: String -> Effect (Promise String) + +loadScript :: String -> Aff String +loadScript filepath = toAffE $ _loadScript filepath diff --git a/examples/IncludeDatum.js b/examples/IncludeDatum.js deleted file mode 100644 index fb9f62e27d..0000000000 --- a/examples/IncludeDatum.js +++ /dev/null @@ -1,14 +0,0 @@ -/* global BROWSER_RUNTIME */ - -let script; -if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - script = require("Scripts/include-datum.plutus"); -} else { - const fs = await import("fs"); - script = fs.readFileSync( - new URL("../../fixtures/scripts/include-datum.plutus", import.meta.url), - "utf8" - ); -} - -export { script as includeDatum }; diff --git a/examples/IncludeDatum.purs b/examples/IncludeDatum.purs index 5e38ad374a..54406ec5bb 100644 --- a/examples/IncludeDatum.purs +++ b/examples/IncludeDatum.purs @@ -32,6 +32,7 @@ import Contract.TxConstraints as Constraints import Contract.Utxos (utxosAt) import Contract.Value as Value import Control.Monad.Error.Class (liftMaybe) +import Ctl.Examples.Helpers.LoadScript (loadScript) import Data.Array (head) import Data.BigInt as BigInt import Data.Lens (view) @@ -94,11 +95,10 @@ spendFromIncludeDatum vhash validator txId = do awaitTxConfirmed spendTxId logInfo' "Successfully spent locked values." -foreign import includeDatum :: String - -- | checks if the datum equals 42 only42Script :: Contract Validator -only42Script = +only42Script = do + includeDatum <- liftAff $ loadScript "include-datum.plutus" liftMaybe (error "Error decoding includeDatum") do envelope <- decodeTextEnvelope includeDatum Validator <$> plutusScriptV1FromEnvelope envelope diff --git a/examples/Lose7Ada.js b/examples/Lose7Ada.js deleted file mode 100644 index a1e8d12c82..0000000000 --- a/examples/Lose7Ada.js +++ /dev/null @@ -1,14 +0,0 @@ -/* global BROWSER_RUNTIME */ - -let script; -if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - script = require("Scripts/always-fails.plutus"); -} else { - const fs = await import("fs"); - script = fs.readFileSync( - new URL("../../fixtures/scripts/always-fails.plutus", import.meta.url), - "utf8" - ); -} - -export { script as alwaysFails }; diff --git a/examples/Lose7Ada.purs b/examples/Lose7Ada.purs index b2e959125a..1a28a31018 100644 --- a/examples/Lose7Ada.purs +++ b/examples/Lose7Ada.purs @@ -36,6 +36,7 @@ import Contract.Utxos (utxosAt) import Contract.Value as Value import Contract.Wallet (getWalletBalance) import Control.Monad.Error.Class (liftMaybe) +import Ctl.Examples.Helpers.LoadScript (loadScript) import Data.BigInt as BigInt import Data.Foldable (fold) import Data.Functor ((<$>)) @@ -115,10 +116,9 @@ spendFromAlwaysFails vhash validator txId = do hasTransactionId (TransactionInput tx /\ _) = tx.transactionId == txId -foreign import alwaysFails :: String - alwaysFailsScript :: Contract Validator -alwaysFailsScript = +alwaysFailsScript = do + alwaysFails <- liftAff $ loadScript "always-fails.plutus" liftMaybe (error "Error decoding alwaysFails") do envelope <- decodeTextEnvelope alwaysFails Validator <$> plutusScriptV1FromEnvelope envelope diff --git a/examples/MintsMultipleTokens.js b/examples/MintsMultipleTokens.js deleted file mode 100644 index 99429d16db..0000000000 --- a/examples/MintsMultipleTokens.js +++ /dev/null @@ -1,23 +0,0 @@ -/* global BROWSER_RUNTIME */ - -let redeemerInt1, redeemerInt2, redeemerInt3; - -if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - redeemerInt1 = require("Scripts/redeemer1.plutus"); - redeemerInt2 = require("Scripts/redeemer2.plutus"); - redeemerInt3 = require("Scripts/redeemer3.plutus"); -} else { - const fs = await import("fs"); - const readScript = name => - fs.readFileSync( - new URL(`../../fixtures/scripts/${name}.plutus`, import.meta.url), - "utf8" - ); - redeemerInt1 = readScript("redeemer1"); - redeemerInt2 = readScript("redeemer2"); - redeemerInt3 = readScript("redeemer3"); -} - -export { redeemerInt1 }; -export { redeemerInt2 }; -export { redeemerInt3 }; diff --git a/examples/MintsMultipleTokens.purs b/examples/MintsMultipleTokens.purs index bb57734c2f..bdba95fcf6 100644 --- a/examples/MintsMultipleTokens.purs +++ b/examples/MintsMultipleTokens.purs @@ -30,6 +30,7 @@ import Ctl.Examples.Helpers ( mkCurrencySymbol , mkTokenName ) as Helpers +import Ctl.Examples.Helpers.LoadScript (loadScript) import Data.BigInt (fromInt) as BigInt import Effect.Exception (error) @@ -74,24 +75,23 @@ example :: ContractParams -> Effect Unit example cfg = launchAff_ do runContract cfg contract -foreign import redeemerInt1 :: String -foreign import redeemerInt2 :: String -foreign import redeemerInt3 :: String - mintingPolicyRdmrInt1 :: Contract MintingPolicy -mintingPolicyRdmrInt1 = +mintingPolicyRdmrInt1 = do + redeemerInt1 <- liftAff $ loadScript "redeemer1.plutus" liftMaybe (error "Error decoding redeemerInt1") do - envelope <- decodeTextEnvelope redeemerInt3 + envelope <- decodeTextEnvelope redeemerInt1 PlutusMintingPolicy <$> plutusScriptV1FromEnvelope envelope mintingPolicyRdmrInt2 :: Contract MintingPolicy -mintingPolicyRdmrInt2 = +mintingPolicyRdmrInt2 = do + redeemerInt2 <- liftAff $ loadScript "redeemer2.plutus" liftMaybe (error "Error decoding redeemerInt2") do - envelope <- decodeTextEnvelope redeemerInt3 + envelope <- decodeTextEnvelope redeemerInt2 PlutusMintingPolicy <$> plutusScriptV1FromEnvelope envelope mintingPolicyRdmrInt3 :: Contract MintingPolicy -mintingPolicyRdmrInt3 = +mintingPolicyRdmrInt3 = do + redeemerInt3 <- liftAff $ loadScript "redeemer3.plutus" liftMaybe (error "Error decoding redeemerInt3") do envelope <- decodeTextEnvelope redeemerInt3 PlutusMintingPolicy <$> plutusScriptV1FromEnvelope envelope diff --git a/examples/MultipleRedeemers.js b/examples/MultipleRedeemers.js deleted file mode 100644 index 09bf66dbe3..0000000000 --- a/examples/MultipleRedeemers.js +++ /dev/null @@ -1,23 +0,0 @@ -/* global BROWSER_RUNTIME */ - -let vredeemerInt1, vredeemerInt2, vredeemerInt3; - -if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - vredeemerInt1 = require("Scripts/redeemer1-validator.plutus"); - vredeemerInt2 = require("Scripts/redeemer2-validator.plutus"); - vredeemerInt3 = require("Scripts/redeemer3-validator.plutus"); -} else { - const fs = await import("fs"); - const readScript = name => - fs.readFileSync( - new URL(`../../fixtures/scripts/${name}.plutus`, import.meta.url), - "utf8" - ); - vredeemerInt1 = readScript("redeemer1-validator"); - vredeemerInt2 = readScript("redeemer2-validator"); - vredeemerInt3 = readScript("redeemer3-validator"); -} - -export { vredeemerInt1 }; -export { vredeemerInt2 }; -export { vredeemerInt3 }; diff --git a/examples/MultipleRedeemers.purs b/examples/MultipleRedeemers.purs index 6ed5c9d0f2..5b96c9b6cc 100644 --- a/examples/MultipleRedeemers.purs +++ b/examples/MultipleRedeemers.purs @@ -30,6 +30,7 @@ import Ctl.Examples.Helpers ( mkCurrencySymbol , mkTokenName ) +import Ctl.Examples.Helpers.LoadScript (loadScript) import Ctl.Examples.MintsMultipleTokens ( mintingPolicyRdmrInt3 ) @@ -118,26 +119,26 @@ spendLockedByIntOutputParams (validator /\ redeemerVal) = do pure $ constraints /\ (Lookups.unspentOutputs utxo <> Lookups.validator validator) ---- Importing validation scripts - -foreign import vredeemerInt1 :: String -foreign import vredeemerInt2 :: String -foreign import vredeemerInt3 :: String - -- | checks whether redeemer is 1 redeemerIs1Validator :: Contract Validator -redeemerIs1Validator = liftMaybe (error "Error decoding vredeemerInt1") do - envelope <- decodeTextEnvelope vredeemerInt1 - Validator <$> plutusScriptV1FromEnvelope envelope +redeemerIs1Validator = do + vredeemerInt1 <- liftAff $ loadScript "redeemer1-validator.plutus" + liftMaybe (error "Error decoding vredeemerInt1") do + envelope <- decodeTextEnvelope vredeemerInt1 + Validator <$> plutusScriptV1FromEnvelope envelope -- | checks whether redeemer is 2 redeemerIs2Validator :: Contract Validator -redeemerIs2Validator = liftMaybe (error "Error decoding vredeemerInt2") do - envelope <- decodeTextEnvelope vredeemerInt2 - Validator <$> plutusScriptV1FromEnvelope envelope +redeemerIs2Validator = do + vredeemerInt2 <- liftAff $ loadScript "redeemer2-validator.plutus" + liftMaybe (error "Error decoding vredeemerInt2") do + envelope <- decodeTextEnvelope vredeemerInt2 + Validator <$> plutusScriptV1FromEnvelope envelope -- | checks whether redeemer is 3 redeemerIs3Validator :: Contract Validator -redeemerIs3Validator = liftMaybe (error "Error decoding vredeemerInt3") do - envelope <- decodeTextEnvelope vredeemerInt3 - Validator <$> plutusScriptV1FromEnvelope envelope +redeemerIs3Validator = do + vredeemerInt3 <- liftAff $ loadScript "redeemer3-validator.plutus" + liftMaybe (error "Error decoding vredeemerInt3") do + envelope <- decodeTextEnvelope vredeemerInt3 + Validator <$> plutusScriptV1FromEnvelope envelope diff --git a/examples/OneShotMinting.js b/examples/OneShotMinting.js deleted file mode 100644 index 9a7374aa8f..0000000000 --- a/examples/OneShotMinting.js +++ /dev/null @@ -1,14 +0,0 @@ -/* global BROWSER_RUNTIME */ - -let script; -if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - script = require("Scripts/one-shot-minting.plutus"); -} else { - const fs = await import("fs"); - script = fs.readFileSync( - new URL("../../fixtures/scripts/one-shot-minting.plutus", import.meta.url), - "utf8" - ); -} - -export { script as oneShotMinting }; diff --git a/examples/OneShotMinting.purs b/examples/OneShotMinting.purs index 4d040746ec..a9d82a586e 100644 --- a/examples/OneShotMinting.purs +++ b/examples/OneShotMinting.purs @@ -50,6 +50,7 @@ import Contract.Wallet (getWalletUtxos) import Control.Monad.Error.Class (liftMaybe) import Control.Monad.Trans.Class (lift) import Ctl.Examples.Helpers (mkCurrencySymbol, mkTokenName) as Helpers +import Ctl.Examples.Helpers.LoadScript (loadScript) import Data.Array (head, singleton) as Array import Data.BigInt (BigInt) import Data.Map (toUnfoldable) as Map @@ -112,14 +113,13 @@ mkContractWithAssertions exampleName mkMintingPolicy = do logInfo' "Tx submitted successfully!" pure { txFinalFee } -foreign import oneShotMinting :: String - oneShotMintingPolicy :: TransactionInput -> Contract MintingPolicy oneShotMintingPolicy = map PlutusMintingPolicy <<< oneShotMintingPolicyScript oneShotMintingPolicyScript :: TransactionInput -> Contract PlutusScript oneShotMintingPolicyScript txInput = do + oneShotMinting <- liftAff $ loadScript "one-shot-minting.plutus" script <- liftMaybe (error "Error decoding oneShotMinting") do envelope <- decodeTextEnvelope oneShotMinting plutusScriptV1FromEnvelope envelope diff --git a/examples/OtherTypeTextEnvelope.js b/examples/OtherTypeTextEnvelope.js deleted file mode 100644 index 2c087801e0..0000000000 --- a/examples/OtherTypeTextEnvelope.js +++ /dev/null @@ -1,16 +0,0 @@ -/* global BROWSER_RUNTIME */ - -let script; -if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - script = require("Scripts/other-type-text-envelope.plutus"); -} else { - const fs = await import("fs"); - script = fs.readFileSync( - new URL( - "../../fixtures/scripts/other-type-text-envelope.plutus", - import.meta.url - ), - "utf8" - ); -} -export { script as otherTypeTextEnvelope }; diff --git a/examples/OtherTypeTextEnvelope.purs b/examples/OtherTypeTextEnvelope.purs deleted file mode 100644 index 725be0b5b6..0000000000 --- a/examples/OtherTypeTextEnvelope.purs +++ /dev/null @@ -1,3 +0,0 @@ -module Ctl.Examples.OtherTypeTextEnvelope where - -foreign import otherTypeTextEnvelope :: String diff --git a/examples/PlutusV2/InlineDatum.js b/examples/PlutusV2/InlineDatum.js deleted file mode 100644 index 724620f74a..0000000000 --- a/examples/PlutusV2/InlineDatum.js +++ /dev/null @@ -1,17 +0,0 @@ -/* global BROWSER_RUNTIME */ - -let script; -if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - script = require("Scripts/check-datum-is-inline.plutus"); -} else { - const fs = await import("fs"); - script = fs.readFileSync( - new URL( - "../../fixtures/scripts/check-datum-is-inline.plutus", - import.meta.url - ), - "utf8" - ); -} - -export { script as checkDatumIsInline }; diff --git a/examples/PlutusV2/InlineDatum.purs b/examples/PlutusV2/InlineDatum.purs index 2b30191db0..4530608ba2 100644 --- a/examples/PlutusV2/InlineDatum.purs +++ b/examples/PlutusV2/InlineDatum.purs @@ -38,6 +38,7 @@ import Contract.TxConstraints as Constraints import Contract.Utxos (utxosAt) import Contract.Value as Value import Control.Monad.Error.Class (liftMaybe) +import Ctl.Examples.Helpers.LoadScript (loadScript) import Data.BigInt as BigInt import Data.Map as Map import Effect.Exception (error) @@ -161,10 +162,9 @@ readFromCheckDatumIsInline vhash txId = do hasTransactionId (TransactionInput tx /\ _) = tx.transactionId == txId -foreign import checkDatumIsInline :: String - checkDatumIsInlineScript :: Contract Validator -checkDatumIsInlineScript = +checkDatumIsInlineScript = do + checkDatumIsInline <- liftAff $ loadScript "check-datum-is-inline.plutus" liftMaybe (error "Error decoding checkDatumIsInline") do envelope <- decodeTextEnvelope checkDatumIsInline Validator <$> plutusScriptV2FromEnvelope envelope diff --git a/examples/PlutusV2/OneShotMinting.js b/examples/PlutusV2/OneShotMinting.js deleted file mode 100644 index bfe827a719..0000000000 --- a/examples/PlutusV2/OneShotMinting.js +++ /dev/null @@ -1,17 +0,0 @@ -/* global BROWSER_RUNTIME */ - -let script; -if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - script = require("Scripts/one-shot-minting-v2.plutus"); -} else { - const fs = await import("fs"); - script = fs.readFileSync( - new URL( - "../../fixtures/scripts/one-shot-minting-v2.plutus", - import.meta.url - ), - "utf8" - ); -} - -export { script as oneShotMinting }; diff --git a/examples/PlutusV2/OneShotMinting.purs b/examples/PlutusV2/OneShotMinting.purs index fb46fd6106..c229d6fcd9 100644 --- a/examples/PlutusV2/OneShotMinting.purs +++ b/examples/PlutusV2/OneShotMinting.purs @@ -22,6 +22,7 @@ import Contract.Scripts (MintingPolicy(PlutusMintingPolicy), PlutusScript) import Contract.TextEnvelope (decodeTextEnvelope, plutusScriptV2FromEnvelope) import Contract.Transaction (TransactionInput) import Control.Monad.Error.Class (liftMaybe) +import Ctl.Examples.Helpers.LoadScript (loadScript) import Ctl.Examples.OneShotMinting ( mkContractWithAssertions , mkOneShotMintingPolicy @@ -40,14 +41,13 @@ contract = mkContractWithAssertions "Examples.PlutusV2.OneShotMinting" oneShotMintingPolicyV2 -foreign import oneShotMinting :: String - oneShotMintingPolicyV2 :: TransactionInput -> Contract MintingPolicy oneShotMintingPolicyV2 = map PlutusMintingPolicy <<< oneShotMintingPolicyScriptV2 oneShotMintingPolicyScriptV2 :: TransactionInput -> Contract PlutusScript oneShotMintingPolicyScriptV2 txInput = do + oneShotMinting <- liftAff $ loadScript "one-shot-minting-v2.plutus" script <- liftMaybe (error "Error decoding oneShotMinting") do envelope <- decodeTextEnvelope oneShotMinting plutusScriptV2FromEnvelope envelope diff --git a/examples/PlutusV2/Scripts/AlwaysMints.js b/examples/PlutusV2/Scripts/AlwaysMints.js deleted file mode 100644 index dee3ecf8e1..0000000000 --- a/examples/PlutusV2/Scripts/AlwaysMints.js +++ /dev/null @@ -1,13 +0,0 @@ -/* global BROWSER_RUNTIME */ - -let script; -if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - script = require("Scripts/always-mints-v2.plutus"); -} else { - const fs = await import("fs"); - script = fs.readFileSync( - new URL("../../fixtures/scripts/always-mints-v2.plutus", import.meta.url), - "utf8" - ); -} -export { script as alwaysMintsV2 }; diff --git a/examples/PlutusV2/Scripts/AlwaysMints.purs b/examples/PlutusV2/Scripts/AlwaysMints.purs index 8f89cc3d2a..4d72ac89b1 100644 --- a/examples/PlutusV2/Scripts/AlwaysMints.purs +++ b/examples/PlutusV2/Scripts/AlwaysMints.purs @@ -9,15 +9,15 @@ import Contract.Monad (Contract) import Contract.Scripts (MintingPolicy(PlutusMintingPolicy), PlutusScript) import Contract.TextEnvelope (decodeTextEnvelope, plutusScriptV2FromEnvelope) import Control.Monad.Error.Class (liftMaybe) +import Ctl.Examples.Helpers.LoadScript (loadScript) import Effect.Exception (error) -foreign import alwaysMintsV2 :: String - alwaysMintsPolicyV2 :: Contract MintingPolicy alwaysMintsPolicyV2 = PlutusMintingPolicy <$> alwaysMintsPolicyScriptV2 alwaysMintsPolicyScriptV2 :: Contract PlutusScript -alwaysMintsPolicyScriptV2 = +alwaysMintsPolicyScriptV2 = do + alwaysMintsV2 <- liftAff $ loadScript "always-mints-v2.plutus" liftMaybe (error "Error decoding alwaysMintsV2") do envelope <- decodeTextEnvelope alwaysMintsV2 plutusScriptV2FromEnvelope envelope diff --git a/examples/PlutusV2/Scripts/AlwaysSucceeds.js b/examples/PlutusV2/Scripts/AlwaysSucceeds.js deleted file mode 100644 index 5308d431fd..0000000000 --- a/examples/PlutusV2/Scripts/AlwaysSucceeds.js +++ /dev/null @@ -1,17 +0,0 @@ -/* global BROWSER_RUNTIME */ - -let script; -if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - script = require("Scripts/always-succeeds-v2.plutus"); -} else { - const fs = await import("fs"); - script = fs.readFileSync( - new URL( - "../../fixtures/scripts/always-succeeds-v2.plutus", - import.meta.url - ), - "utf8" - ); -} - -export { script as alwaysSucceedsV2 }; diff --git a/examples/PlutusV2/Scripts/AlwaysSucceeds.purs b/examples/PlutusV2/Scripts/AlwaysSucceeds.purs index 5b9f273f60..fd9a57081d 100644 --- a/examples/PlutusV2/Scripts/AlwaysSucceeds.purs +++ b/examples/PlutusV2/Scripts/AlwaysSucceeds.purs @@ -8,12 +8,12 @@ import Contract.Monad (Contract) import Contract.Scripts (Validator(Validator)) import Contract.TextEnvelope (decodeTextEnvelope, plutusScriptV2FromEnvelope) import Control.Monad.Error.Class (liftMaybe) +import Ctl.Examples.Helpers.LoadScript (loadScript) import Effect.Exception (error) -foreign import alwaysSucceedsV2 :: String - alwaysSucceedsScriptV2 :: Contract Validator -alwaysSucceedsScriptV2 = +alwaysSucceedsScriptV2 = do + alwaysSucceedsV2 <- liftAff $ loadScript "always-succeeds-v2.plutus" liftMaybe (error "Error decoding alwaysSucceeds") do envelope <- decodeTextEnvelope alwaysSucceedsV2 Validator <$> plutusScriptV2FromEnvelope envelope diff --git a/examples/Schnorr.js b/examples/Schnorr.js deleted file mode 100644 index 49e261a898..0000000000 --- a/examples/Schnorr.js +++ /dev/null @@ -1,14 +0,0 @@ -/* global BROWSER_RUNTIME */ - -let script; -if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - script = require("Scripts/validate-schnorr.plutus"); -} else { - const fs = await import("fs"); - script = fs.readFileSync( - new URL("../../fixtures/scripts/validate-schnorr.plutus", import.meta.url), - "utf8" - ); -} - -export { script as validateSchnorr }; diff --git a/examples/Schnorr.purs b/examples/Schnorr.purs index 292d248641..ec43007c29 100644 --- a/examples/Schnorr.purs +++ b/examples/Schnorr.purs @@ -11,7 +11,7 @@ import Contract.Crypto.Secp256k1.Schnorr ) import Contract.Crypto.Secp256k1.Utils (randomSecp256k1PrivateKey) import Contract.Log (logInfo') -import Contract.Monad (Contract, liftContractM) +import Contract.Monad (Contract, liftContractAffM, liftContractM) import Contract.Numeric.BigNum as BigNum import Contract.PlutusData ( class ToData @@ -22,7 +22,7 @@ import Contract.PlutusData ) import Contract.Prim.ByteArray (ByteArray, byteArrayFromIntArrayUnsafe) import Contract.ScriptLookups as Lookups -import Contract.Scripts (Validator, validatorHash) +import Contract.Scripts (Validator(Validator), validatorHash) import Contract.TextEnvelope (decodeTextEnvelope, plutusScriptV2FromEnvelope) import Contract.Transaction ( TransactionHash @@ -32,6 +32,7 @@ import Contract.Transaction import Contract.TxConstraints as Constraints import Contract.Utxos (utxosAt) import Contract.Value as Value +import Ctl.Examples.Helpers.LoadScript (loadScript) import Data.Map as Map import Data.Set as Set @@ -55,7 +56,7 @@ contract = do -- | Prepare the ECDSA test by locking some funds at the validator address prepTest :: Contract TransactionHash prepTest = do - validator <- liftContractM "Caonnot get validator" getValidator + validator <- liftContractAffM "Caonnot get validator" getValidator let valHash = validatorHash validator val = Value.lovelaceValueOf one @@ -80,7 +81,7 @@ testVerification testVerification txId ecdsaRed = do let red = Redeemer $ toData ecdsaRed - validator <- liftContractM "Can't get validator" getValidator + validator <- liftContractAffM "Can't get validator" getValidator let valHash = validatorHash validator netId <- getNetworkId @@ -122,8 +123,8 @@ testSchnorr txId = do , pk: publicKey } -getValidator :: Maybe Validator -getValidator = do - decodeTextEnvelope validateSchnorr >>= plutusScriptV2FromEnvelope >>> map wrap - -foreign import validateSchnorr :: String +getValidator :: Aff (Maybe Validator) +getValidator = + loadScript "validate-schnorr.plutus" <#> \validateSchnorr -> do + envelope <- decodeTextEnvelope validateSchnorr + Validator <$> plutusScriptV2FromEnvelope envelope diff --git a/package-lock.json b/package-lock.json index a6523548ef..df17096ec6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,6 +35,9 @@ "devDependencies": { "buffer": "6.0.3", "doctoc": "^2.2.1", + "esbuild": "0.18.11", + "esbuild-plugin-polyfill-node": "^0.3.0", + "esbuild-plugin-wasm": "^1.1.0", "html-webpack-plugin": "5.5.0", "webpack": "5.67.0", "webpack-cli": "4.10", @@ -70,6 +73,358 @@ "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-11.2.1.tgz", "integrity": "sha512-+Rw35NW4Qv/9uFaPxhKtxiIPmoBEIFMAgdqQxZTw6hNT/wvBp2TvwTBPnOW8ODs7GUAA8nrO1rJJAaxF+mAG2w==" }, + "node_modules/@esbuild/android-arm": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.11.tgz", + "integrity": "sha512-q4qlUf5ucwbUJZXF5tEQ8LF7y0Nk4P58hOsGk3ucY0oCwgQqAnqXVbUuahCddVHfrxmpyewRpiTHwVHIETYu7Q==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.11.tgz", + "integrity": "sha512-snieiq75Z1z5LJX9cduSAjUr7vEI1OdlzFPMw0HH5YI7qQHDd3qs+WZoMrWYDsfRJSq36lIA6mfZBkvL46KoIw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.11.tgz", + "integrity": "sha512-iPuoxQEV34+hTF6FT7om+Qwziv1U519lEOvekXO9zaMMlT9+XneAhKL32DW3H7okrCOBQ44BMihE8dclbZtTuw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.11.tgz", + "integrity": "sha512-Gm0QkI3k402OpfMKyQEEMG0RuW2LQsSmI6OeO4El2ojJMoF5NLYb3qMIjvbG/lbMeLOGiW6ooU8xqc+S0fgz2w==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.11.tgz", + "integrity": "sha512-N15Vzy0YNHu6cfyDOjiyfJlRJCB/ngKOAvoBf1qybG3eOq0SL2Lutzz9N7DYUbb7Q23XtHPn6lMDF6uWbGv9Fw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.11.tgz", + "integrity": "sha512-atEyuq6a3omEY5qAh5jIORWk8MzFnCpSTUruBgeyN9jZq1K/QI9uke0ATi3MHu4L8c59CnIi4+1jDKMuqmR71A==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.11.tgz", + "integrity": "sha512-XtuPrEfBj/YYYnAAB7KcorzzpGTvOr/dTtXPGesRfmflqhA4LMF0Gh/n5+a9JBzPuJ+CGk17CA++Hmr1F/gI0Q==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.11.tgz", + "integrity": "sha512-Idipz+Taso/toi2ETugShXjQ3S59b6m62KmLHkJlSq/cBejixmIydqrtM2XTvNCywFl3VC7SreSf6NV0i6sRyg==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.11.tgz", + "integrity": "sha512-c6Vh2WS9VFKxKZ2TvJdA7gdy0n6eSy+yunBvv4aqNCEhSWVor1TU43wNRp2YLO9Vng2G+W94aRz+ILDSwAiYog==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.11.tgz", + "integrity": "sha512-S3hkIF6KUqRh9n1Q0dSyYcWmcVa9Cg+mSoZEfFuzoYXXsk6196qndrM+ZiHNwpZKi3XOXpShZZ+9dfN5ykqjjw==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.11.tgz", + "integrity": "sha512-MRESANOoObQINBA+RMZW+Z0TJWpibtE7cPFnahzyQHDCA9X9LOmGh68MVimZlM9J8n5Ia8lU773te6O3ILW8kw==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.11.tgz", + "integrity": "sha512-qVyPIZrXNMOLYegtD1u8EBccCrBVshxMrn5MkuFc3mEVsw7CCQHaqZ4jm9hbn4gWY95XFnb7i4SsT3eflxZsUg==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.11.tgz", + "integrity": "sha512-T3yd8vJXfPirZaUOoA9D2ZjxZX4Gr3QuC3GztBJA6PklLotc/7sXTOuuRkhE9W/5JvJP/K9b99ayPNAD+R+4qQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.11.tgz", + "integrity": "sha512-evUoRPWiwuFk++snjH9e2cAjF5VVSTj+Dnf+rkO/Q20tRqv+644279TZlPK8nUGunjPAtQRCj1jQkDAvL6rm2w==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.11.tgz", + "integrity": "sha512-/SlRJ15XR6i93gRWquRxYCfhTeC5PdqEapKoLbX63PLCmAkXZHY2uQm2l9bN0oPHBsOw2IswRZctMYS0MijFcg==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.11.tgz", + "integrity": "sha512-xcncej+wF16WEmIwPtCHi0qmx1FweBqgsRtEL1mSHLFR6/mb3GEZfLQnx+pUDfRDEM4DQF8dpXIW7eDOZl1IbA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.11.tgz", + "integrity": "sha512-aSjMHj/F7BuS1CptSXNg6S3M4F3bLp5wfFPIJM+Km2NfIVfFKhdmfHF9frhiCLIGVzDziggqWll0B+9AUbud/Q==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.11.tgz", + "integrity": "sha512-tNBq+6XIBZtht0xJGv7IBB5XaSyvYPCm1PxJ33zLQONdZoLVM0bgGqUrXnJyiEguD9LU4AHiu+GCXy/Hm9LsdQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.11.tgz", + "integrity": "sha512-kxfbDOrH4dHuAAOhr7D7EqaYf+W45LsAOOhAet99EyuxxQmjbk8M9N4ezHcEiCYPaiW8Dj3K26Z2V17Gt6p3ng==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.11.tgz", + "integrity": "sha512-Sh0dDRyk1Xi348idbal7lZyfSkjhJsdFeuC13zqdipsvMetlGiFQNdO+Yfp6f6B4FbyQm7qsk16yaZk25LChzg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.11.tgz", + "integrity": "sha512-o9JUIKF1j0rqJTFbIoF4bXj6rvrTZYOrfRcGyL0Vm5uJ/j5CkBD/51tpdxe9lXEDouhRgdr/BYzUrDOvrWwJpg==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.11.tgz", + "integrity": "sha512-rQI4cjLHd2hGsM1LqgDI7oOCYbQ6IBOVsX9ejuRMSze0GqXUG2ekwiKkiBU1pRGSeCqFFHxTrcEydB2Hyoz9CA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", @@ -122,6 +477,12 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "node_modules/@jspm/core": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@jspm/core/-/core-2.0.1.tgz", + "integrity": "sha512-Lg3PnLp0QXpxwLIAuuJboLeRaIhrgJjeuh797QADg3xz8wGLugQOS5DpsE8A6i6Adgzf+bacllkKZG3J0tGfDw==", + "dev": true + }, "node_modules/@mlabs-haskell/csl-gc-wrapper": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@mlabs-haskell/csl-gc-wrapper/-/csl-gc-wrapper-1.0.1.tgz", @@ -2069,6 +2430,69 @@ "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz", "integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==" }, + "node_modules/esbuild": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.11.tgz", + "integrity": "sha512-i8u6mQF0JKJUlGR3OdFLKldJQMMs8OqM9Cc3UCi9XXziJ9WERM5bfkHaEAy0YAvPRMgqSW55W7xYn84XtEFTtA==", + "dev": true, + "hasInstallScript": true, + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=12" + }, + "optionalDependencies": { + "@esbuild/android-arm": "0.18.11", + "@esbuild/android-arm64": "0.18.11", + "@esbuild/android-x64": "0.18.11", + "@esbuild/darwin-arm64": "0.18.11", + "@esbuild/darwin-x64": "0.18.11", + "@esbuild/freebsd-arm64": "0.18.11", + "@esbuild/freebsd-x64": "0.18.11", + "@esbuild/linux-arm": "0.18.11", + "@esbuild/linux-arm64": "0.18.11", + "@esbuild/linux-ia32": "0.18.11", + "@esbuild/linux-loong64": "0.18.11", + "@esbuild/linux-mips64el": "0.18.11", + "@esbuild/linux-ppc64": "0.18.11", + "@esbuild/linux-riscv64": "0.18.11", + "@esbuild/linux-s390x": "0.18.11", + "@esbuild/linux-x64": "0.18.11", + "@esbuild/netbsd-x64": "0.18.11", + "@esbuild/openbsd-x64": "0.18.11", + "@esbuild/sunos-x64": "0.18.11", + "@esbuild/win32-arm64": "0.18.11", + "@esbuild/win32-ia32": "0.18.11", + "@esbuild/win32-x64": "0.18.11" + } + }, + "node_modules/esbuild-plugin-polyfill-node": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/esbuild-plugin-polyfill-node/-/esbuild-plugin-polyfill-node-0.3.0.tgz", + "integrity": "sha512-SHG6CKUfWfYyYXGpW143NEZtcVVn8S/WHcEOxk62LuDXnY4Zpmc+WmxJKN6GMTgTClXJXhEM5KQlxKY6YjbucQ==", + "dev": true, + "dependencies": { + "@jspm/core": "^2.0.1", + "import-meta-resolve": "^3.0.0" + }, + "peerDependencies": { + "esbuild": "*" + } + }, + "node_modules/esbuild-plugin-wasm": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/esbuild-plugin-wasm/-/esbuild-plugin-wasm-1.1.0.tgz", + "integrity": "sha512-0bQ6+1tUbySSnxzn5jnXHMDvYnT0cN/Wd4Syk8g/sqAIJUg7buTIi22svS3Qz6ssx895NT+TgLPb33xi1OkZig==", + "dev": true, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "type": "individual", + "url": "https://ko-fi.com/tschrock" + } + }, "node_modules/escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -3033,6 +3457,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/import-meta-resolve": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-3.0.0.tgz", + "integrity": "sha512-4IwhLhNNA8yy445rPjD/lWh++7hMDOml2eHtd58eG7h+qK3EryMuuRbsHGPikCoAgIkkDnckKfWSk2iDla/ejg==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/indent-string": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", @@ -6629,6 +7063,160 @@ "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-11.2.1.tgz", "integrity": "sha512-+Rw35NW4Qv/9uFaPxhKtxiIPmoBEIFMAgdqQxZTw6hNT/wvBp2TvwTBPnOW8ODs7GUAA8nrO1rJJAaxF+mAG2w==" }, + "@esbuild/android-arm": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.11.tgz", + "integrity": "sha512-q4qlUf5ucwbUJZXF5tEQ8LF7y0Nk4P58hOsGk3ucY0oCwgQqAnqXVbUuahCddVHfrxmpyewRpiTHwVHIETYu7Q==", + "dev": true, + "optional": true + }, + "@esbuild/android-arm64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.11.tgz", + "integrity": "sha512-snieiq75Z1z5LJX9cduSAjUr7vEI1OdlzFPMw0HH5YI7qQHDd3qs+WZoMrWYDsfRJSq36lIA6mfZBkvL46KoIw==", + "dev": true, + "optional": true + }, + "@esbuild/android-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.11.tgz", + "integrity": "sha512-iPuoxQEV34+hTF6FT7om+Qwziv1U519lEOvekXO9zaMMlT9+XneAhKL32DW3H7okrCOBQ44BMihE8dclbZtTuw==", + "dev": true, + "optional": true + }, + "@esbuild/darwin-arm64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.11.tgz", + "integrity": "sha512-Gm0QkI3k402OpfMKyQEEMG0RuW2LQsSmI6OeO4El2ojJMoF5NLYb3qMIjvbG/lbMeLOGiW6ooU8xqc+S0fgz2w==", + "dev": true, + "optional": true + }, + "@esbuild/darwin-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.11.tgz", + "integrity": "sha512-N15Vzy0YNHu6cfyDOjiyfJlRJCB/ngKOAvoBf1qybG3eOq0SL2Lutzz9N7DYUbb7Q23XtHPn6lMDF6uWbGv9Fw==", + "dev": true, + "optional": true + }, + "@esbuild/freebsd-arm64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.11.tgz", + "integrity": "sha512-atEyuq6a3omEY5qAh5jIORWk8MzFnCpSTUruBgeyN9jZq1K/QI9uke0ATi3MHu4L8c59CnIi4+1jDKMuqmR71A==", + "dev": true, + "optional": true + }, + "@esbuild/freebsd-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.11.tgz", + "integrity": "sha512-XtuPrEfBj/YYYnAAB7KcorzzpGTvOr/dTtXPGesRfmflqhA4LMF0Gh/n5+a9JBzPuJ+CGk17CA++Hmr1F/gI0Q==", + "dev": true, + "optional": true + }, + "@esbuild/linux-arm": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.11.tgz", + "integrity": "sha512-Idipz+Taso/toi2ETugShXjQ3S59b6m62KmLHkJlSq/cBejixmIydqrtM2XTvNCywFl3VC7SreSf6NV0i6sRyg==", + "dev": true, + "optional": true + }, + "@esbuild/linux-arm64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.11.tgz", + "integrity": "sha512-c6Vh2WS9VFKxKZ2TvJdA7gdy0n6eSy+yunBvv4aqNCEhSWVor1TU43wNRp2YLO9Vng2G+W94aRz+ILDSwAiYog==", + "dev": true, + "optional": true + }, + "@esbuild/linux-ia32": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.11.tgz", + "integrity": "sha512-S3hkIF6KUqRh9n1Q0dSyYcWmcVa9Cg+mSoZEfFuzoYXXsk6196qndrM+ZiHNwpZKi3XOXpShZZ+9dfN5ykqjjw==", + "dev": true, + "optional": true + }, + "@esbuild/linux-loong64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.11.tgz", + "integrity": "sha512-MRESANOoObQINBA+RMZW+Z0TJWpibtE7cPFnahzyQHDCA9X9LOmGh68MVimZlM9J8n5Ia8lU773te6O3ILW8kw==", + "dev": true, + "optional": true + }, + "@esbuild/linux-mips64el": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.11.tgz", + "integrity": "sha512-qVyPIZrXNMOLYegtD1u8EBccCrBVshxMrn5MkuFc3mEVsw7CCQHaqZ4jm9hbn4gWY95XFnb7i4SsT3eflxZsUg==", + "dev": true, + "optional": true + }, + "@esbuild/linux-ppc64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.11.tgz", + "integrity": "sha512-T3yd8vJXfPirZaUOoA9D2ZjxZX4Gr3QuC3GztBJA6PklLotc/7sXTOuuRkhE9W/5JvJP/K9b99ayPNAD+R+4qQ==", + "dev": true, + "optional": true + }, + "@esbuild/linux-riscv64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.11.tgz", + "integrity": "sha512-evUoRPWiwuFk++snjH9e2cAjF5VVSTj+Dnf+rkO/Q20tRqv+644279TZlPK8nUGunjPAtQRCj1jQkDAvL6rm2w==", + "dev": true, + "optional": true + }, + "@esbuild/linux-s390x": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.11.tgz", + "integrity": "sha512-/SlRJ15XR6i93gRWquRxYCfhTeC5PdqEapKoLbX63PLCmAkXZHY2uQm2l9bN0oPHBsOw2IswRZctMYS0MijFcg==", + "dev": true, + "optional": true + }, + "@esbuild/linux-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.11.tgz", + "integrity": "sha512-xcncej+wF16WEmIwPtCHi0qmx1FweBqgsRtEL1mSHLFR6/mb3GEZfLQnx+pUDfRDEM4DQF8dpXIW7eDOZl1IbA==", + "dev": true, + "optional": true + }, + "@esbuild/netbsd-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.11.tgz", + "integrity": "sha512-aSjMHj/F7BuS1CptSXNg6S3M4F3bLp5wfFPIJM+Km2NfIVfFKhdmfHF9frhiCLIGVzDziggqWll0B+9AUbud/Q==", + "dev": true, + "optional": true + }, + "@esbuild/openbsd-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.11.tgz", + "integrity": "sha512-tNBq+6XIBZtht0xJGv7IBB5XaSyvYPCm1PxJ33zLQONdZoLVM0bgGqUrXnJyiEguD9LU4AHiu+GCXy/Hm9LsdQ==", + "dev": true, + "optional": true + }, + "@esbuild/sunos-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.11.tgz", + "integrity": "sha512-kxfbDOrH4dHuAAOhr7D7EqaYf+W45LsAOOhAet99EyuxxQmjbk8M9N4ezHcEiCYPaiW8Dj3K26Z2V17Gt6p3ng==", + "dev": true, + "optional": true + }, + "@esbuild/win32-arm64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.11.tgz", + "integrity": "sha512-Sh0dDRyk1Xi348idbal7lZyfSkjhJsdFeuC13zqdipsvMetlGiFQNdO+Yfp6f6B4FbyQm7qsk16yaZk25LChzg==", + "dev": true, + "optional": true + }, + "@esbuild/win32-ia32": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.11.tgz", + "integrity": "sha512-o9JUIKF1j0rqJTFbIoF4bXj6rvrTZYOrfRcGyL0Vm5uJ/j5CkBD/51tpdxe9lXEDouhRgdr/BYzUrDOvrWwJpg==", + "dev": true, + "optional": true + }, + "@esbuild/win32-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.11.tgz", + "integrity": "sha512-rQI4cjLHd2hGsM1LqgDI7oOCYbQ6IBOVsX9ejuRMSze0GqXUG2ekwiKkiBU1pRGSeCqFFHxTrcEydB2Hyoz9CA==", + "dev": true, + "optional": true + }, "@jridgewell/gen-mapping": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", @@ -6672,6 +7260,12 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "@jspm/core": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@jspm/core/-/core-2.0.1.tgz", + "integrity": "sha512-Lg3PnLp0QXpxwLIAuuJboLeRaIhrgJjeuh797QADg3xz8wGLugQOS5DpsE8A6i6Adgzf+bacllkKZG3J0tGfDw==", + "dev": true + }, "@mlabs-haskell/csl-gc-wrapper": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@mlabs-haskell/csl-gc-wrapper/-/csl-gc-wrapper-1.0.1.tgz", @@ -8258,6 +8852,52 @@ "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz", "integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==" }, + "esbuild": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.11.tgz", + "integrity": "sha512-i8u6mQF0JKJUlGR3OdFLKldJQMMs8OqM9Cc3UCi9XXziJ9WERM5bfkHaEAy0YAvPRMgqSW55W7xYn84XtEFTtA==", + "dev": true, + "requires": { + "@esbuild/android-arm": "0.18.11", + "@esbuild/android-arm64": "0.18.11", + "@esbuild/android-x64": "0.18.11", + "@esbuild/darwin-arm64": "0.18.11", + "@esbuild/darwin-x64": "0.18.11", + "@esbuild/freebsd-arm64": "0.18.11", + "@esbuild/freebsd-x64": "0.18.11", + "@esbuild/linux-arm": "0.18.11", + "@esbuild/linux-arm64": "0.18.11", + "@esbuild/linux-ia32": "0.18.11", + "@esbuild/linux-loong64": "0.18.11", + "@esbuild/linux-mips64el": "0.18.11", + "@esbuild/linux-ppc64": "0.18.11", + "@esbuild/linux-riscv64": "0.18.11", + "@esbuild/linux-s390x": "0.18.11", + "@esbuild/linux-x64": "0.18.11", + "@esbuild/netbsd-x64": "0.18.11", + "@esbuild/openbsd-x64": "0.18.11", + "@esbuild/sunos-x64": "0.18.11", + "@esbuild/win32-arm64": "0.18.11", + "@esbuild/win32-ia32": "0.18.11", + "@esbuild/win32-x64": "0.18.11" + } + }, + "esbuild-plugin-polyfill-node": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/esbuild-plugin-polyfill-node/-/esbuild-plugin-polyfill-node-0.3.0.tgz", + "integrity": "sha512-SHG6CKUfWfYyYXGpW143NEZtcVVn8S/WHcEOxk62LuDXnY4Zpmc+WmxJKN6GMTgTClXJXhEM5KQlxKY6YjbucQ==", + "dev": true, + "requires": { + "@jspm/core": "^2.0.1", + "import-meta-resolve": "^3.0.0" + } + }, + "esbuild-plugin-wasm": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/esbuild-plugin-wasm/-/esbuild-plugin-wasm-1.1.0.tgz", + "integrity": "sha512-0bQ6+1tUbySSnxzn5jnXHMDvYnT0cN/Wd4Syk8g/sqAIJUg7buTIi22svS3Qz6ssx895NT+TgLPb33xi1OkZig==", + "dev": true + }, "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -8967,6 +9607,12 @@ "resolve-cwd": "^3.0.0" } }, + "import-meta-resolve": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-3.0.0.tgz", + "integrity": "sha512-4IwhLhNNA8yy445rPjD/lWh++7hMDOml2eHtd58eG7h+qK3EryMuuRbsHGPikCoAgIkkDnckKfWSk2iDla/ejg==", + "dev": true + }, "indent-string": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", diff --git a/package.json b/package.json index c5b938f647..98ac3febe0 100755 --- a/package.json +++ b/package.json @@ -58,6 +58,9 @@ "devDependencies": { "buffer": "6.0.3", "doctoc": "^2.2.1", + "esbuild": "0.18.11", + "esbuild-plugin-polyfill-node": "^0.3.0", + "esbuild-plugin-wasm": "^1.1.0", "html-webpack-plugin": "5.5.0", "webpack": "5.67.0", "webpack-cli": "4.10", diff --git a/src/Internal/JsWebSocket.js b/src/Internal/JsWebSocket.js index 8a41647af2..738e44e7c0 100644 --- a/src/Internal/JsWebSocket.js +++ b/src/Internal/JsWebSocket.js @@ -23,7 +23,7 @@ export function _mkWebSocket(logger) { try { let ws; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - ws = new ReconnectingWebSocket.default(url); + ws = new ReconnectingWebSocket(url); } else { ws = new ReconnectingWebSocket(url, [], { WebSocket: NoPerMessageDeflateWebSocket, diff --git a/test/ApplyArgs.js b/test/ApplyArgs.js deleted file mode 100644 index 757995134f..0000000000 --- a/test/ApplyArgs.js +++ /dev/null @@ -1,166 +0,0 @@ -/* global BROWSER_RUNTIME */ - -let scripts = {}; -if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - scripts["always-fails"] = require("Scripts/always-fails.plutus"); - scripts["include-datum"] = require("Scripts/include-datum.plutus"); - scripts["one-shot-minting"] = require("Scripts/one-shot-minting.plutus"); - scripts[ - "redeemer1-validator" - ] = require("Scripts/redeemer1-validator.plutus"); - scripts["always-succeeds-v2"] = require("Scripts/always-succeeds-v2.plutus"); - scripts[ - "one-shot-minting-v2" - ] = require("Scripts/one-shot-minting-v2.plutus"); - scripts[ - "check-datum-is-inline" - ] = require("Scripts/check-datum-is-inline.plutus"); - - scripts[ - "always-fails-big-arg" - ] = require("Scripts/applied/always-fails-big-arg.plutus"); - scripts[ - "always-fails-no-args" - ] = require("Scripts/applied/always-fails-no-args.plutus"); - scripts[ - "always-fails-unit" - ] = require("Scripts/applied/always-fails-unit.plutus"); - scripts[ - "always-succeeds-v2-big-arg" - ] = require("Scripts/applied/always-succeeds-v2-big-arg.plutus"); - scripts[ - "always-succeeds-v2-no-args" - ] = require("Scripts/applied/always-succeeds-v2-no-args.plutus"); - scripts[ - "always-succeeds-v2-unit" - ] = require("Scripts/applied/always-succeeds-v2-unit.plutus"); - scripts[ - "check-datum-is-inline-big-arg" - ] = require("Scripts/applied/check-datum-is-inline-big-arg.plutus"); - scripts[ - "check-datum-is-inline-no-args" - ] = require("Scripts/applied/check-datum-is-inline-no-args.plutus"); - scripts[ - "check-datum-is-inline-unit" - ] = require("Scripts/applied/check-datum-is-inline-unit.plutus"); - scripts[ - "include-datum-big-arg" - ] = require("Scripts/applied/include-datum-big-arg.plutus"); - scripts[ - "include-datum-no-args" - ] = require("Scripts/applied/include-datum-no-args.plutus"); - scripts[ - "include-datum-unit" - ] = require("Scripts/applied/include-datum-unit.plutus"); - scripts[ - "one-shot-minting-big-arg" - ] = require("Scripts/applied/one-shot-minting-big-arg.plutus"); - scripts[ - "one-shot-minting-no-args" - ] = require("Scripts/applied/one-shot-minting-no-args.plutus"); - scripts[ - "one-shot-minting-unit" - ] = require("Scripts/applied/one-shot-minting-unit.plutus"); - scripts[ - "one-shot-minting-v2-big-arg" - ] = require("Scripts/applied/one-shot-minting-v2-big-arg.plutus"); - scripts[ - "one-shot-minting-v2-no-args" - ] = require("Scripts/applied/one-shot-minting-v2-no-args.plutus"); - scripts[ - "one-shot-minting-v2-unit" - ] = require("Scripts/applied/one-shot-minting-v2-unit.plutus"); - scripts[ - "redeemer1-validator-big-arg" - ] = require("Scripts/applied/redeemer1-validator-big-arg.plutus"); - scripts[ - "redeemer1-validator-no-args" - ] = require("Scripts/applied/redeemer1-validator-no-args.plutus"); - scripts[ - "redeemer1-validator-unit" - ] = require("Scripts/applied/redeemer1-validator-unit.plutus"); -} else { - const fs = await import("fs"); - const read_script = fp => { - return fs.readFileSync( - new URL("../../fixtures/scripts/".concat(fp), import.meta.url), - "utf8" - ); - }; - - scripts["always-fails"] = read_script("always-fails.plutus"); - scripts["include-datum"] = read_script("include-datum.plutus"); - scripts["one-shot-minting"] = read_script("one-shot-minting.plutus"); - scripts["redeemer1-validator"] = read_script("redeemer1-validator.plutus"); - scripts["always-succeeds-v2"] = read_script("always-succeeds-v2.plutus"); - scripts["one-shot-minting-v2"] = read_script("one-shot-minting-v2.plutus"); - scripts["check-datum-is-inline"] = read_script( - "check-datum-is-inline.plutus" - ); - - scripts["always-fails-big-arg"] = read_script( - "applied/always-fails-big-arg.plutus" - ); - scripts["always-fails-no-args"] = read_script( - "applied/always-fails-no-args.plutus" - ); - scripts["always-fails-unit"] = read_script( - "applied/always-fails-unit.plutus" - ); - scripts["always-succeeds-v2-big-arg"] = read_script( - "applied/always-succeeds-v2-big-arg.plutus" - ); - scripts["always-succeeds-v2-no-args"] = read_script( - "applied/always-succeeds-v2-no-args.plutus" - ); - scripts["always-succeeds-v2-unit"] = read_script( - "applied/always-succeeds-v2-unit.plutus" - ); - scripts["check-datum-is-inline-big-arg"] = read_script( - "applied/check-datum-is-inline-big-arg.plutus" - ); - scripts["check-datum-is-inline-no-args"] = read_script( - "applied/check-datum-is-inline-no-args.plutus" - ); - scripts["check-datum-is-inline-unit"] = read_script( - "applied/check-datum-is-inline-unit.plutus" - ); - scripts["include-datum-big-arg"] = read_script( - "applied/include-datum-big-arg.plutus" - ); - scripts["include-datum-no-args"] = read_script( - "applied/include-datum-no-args.plutus" - ); - scripts["include-datum-unit"] = read_script( - "applied/include-datum-unit.plutus" - ); - scripts["one-shot-minting-big-arg"] = read_script( - "applied/one-shot-minting-big-arg.plutus" - ); - scripts["one-shot-minting-no-args"] = read_script( - "applied/one-shot-minting-no-args.plutus" - ); - scripts["one-shot-minting-unit"] = read_script( - "applied/one-shot-minting-unit.plutus" - ); - scripts["one-shot-minting-v2-big-arg"] = read_script( - "applied/one-shot-minting-v2-big-arg.plutus" - ); - scripts["one-shot-minting-v2-no-args"] = read_script( - "applied/one-shot-minting-v2-no-args.plutus" - ); - scripts["one-shot-minting-v2-unit"] = read_script( - "applied/one-shot-minting-v2-unit.plutus" - ); - scripts["redeemer1-validator-big-arg"] = read_script( - "applied/redeemer1-validator-big-arg.plutus" - ); - scripts["redeemer1-validator-no-args"] = read_script( - "applied/redeemer1-validator-no-args.plutus" - ); - scripts["redeemer1-validator-unit"] = read_script( - "applied/redeemer1-validator-unit.plutus" - ); -} - -export { scripts }; diff --git a/test/ApplyArgs.purs b/test/ApplyArgs.purs index f0774d26e1..d80aee4f16 100644 --- a/test/ApplyArgs.purs +++ b/test/ApplyArgs.purs @@ -13,6 +13,9 @@ import Contract.TextEnvelope , plutusScriptV2FromEnvelope ) import Control.Monad.Error.Class (class MonadError) +import Control.Monad.Trans.Class (lift) +import Control.Parallel (parTraverse) +import Ctl.Examples.Helpers.LoadScript (loadScript) import Ctl.Internal.ApplyArgs (applyArgs) import Ctl.Internal.Cardano.TextEnvelope (TextEnvelope) import Ctl.Internal.Test.TestPlanM (TestPlanM, interpret) @@ -20,28 +23,73 @@ import Data.BigInt (fromInt) import Data.List.Lazy (replicate) import Data.Profunctor.Choice (left) import Effect.Aff (Error, error, throwError) +import Effect.Aff.Class (liftAff) import Foreign.Object (Object) import Foreign.Object as Object import Mote (group, test) import Test.Spec.Assertions (shouldEqual) -foreign import scripts :: Object String +scriptFilenames :: Object String +scriptFilenames = + Object.fromFoldable + [ "always-fails" /\ "always-fails.plutus" + , "include-datum" /\ "include-datum.plutus" + , "one-shot-minting" /\ "one-shot-minting.plutus" + , "redeemer1-validator" /\ "redeemer1-validator.plutus" + , "always-succeeds-v2" /\ "always-succeeds-v2.plutus" + , "one-shot-minting-v2" /\ "one-shot-minting-v2.plutus" + , "check-datum-is-inline" /\ "check-datum-is-inline.plutus" + , "always-fails-big-arg" /\ "applied/always-fails-big-arg.plutus" + , "always-fails-no-args" /\ "applied/always-fails-no-args.plutus" + , "always-fails-unit" /\ "applied/always-fails-unit.plutus" + , "always-succeeds-v2-big-arg" /\ + "applied/always-succeeds-v2-big-arg.plutus" + , "always-succeeds-v2-no-args" /\ + "applied/always-succeeds-v2-no-args.plutus" + , "always-succeeds-v2-unit" /\ "applied/always-succeeds-v2-unit.plutus" + , "check-datum-is-inline-big-arg" /\ + "applied/check-datum-is-inline-big-arg.plutus" + , "check-datum-is-inline-no-args" /\ + "applied/check-datum-is-inline-no-args.plutus" + , "check-datum-is-inline-unit" /\ + "applied/check-datum-is-inline-unit.plutus" + , "include-datum-big-arg" /\ "applied/include-datum-big-arg.plutus" + , "include-datum-no-args" /\ "applied/include-datum-no-args.plutus" + , "include-datum-unit" /\ "applied/include-datum-unit.plutus" + , "one-shot-minting-big-arg" /\ "applied/one-shot-minting-big-arg.plutus" + , "one-shot-minting-no-args" /\ "applied/one-shot-minting-no-args.plutus" + , "one-shot-minting-unit" /\ "applied/one-shot-minting-unit.plutus" + , "one-shot-minting-v2-big-arg" /\ + "applied/one-shot-minting-v2-big-arg.plutus" + , "one-shot-minting-v2-no-args" /\ + "applied/one-shot-minting-v2-no-args.plutus" + , "one-shot-minting-v2-unit" /\ "applied/one-shot-minting-v2-unit.plutus" + , "redeemer1-validator-big-arg" /\ + "applied/redeemer1-validator-big-arg.plutus" + , "redeemer1-validator-no-args" /\ + "applied/redeemer1-validator-no-args.plutus" + , "redeemer1-validator-unit" /\ "applied/redeemer1-validator-unit.plutus" + ] main :: Effect Unit main = launchAff_ $ interpret $ suite contract :: Contract Unit contract = do - traverse_ (uncurry $ compareApplied v1) $ Tuple <$> v1ScriptPaths <*> params - traverse_ (uncurry $ compareApplied v2) $ Tuple <$> v2ScriptPaths <*> params + scripts <- liftAff $ parTraverse loadScript scriptFilenames + traverse_ (uncurry $ compareApplied (v1 scripts)) $ Tuple <$> v1ScriptPaths + <*> params + traverse_ (uncurry $ compareApplied (v2 scripts)) $ Tuple <$> v2ScriptPaths + <*> params suite :: TestPlanM (Aff Unit) Unit suite = group "Applying params to scripts test" $ do - traverse_ (uncurry $ testCase v1) $ Tuple <$> v1ScriptPaths <*> params - traverse_ (uncurry $ testCase v2) $ Tuple <$> v2ScriptPaths <*> params - + scripts <- lift $ parTraverse loadScript scriptFilenames + traverse_ (uncurry $ testCase (v1 scripts)) $ Tuple <$> v1ScriptPaths <*> + params + traverse_ (uncurry $ testCase (v2 scripts)) $ Tuple <$> v2ScriptPaths <*> + params where - testCase lang scriptName (args /\ argsName) = test ("Apply " <> argsName <> " to " <> scriptName) @@ -73,7 +121,7 @@ v2ScriptPaths :: Array String v2ScriptPaths = [ "always-succeeds-v2" , "one-shot-minting-v2" - , "check-datum-is-inline" + , "check-datum-is-inline$" ] params :: Array (Tuple (Array PlutusData) String) @@ -109,19 +157,30 @@ longBytes :: PlutusData longBytes = Bytes $ hexToByteArrayUnsafe $ foldl (\x y -> x <> y) "" $ replicate 65 "4d" -v1 :: forall (m :: Type -> Type). MonadError Error m => String -> m PlutusScript -v1 = lookupAux plutusScriptV1FromEnvelope +v1 + :: forall (m :: Type -> Type) + . MonadError Error m + => Object String + -> String + -> m PlutusScript +v1 scripts name = lookupAux plutusScriptV1FromEnvelope scripts name -v2 :: forall (m :: Type -> Type). MonadError Error m => String -> m PlutusScript -v2 = lookupAux plutusScriptV2FromEnvelope +v2 + :: forall (m :: Type -> Type) + . MonadError Error m + => Object String + -> String + -> m PlutusScript +v2 scripts name = lookupAux plutusScriptV2FromEnvelope scripts name lookupAux :: forall (m :: Type -> Type) . MonadError Error m => (TextEnvelope -> Maybe PlutusScript) + -> Object String -> String -> m PlutusScript -lookupAux decodeScript name = +lookupAux decodeScript scripts name = maybe (throwError $ error $ "Can't find the script with name " <> name) pure $ do txt <- Object.lookup name scripts diff --git a/test/Deserialization.purs b/test/Deserialization.purs index c8c56c8cfa..f56e0f3d42 100644 --- a/test/Deserialization.purs +++ b/test/Deserialization.purs @@ -9,7 +9,7 @@ import Contract.TextEnvelope , decodeTextEnvelope ) import Control.Monad.Error.Class (class MonadThrow, liftMaybe) -import Ctl.Examples.OtherTypeTextEnvelope (otherTypeTextEnvelope) +import Ctl.Examples.Helpers.LoadScript (loadScript) import Ctl.Internal.Cardano.Types.NativeScript (NativeScript(ScriptAny)) as T import Ctl.Internal.Cardano.Types.Transaction (Transaction, TransactionOutput) as T import Ctl.Internal.Cardano.Types.Transaction (Vkeywitness) @@ -49,6 +49,7 @@ import Data.Newtype (unwrap, wrap) import Data.Traversable (traverse) import Effect (Effect) import Effect.Aff (Aff) +import Effect.Aff.Class (liftAff) import Effect.Class (class MonadEffect, liftEffect) import Effect.Exception (Error, error) import Mote (group, skip, test) @@ -247,6 +248,8 @@ suite = do test "fixture #4" $ witnessSetRoundTrip witnessSetFixture4 group "TextEnvelope decoding" do test "Decoding TestEnvelope with some other type" do + otherTypeTextEnvelope <- liftAff $ loadScript + "other-type-text-envelope.plutus" TextEnvelope envelope <- liftMaybe (error "Unexpected parsing error") $ decodeTextEnvelope otherTypeTextEnvelope envelope.type_ `shouldEqual` (Other "SomeOtherType") From ae495bdee05032cd841b5ec4c1bb89641819763b Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Thu, 6 Jul 2023 16:08:57 +0200 Subject: [PATCH 19/85] style: fix formatting --- dist/esbuild/wrapper.js | 4 ++-- esbuild/config.js | 16 ++++++++-------- esbuild/serve.js | 5 ++--- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dist/esbuild/wrapper.js b/dist/esbuild/wrapper.js index 53e38d4119..9f0811035f 100644 --- a/dist/esbuild/wrapper.js +++ b/dist/esbuild/wrapper.js @@ -1,6 +1,6 @@ "use strict"; -import * as m from "./index.js" +import * as m from "./index.js"; -m.main() +m.main(); console.log("app starting"); diff --git a/esbuild/config.js b/esbuild/config.js index ea83006c2a..d86530302b 100755 --- a/esbuild/config.js +++ b/esbuild/config.js @@ -6,25 +6,25 @@ import { fileURLToPath } from "node:url"; export const buildOptions = { entryPoints: [`output/${process.argv[2]}/index.js`], outdir: "dist/esbuild", - define: { - BROWSER_RUNTIME: process.env.BROWSER_RUNTIME, - SCRIPTS_DIR: '"fixtures/scripts/"' + define: { + BROWSER_RUNTIME: process.env.BROWSER_RUNTIME, + SCRIPTS_DIR: '"fixtures/scripts/"', }, plugins: [ polyfillNode({ polyfills: { crypto: true, fs: true, - os: true - } + os: true, + }, }), wasmLoader({ - mode: "deferred" - }) + mode: "deferred", + }), ], bundle: true, platform: "browser", format: "esm", treeShaking: true, - logLevel: "warning" + logLevel: "warning", }; diff --git a/esbuild/serve.js b/esbuild/serve.js index e1f4b62d33..8b4220c435 100644 --- a/esbuild/serve.js +++ b/esbuild/serve.js @@ -5,6 +5,5 @@ const ctx = await esbuild.context(buildOptions); await ctx.serve({ host: "127.0.0.1", port: 4008, - servedir: "dist/esbuild" -}) - + servedir: "dist/esbuild", +}); From a7799f24fda08d183d460bdf09b9c2c3752563dd Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Thu, 6 Jul 2023 16:17:23 +0200 Subject: [PATCH 20/85] style: remove unused imports --- Makefile | 3 +-- esbuild/config.js | 2 -- examples/AlwaysMints.purs | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 54ad3b9bb8..765c301315 100644 --- a/Makefile +++ b/Makefile @@ -18,8 +18,7 @@ run-build: @${ps-bundle} && BROWSER_RUNTIME=1 webpack --mode=production esbuild-bundle: - @spago build \ - && BROWSER_RUNTIME=1 node esbuild/bundle.js ${ps-entrypoint} + @spago build && BROWSER_RUNTIME=1 node esbuild/bundle.js ${ps-entrypoint} esbuild-serve: @spago build \ diff --git a/esbuild/config.js b/esbuild/config.js index d86530302b..76d54a6aa5 100755 --- a/esbuild/config.js +++ b/esbuild/config.js @@ -1,7 +1,5 @@ -import * as esbuild from "esbuild"; import { wasmLoader } from "esbuild-plugin-wasm"; import { polyfillNode } from "esbuild-plugin-polyfill-node"; -import { fileURLToPath } from "node:url"; export const buildOptions = { entryPoints: [`output/${process.argv[2]}/index.js`], diff --git a/examples/AlwaysMints.purs b/examples/AlwaysMints.purs index 2cdefd9542..7322ebf9c7 100644 --- a/examples/AlwaysMints.purs +++ b/examples/AlwaysMints.purs @@ -23,7 +23,6 @@ import Contract.Value as Value import Ctl.Examples.Helpers (mkCurrencySymbol, mkTokenName) as Helpers import Ctl.Examples.Helpers.LoadScript (loadScript) import Data.BigInt as BigInt -import Effect.Exception (error) main :: Effect Unit main = example testnetNamiConfig From 6f2758bd5938fbe4dfd61cde74115387d9732174 Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Thu, 6 Jul 2023 16:31:54 +0200 Subject: [PATCH 21/85] build: use `esm` imports in `nix/default.nix` --- nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index c95d66ea24..bb0125354b 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -228,7 +228,7 @@ let # (idea taken from `plutus-playground-client`) '' cd ${project} - ${nodejs}/bin/node --enable-source-maps -e 'require("./output/${testMain}").main()' + ${nodejs}/bin/node --enable-source-maps -e 'import("./output/${testMain}").then(m => m.main())' touch $out ''; @@ -358,7 +358,7 @@ let done; - ${nodejs}/bin/node --enable-source-maps -e 'require("${project}/output/${testMain}").main()' e2e-test run + ${nodejs}/bin/node --enable-source-maps -e 'import("${project}/output/${testMain}").then(m => m.main())' e2e-test run mkdir $out '' ; From 084ca270a7fe194bb1d01fd5e70104953db1807c Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Thu, 6 Jul 2023 16:39:05 +0200 Subject: [PATCH 22/85] build: use `esm` imports in `nix/default.nix` --- nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index bb0125354b..c4384e6a5a 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -228,7 +228,7 @@ let # (idea taken from `plutus-playground-client`) '' cd ${project} - ${nodejs}/bin/node --enable-source-maps -e 'import("./output/${testMain}").then(m => m.main())' + ${nodejs}/bin/node --enable-source-maps -e 'import("./output/${testMain}/index.js").then(m => m.main())' touch $out ''; @@ -358,7 +358,7 @@ let done; - ${nodejs}/bin/node --enable-source-maps -e 'import("${project}/output/${testMain}").then(m => m.main())' e2e-test run + ${nodejs}/bin/node --enable-source-maps -e 'import("${project}/output/${testMain}/index.js").then(m => m.main())' e2e-test run mkdir $out '' ; From fe138b07dcc25910901eedaff313154b5cc1ca14 Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Thu, 6 Jul 2023 17:08:10 +0200 Subject: [PATCH 23/85] build: create `node_modules` symlink for `NODE_PATH` --- nix/default.nix | 5 +++++ test/Wallet/Cip30/SignData.js | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index c4384e6a5a..fcdf32d26c 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -136,6 +136,7 @@ let ]; shellHook = '' export NODE_PATH="${nodeModules}/lib/node_modules" + ln -sfn $NODE_PATH node_modules export PATH="${nodeModules}/bin:$PATH" ${pkgs.lib.optionalString packageLockOnly "export NPM_CONFIG_PACKAGE_LOCK_ONLY=true"} '' @@ -177,6 +178,7 @@ let unpackPhase = '' export HOME="$TMP" export NODE_PATH="${nodeModules}/lib/node_modules" + ln -sfn $NODE_PATH node_modules export PATH="${nodeModules}/bin:$PATH" cp -r $src . install-spago-style @@ -228,6 +230,7 @@ let # (idea taken from `plutus-playground-client`) '' cd ${project} + ln -sfn $NODE_PATH node_modules ${nodejs}/bin/node --enable-source-maps -e 'import("./output/${testMain}/index.js").then(m => m.main())' touch $out ''; @@ -400,6 +403,7 @@ let '' export HOME="$TMP" export NODE_PATH="${nodeModules}/lib/node_modules" + ln -sfn $NODE_PATH node_modules export PATH="${nodeModules}/bin:$PATH" ${pkgs.lib.optionalString browserRuntime "export BROWSER_RUNTIME=1"} cp -r ${project}/* . @@ -489,6 +493,7 @@ let } '' export NODE_PATH="${pursDocsSearchNpm.nodeDependencies}/lib/node_modules" + ln -sfn $NODE_PATH node_modules export PATH="${pursDocsSearchNpm.nodeDependencies}/bin:$PATH" cp -r ${buildPursDocs { }}/{generated-docs,output,src} . install-spago-style diff --git a/test/Wallet/Cip30/SignData.js b/test/Wallet/Cip30/SignData.js index 331d342604..ebf22760df 100644 --- a/test/Wallet/Cip30/SignData.js +++ b/test/Wallet/Cip30/SignData.js @@ -8,9 +8,9 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { lib = await import("@emurgo/cardano-message-signing-nodejs"); csl = await import("@emurgo/cardano-serialization-lib-nodejs"); } -import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -lib = gcWrapper(lib); -csl = gcWrapper(csl); +// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; +// lib = gcWrapper(lib); +// csl = gcWrapper(csl); function opt_chain(maybe, obj) { const isNothing = x => x === null || x === undefined; From 70e3356e8fe1b46dd1ad4626b286763c26ee3b51 Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Thu, 6 Jul 2023 17:40:47 +0200 Subject: [PATCH 24/85] build: disable md link check for `the-plutus-scaffold` --- doc/getting-started.md | 2 ++ nix/default.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/getting-started.md b/doc/getting-started.md index f758fa8472..dc354275a9 100644 --- a/doc/getting-started.md +++ b/doc/getting-started.md @@ -38,7 +38,9 @@ Then, add `https://public-plutonomicon.cachix.org` and `public-plutonomicon.cach The easiest way to create a new CTL project is to use our `ctl-scaffold` flake template. This lives in the CTL repo -- you can have a look [here](../templates/ctl-scaffold). It contains a simple, yet complete, flakes-based scaffolding project with example `outputs` for a CTL project, including its runtime. + Alternatively, consider [the-plutus-scaffold](https://github.com/mlabs-haskell/the-plutus-scaffold) flake template. It's a scaffold built on top of the above mentioned `ctl-scaffold`, but includes a react based frontend and a haskell onchain additionaly. It's more of a demo application, than a minimal working example. + A new project can be initialized as follows: diff --git a/nix/default.nix b/nix/default.nix index fcdf32d26c..281e8b32a0 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -229,7 +229,7 @@ let # sandbox, so we can just use node instead # (idea taken from `plutus-playground-client`) '' - cd ${project} + cp -r ${project}/* . ln -sfn $NODE_PATH node_modules ${nodejs}/bin/node --enable-source-maps -e 'import("./output/${testMain}/index.js").then(m => m.main())' touch $out From 1b3b13df9107bbbf9afb7a938052331e9c82015e Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Thu, 6 Jul 2023 18:10:44 +0200 Subject: [PATCH 25/85] fix: fix unit tests --- test/ApplyArgs.purs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ApplyArgs.purs b/test/ApplyArgs.purs index d80aee4f16..b39a43cb39 100644 --- a/test/ApplyArgs.purs +++ b/test/ApplyArgs.purs @@ -121,7 +121,7 @@ v2ScriptPaths :: Array String v2ScriptPaths = [ "always-succeeds-v2" , "one-shot-minting-v2" - , "check-datum-is-inline$" + , "check-datum-is-inline" ] params :: Array (Tuple (Array PlutusData) String) From 7993b9f150e36ee8144e67f2d2c06f8556ffee5d Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Thu, 6 Jul 2023 18:37:51 +0200 Subject: [PATCH 26/85] build: bundle using `esbuild` for e2e tests --- nix/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index 281e8b32a0..2365f03597 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -354,13 +354,13 @@ let export OGMIOS_PORT=1345 export E2E_EXTRA_BROWSER_ARGS="--disable-web-security" - python -m http.server 4008 --directory ${bundledPursProject}/dist & + python -m http.server 4008 --directory ${bundledPursProject}/dist/esbuild & until curl -S http://127.0.0.1:4008/index.html &>/dev/null; do echo "Trying to connect to webserver..."; sleep 0.1; done; - + ln -sfn $NODE_PATH node_modules ${nodejs}/bin/node --enable-source-maps -e 'import("${project}/output/${testMain}/index.js").then(m => m.main())' e2e-test run mkdir $out '' @@ -408,12 +408,10 @@ let ${pkgs.lib.optionalString browserRuntime "export BROWSER_RUNTIME=1"} cp -r ${project}/* . chmod -R +rwx . - spago bundle-module --no-install --no-build -m "${main}" \ - --to ${bundledModuleName} - mkdir -p ./dist - ${pkgs.lib.optionalString includeBundledModule "cp ${bundledModuleName} ./dist"} - webpack --mode=production -c ${webpackConfig} -o ./dist \ - --entry ./${entrypoint} + node esbuild/bundle.js ${main} + cd dist/esbuild + ln -sfn ../../fixtures fixtures + cd ../.. mkdir $out mv dist $out ''; From ef1441b9a401586c8ecfb3d8cdbbb42d4bcda3ea Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Thu, 6 Jul 2023 21:32:27 +0200 Subject: [PATCH 27/85] build: use dynamic imports when selecting affjax driver --- esbuild/config.js | 2 +- nix/default.nix | 8 +++---- src/Internal/Affjax.js | 47 ++++++++++++++++++++++------------------ src/Internal/Affjax.purs | 8 +++++-- 4 files changed, 37 insertions(+), 28 deletions(-) diff --git a/esbuild/config.js b/esbuild/config.js index 76d54a6aa5..8c3d46424d 100755 --- a/esbuild/config.js +++ b/esbuild/config.js @@ -6,7 +6,7 @@ export const buildOptions = { outdir: "dist/esbuild", define: { BROWSER_RUNTIME: process.env.BROWSER_RUNTIME, - SCRIPTS_DIR: '"fixtures/scripts/"', + SCRIPTS_DIR: '"fixtures/scripts"', }, plugins: [ polyfillNode({ diff --git a/nix/default.nix b/nix/default.nix index 2365f03597..a3e381898a 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -360,8 +360,10 @@ let sleep 0.1; done; + mkdir project + cp -r ${project}/* project ln -sfn $NODE_PATH node_modules - ${nodejs}/bin/node --enable-source-maps -e 'import("${project}/output/${testMain}/index.js").then(m => m.main())' e2e-test run + ${nodejs}/bin/node --enable-source-maps -e 'import("./project/output/${testMain}/index.js").then(m => m.main())' e2e-test run mkdir $out '' ; @@ -409,9 +411,7 @@ let cp -r ${project}/* . chmod -R +rwx . node esbuild/bundle.js ${main} - cd dist/esbuild - ln -sfn ../../fixtures fixtures - cd ../.. + cp -r fixtures dist/esbuild mkdir $out mv dist $out ''; diff --git a/src/Internal/Affjax.js b/src/Internal/Affjax.js index 282ec7f1b1..61b949353a 100644 --- a/src/Internal/Affjax.js +++ b/src/Internal/Affjax.js @@ -1,7 +1,12 @@ /* global BROWSER_RUNTIME */ -import XHR from "xhr2"; -import urllib from "url"; +export const driver = async () => { + if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { + return browserDriver; + } else { + return await nodeDriver(); + } +}; const browserDriver = { newXHR: function () { @@ -12,23 +17,23 @@ const browserDriver = { }, }; -const nodeDriver = { - newXHR: function () { - return new XHR(); - }, - fixupUrl: function (url, xhr) { - if (xhr.nodejsBaseUrl === null) { - let u = urllib.parse(url); - u.protocol = u.protocol || "http:"; - u.hostname = u.hostname || "localhost"; - return urllib.format(u); - } else { - return url || "/"; - } - }, -}; +async function nodeDriver() { + const { default: XHR } = await import("xhr2"); + const { default: urllib } = await import("url"); -export const driver = - typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME - ? browserDriver - : nodeDriver; + return { + newXHR: function () { + return new XHR(); + }, + fixupUrl: function (url, xhr) { + if (xhr.nodejsBaseUrl === null) { + let u = urllib.parse(url); + u.protocol = u.protocol || "http:"; + u.hostname = u.hostname || "localhost"; + return urllib.format(u); + } else { + return url || "/"; + } + }, + }; +} diff --git a/src/Internal/Affjax.purs b/src/Internal/Affjax.purs index d462a6fd41..e50e9b7a27 100644 --- a/src/Internal/Affjax.purs +++ b/src/Internal/Affjax.purs @@ -2,12 +2,16 @@ module Ctl.Internal.Affjax ( request ) where +import Prelude + import Affjax (AffjaxDriver) import Affjax (Error, Request, Response, request) as Affjax +import Control.Promise (Promise, toAffE) import Data.Either (Either) +import Effect (Effect) import Effect.Aff (Aff) -foreign import driver :: AffjaxDriver +foreign import driver :: Effect (Promise AffjaxDriver) -- | Makes an HTTP request. -- | @@ -28,4 +32,4 @@ foreign import driver :: AffjaxDriver -- | ``` request :: forall a. Affjax.Request a -> Aff (Either Affjax.Error (Affjax.Response a)) -request = Affjax.request driver +request req = toAffE driver >>= flip Affjax.request req From d1f1e1dec453536ad7f15e8eb8c3874220c63fe8 Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Fri, 7 Jul 2023 13:27:55 +0200 Subject: [PATCH 28/85] build: update `templates/ctl-scaffold` --- templates/ctl-scaffold/.gitignore | 6 +- templates/ctl-scaffold/Makefile | 10 + .../ctl-scaffold/dist/esbuild/index.html | 11 + .../ctl-scaffold/dist/esbuild/wrapper.js | 6 + templates/ctl-scaffold/esbuild/bundle.js | 4 + templates/ctl-scaffold/esbuild/config.js | 28 + templates/ctl-scaffold/esbuild/serve.js | 9 + templates/ctl-scaffold/flake.lock | 16 +- templates/ctl-scaffold/flake.nix | 2 +- templates/ctl-scaffold/package-lock.json | 646 ++++++++++++++ templates/ctl-scaffold/package.json | 4 + templates/ctl-scaffold/packages.dhall | 36 +- templates/ctl-scaffold/spago-packages.nix | 806 ++++++++---------- templates/ctl-scaffold/spago.dhall | 1 - 14 files changed, 1128 insertions(+), 457 deletions(-) create mode 100644 templates/ctl-scaffold/dist/esbuild/index.html create mode 100644 templates/ctl-scaffold/dist/esbuild/wrapper.js create mode 100644 templates/ctl-scaffold/esbuild/bundle.js create mode 100755 templates/ctl-scaffold/esbuild/config.js create mode 100644 templates/ctl-scaffold/esbuild/serve.js diff --git a/templates/ctl-scaffold/.gitignore b/templates/ctl-scaffold/.gitignore index 628f00fcd2..8732a23c87 100644 --- a/templates/ctl-scaffold/.gitignore +++ b/templates/ctl-scaffold/.gitignore @@ -20,5 +20,9 @@ test-data/preprod test-data/mainnet test-data/keys .projectile -/dist/ +/dist/* +!/dist/esbuild/ +/dist/esbuild/* +!/dist/esbuild/index.html +!/dist/esbuild/wrapper.js output.js diff --git a/templates/ctl-scaffold/Makefile b/templates/ctl-scaffold/Makefile index dc044b47e3..84208ebb55 100644 --- a/templates/ctl-scaffold/Makefile +++ b/templates/ctl-scaffold/Makefile @@ -7,6 +7,16 @@ ps-entrypoint := Scaffold.Main e2e-entrypoint := Scaffold.Test.E2E.Serve ps-bundle = spago bundle-module -m ${ps-entrypoint} --to output.js +esbuild-bundle: + @spago build && BROWSER_RUNTIME=1 node esbuild/bundle.js ${ps-entrypoint} + +esbuild-serve: + @spago build \ + && cd dist/esbuild \ + && ln -sfn ../../scripts scripts \ + && cd ../.. \ + && BROWSER_RUNTIME=1 node esbuild/serve.js ${ps-entrypoint} + run-dev: @${ps-bundle} && BROWSER_RUNTIME=1 webpack-dev-server --progress diff --git a/templates/ctl-scaffold/dist/esbuild/index.html b/templates/ctl-scaffold/dist/esbuild/index.html new file mode 100644 index 0000000000..7c9b27620b --- /dev/null +++ b/templates/ctl-scaffold/dist/esbuild/index.html @@ -0,0 +1,11 @@ + + + + + + + + + Examples source code is located in examples/ directory.
+ + diff --git a/templates/ctl-scaffold/dist/esbuild/wrapper.js b/templates/ctl-scaffold/dist/esbuild/wrapper.js new file mode 100644 index 0000000000..9f0811035f --- /dev/null +++ b/templates/ctl-scaffold/dist/esbuild/wrapper.js @@ -0,0 +1,6 @@ +"use strict"; + +import * as m from "./index.js"; + +m.main(); +console.log("app starting"); diff --git a/templates/ctl-scaffold/esbuild/bundle.js b/templates/ctl-scaffold/esbuild/bundle.js new file mode 100644 index 0000000000..c3a5dd652a --- /dev/null +++ b/templates/ctl-scaffold/esbuild/bundle.js @@ -0,0 +1,4 @@ +import * as esbuild from "esbuild"; +import { buildOptions } from "./config.js"; + +esbuild.build(buildOptions); diff --git a/templates/ctl-scaffold/esbuild/config.js b/templates/ctl-scaffold/esbuild/config.js new file mode 100755 index 0000000000..077500fe57 --- /dev/null +++ b/templates/ctl-scaffold/esbuild/config.js @@ -0,0 +1,28 @@ +import { wasmLoader } from "esbuild-plugin-wasm"; +import { polyfillNode } from "esbuild-plugin-polyfill-node"; + +export const buildOptions = { + entryPoints: [`output/${process.argv[2]}/index.js`], + outdir: "dist/esbuild", + define: { + BROWSER_RUNTIME: process.env.BROWSER_RUNTIME, + SCRIPTS_DIR: '"scripts"', + }, + plugins: [ + polyfillNode({ + polyfills: { + crypto: true, + fs: true, + os: true, + }, + }), + wasmLoader({ + mode: "deferred", + }), + ], + bundle: true, + platform: "browser", + format: "esm", + treeShaking: true, + logLevel: "warning", +}; diff --git a/templates/ctl-scaffold/esbuild/serve.js b/templates/ctl-scaffold/esbuild/serve.js new file mode 100644 index 0000000000..8b4220c435 --- /dev/null +++ b/templates/ctl-scaffold/esbuild/serve.js @@ -0,0 +1,9 @@ +import * as esbuild from "esbuild"; +import { buildOptions } from "./config.js"; + +const ctx = await esbuild.context(buildOptions); +await ctx.serve({ + host: "127.0.0.1", + port: 4008, + servedir: "dist/esbuild", +}); diff --git a/templates/ctl-scaffold/flake.lock b/templates/ctl-scaffold/flake.lock index f56ef71a90..a3421472f5 100644 --- a/templates/ctl-scaffold/flake.lock +++ b/templates/ctl-scaffold/flake.lock @@ -2757,17 +2757,17 @@ ] }, "locked": { - "lastModified": 1687338750, - "narHash": "sha256-TF1m9/Sepv4VGJe1Wp4FglXTCsyGUblrJZYebZFBfDQ=", + "lastModified": 1688727102, + "narHash": "sha256-qeYJOsLWEI3byvvcUqm9Z6LwCs4NB7JFHRHTwib2ET4=", "owner": "Plutonomicon", "repo": "cardano-transaction-lib", - "rev": "167bc59308d00be43c01706e03f8c0e7993b6d69", + "rev": "ef1441b9a401586c8ecfb3d8cdbbb42d4bcda3ea", "type": "github" }, "original": { "owner": "Plutonomicon", "repo": "cardano-transaction-lib", - "rev": "167bc59308d00be43c01706e03f8c0e7993b6d69", + "rev": "ef1441b9a401586c8ecfb3d8cdbbb42d4bcda3ea", "type": "github" } }, @@ -3596,17 +3596,17 @@ "easy-purescript-nix": { "flake": false, "locked": { - "lastModified": 1666686938, - "narHash": "sha256-/UOLRdnEhIOcxcm5ouOipOiSgHRzJde0ccAx4xB1dnU=", + "lastModified": 1679861376, + "narHash": "sha256-LLqaLPJNiap2U8I77K5XVPGJA/Be30Z8lyGOyYXmBlc=", "owner": "justinwoo", "repo": "easy-purescript-nix", - "rev": "da7acb2662961fd355f0a01a25bd32bf33577fa8", + "rev": "0c10ff170461aed0c336f5c21ed0f430c2c3574b", "type": "github" }, "original": { "owner": "justinwoo", "repo": "easy-purescript-nix", - "rev": "da7acb2662961fd355f0a01a25bd32bf33577fa8", + "rev": "0c10ff170461aed0c336f5c21ed0f430c2c3574b", "type": "github" } }, diff --git a/templates/ctl-scaffold/flake.nix b/templates/ctl-scaffold/flake.nix index c29c1de8f2..023907d1a0 100644 --- a/templates/ctl-scaffold/flake.nix +++ b/templates/ctl-scaffold/flake.nix @@ -10,7 +10,7 @@ type = "github"; owner = "Plutonomicon"; repo = "cardano-transaction-lib"; - rev = "167bc59308d00be43c01706e03f8c0e7993b6d69"; + rev = "ef1441b9a401586c8ecfb3d8cdbbb42d4bcda3ea"; }; # To use the same version of `nixpkgs` as we do nixpkgs.follows = "ctl/nixpkgs"; diff --git a/templates/ctl-scaffold/package-lock.json b/templates/ctl-scaffold/package-lock.json index 0acb8bd94f..dc32a5c5a0 100644 --- a/templates/ctl-scaffold/package-lock.json +++ b/templates/ctl-scaffold/package-lock.json @@ -34,6 +34,9 @@ }, "devDependencies": { "buffer": "6.0.3", + "esbuild": "0.18.11", + "esbuild-plugin-polyfill-node": "^0.3.0", + "esbuild-plugin-wasm": "^1.1.0", "html-webpack-plugin": "5.5.0", "webpack": "5.67.0", "webpack-cli": "4.10", @@ -69,6 +72,358 @@ "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-11.2.1.tgz", "integrity": "sha512-+Rw35NW4Qv/9uFaPxhKtxiIPmoBEIFMAgdqQxZTw6hNT/wvBp2TvwTBPnOW8ODs7GUAA8nrO1rJJAaxF+mAG2w==" }, + "node_modules/@esbuild/android-arm": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.11.tgz", + "integrity": "sha512-q4qlUf5ucwbUJZXF5tEQ8LF7y0Nk4P58hOsGk3ucY0oCwgQqAnqXVbUuahCddVHfrxmpyewRpiTHwVHIETYu7Q==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.11.tgz", + "integrity": "sha512-snieiq75Z1z5LJX9cduSAjUr7vEI1OdlzFPMw0HH5YI7qQHDd3qs+WZoMrWYDsfRJSq36lIA6mfZBkvL46KoIw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.11.tgz", + "integrity": "sha512-iPuoxQEV34+hTF6FT7om+Qwziv1U519lEOvekXO9zaMMlT9+XneAhKL32DW3H7okrCOBQ44BMihE8dclbZtTuw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.11.tgz", + "integrity": "sha512-Gm0QkI3k402OpfMKyQEEMG0RuW2LQsSmI6OeO4El2ojJMoF5NLYb3qMIjvbG/lbMeLOGiW6ooU8xqc+S0fgz2w==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.11.tgz", + "integrity": "sha512-N15Vzy0YNHu6cfyDOjiyfJlRJCB/ngKOAvoBf1qybG3eOq0SL2Lutzz9N7DYUbb7Q23XtHPn6lMDF6uWbGv9Fw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.11.tgz", + "integrity": "sha512-atEyuq6a3omEY5qAh5jIORWk8MzFnCpSTUruBgeyN9jZq1K/QI9uke0ATi3MHu4L8c59CnIi4+1jDKMuqmR71A==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.11.tgz", + "integrity": "sha512-XtuPrEfBj/YYYnAAB7KcorzzpGTvOr/dTtXPGesRfmflqhA4LMF0Gh/n5+a9JBzPuJ+CGk17CA++Hmr1F/gI0Q==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.11.tgz", + "integrity": "sha512-Idipz+Taso/toi2ETugShXjQ3S59b6m62KmLHkJlSq/cBejixmIydqrtM2XTvNCywFl3VC7SreSf6NV0i6sRyg==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.11.tgz", + "integrity": "sha512-c6Vh2WS9VFKxKZ2TvJdA7gdy0n6eSy+yunBvv4aqNCEhSWVor1TU43wNRp2YLO9Vng2G+W94aRz+ILDSwAiYog==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.11.tgz", + "integrity": "sha512-S3hkIF6KUqRh9n1Q0dSyYcWmcVa9Cg+mSoZEfFuzoYXXsk6196qndrM+ZiHNwpZKi3XOXpShZZ+9dfN5ykqjjw==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.11.tgz", + "integrity": "sha512-MRESANOoObQINBA+RMZW+Z0TJWpibtE7cPFnahzyQHDCA9X9LOmGh68MVimZlM9J8n5Ia8lU773te6O3ILW8kw==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.11.tgz", + "integrity": "sha512-qVyPIZrXNMOLYegtD1u8EBccCrBVshxMrn5MkuFc3mEVsw7CCQHaqZ4jm9hbn4gWY95XFnb7i4SsT3eflxZsUg==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.11.tgz", + "integrity": "sha512-T3yd8vJXfPirZaUOoA9D2ZjxZX4Gr3QuC3GztBJA6PklLotc/7sXTOuuRkhE9W/5JvJP/K9b99ayPNAD+R+4qQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.11.tgz", + "integrity": "sha512-evUoRPWiwuFk++snjH9e2cAjF5VVSTj+Dnf+rkO/Q20tRqv+644279TZlPK8nUGunjPAtQRCj1jQkDAvL6rm2w==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.11.tgz", + "integrity": "sha512-/SlRJ15XR6i93gRWquRxYCfhTeC5PdqEapKoLbX63PLCmAkXZHY2uQm2l9bN0oPHBsOw2IswRZctMYS0MijFcg==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.11.tgz", + "integrity": "sha512-xcncej+wF16WEmIwPtCHi0qmx1FweBqgsRtEL1mSHLFR6/mb3GEZfLQnx+pUDfRDEM4DQF8dpXIW7eDOZl1IbA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.11.tgz", + "integrity": "sha512-aSjMHj/F7BuS1CptSXNg6S3M4F3bLp5wfFPIJM+Km2NfIVfFKhdmfHF9frhiCLIGVzDziggqWll0B+9AUbud/Q==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.11.tgz", + "integrity": "sha512-tNBq+6XIBZtht0xJGv7IBB5XaSyvYPCm1PxJ33zLQONdZoLVM0bgGqUrXnJyiEguD9LU4AHiu+GCXy/Hm9LsdQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.11.tgz", + "integrity": "sha512-kxfbDOrH4dHuAAOhr7D7EqaYf+W45LsAOOhAet99EyuxxQmjbk8M9N4ezHcEiCYPaiW8Dj3K26Z2V17Gt6p3ng==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.11.tgz", + "integrity": "sha512-Sh0dDRyk1Xi348idbal7lZyfSkjhJsdFeuC13zqdipsvMetlGiFQNdO+Yfp6f6B4FbyQm7qsk16yaZk25LChzg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.11.tgz", + "integrity": "sha512-o9JUIKF1j0rqJTFbIoF4bXj6rvrTZYOrfRcGyL0Vm5uJ/j5CkBD/51tpdxe9lXEDouhRgdr/BYzUrDOvrWwJpg==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.11.tgz", + "integrity": "sha512-rQI4cjLHd2hGsM1LqgDI7oOCYbQ6IBOVsX9ejuRMSze0GqXUG2ekwiKkiBU1pRGSeCqFFHxTrcEydB2Hyoz9CA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", @@ -121,6 +476,12 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "node_modules/@jspm/core": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@jspm/core/-/core-2.0.1.tgz", + "integrity": "sha512-Lg3PnLp0QXpxwLIAuuJboLeRaIhrgJjeuh797QADg3xz8wGLugQOS5DpsE8A6i6Adgzf+bacllkKZG3J0tGfDw==", + "dev": true + }, "node_modules/@mlabs-haskell/csl-gc-wrapper": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@mlabs-haskell/csl-gc-wrapper/-/csl-gc-wrapper-1.0.1.tgz", @@ -1894,6 +2255,69 @@ "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz", "integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==" }, + "node_modules/esbuild": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.11.tgz", + "integrity": "sha512-i8u6mQF0JKJUlGR3OdFLKldJQMMs8OqM9Cc3UCi9XXziJ9WERM5bfkHaEAy0YAvPRMgqSW55W7xYn84XtEFTtA==", + "dev": true, + "hasInstallScript": true, + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=12" + }, + "optionalDependencies": { + "@esbuild/android-arm": "0.18.11", + "@esbuild/android-arm64": "0.18.11", + "@esbuild/android-x64": "0.18.11", + "@esbuild/darwin-arm64": "0.18.11", + "@esbuild/darwin-x64": "0.18.11", + "@esbuild/freebsd-arm64": "0.18.11", + "@esbuild/freebsd-x64": "0.18.11", + "@esbuild/linux-arm": "0.18.11", + "@esbuild/linux-arm64": "0.18.11", + "@esbuild/linux-ia32": "0.18.11", + "@esbuild/linux-loong64": "0.18.11", + "@esbuild/linux-mips64el": "0.18.11", + "@esbuild/linux-ppc64": "0.18.11", + "@esbuild/linux-riscv64": "0.18.11", + "@esbuild/linux-s390x": "0.18.11", + "@esbuild/linux-x64": "0.18.11", + "@esbuild/netbsd-x64": "0.18.11", + "@esbuild/openbsd-x64": "0.18.11", + "@esbuild/sunos-x64": "0.18.11", + "@esbuild/win32-arm64": "0.18.11", + "@esbuild/win32-ia32": "0.18.11", + "@esbuild/win32-x64": "0.18.11" + } + }, + "node_modules/esbuild-plugin-polyfill-node": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/esbuild-plugin-polyfill-node/-/esbuild-plugin-polyfill-node-0.3.0.tgz", + "integrity": "sha512-SHG6CKUfWfYyYXGpW143NEZtcVVn8S/WHcEOxk62LuDXnY4Zpmc+WmxJKN6GMTgTClXJXhEM5KQlxKY6YjbucQ==", + "dev": true, + "dependencies": { + "@jspm/core": "^2.0.1", + "import-meta-resolve": "^3.0.0" + }, + "peerDependencies": { + "esbuild": "*" + } + }, + "node_modules/esbuild-plugin-wasm": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/esbuild-plugin-wasm/-/esbuild-plugin-wasm-1.1.0.tgz", + "integrity": "sha512-0bQ6+1tUbySSnxzn5jnXHMDvYnT0cN/Wd4Syk8g/sqAIJUg7buTIi22svS3Qz6ssx895NT+TgLPb33xi1OkZig==", + "dev": true, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "type": "individual", + "url": "https://ko-fi.com/tschrock" + } + }, "node_modules/escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -2818,6 +3242,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/import-meta-resolve": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-3.0.0.tgz", + "integrity": "sha512-4IwhLhNNA8yy445rPjD/lWh++7hMDOml2eHtd58eG7h+qK3EryMuuRbsHGPikCoAgIkkDnckKfWSk2iDla/ejg==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/indent-string": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", @@ -5799,6 +6233,160 @@ "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-11.2.1.tgz", "integrity": "sha512-+Rw35NW4Qv/9uFaPxhKtxiIPmoBEIFMAgdqQxZTw6hNT/wvBp2TvwTBPnOW8ODs7GUAA8nrO1rJJAaxF+mAG2w==" }, + "@esbuild/android-arm": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.11.tgz", + "integrity": "sha512-q4qlUf5ucwbUJZXF5tEQ8LF7y0Nk4P58hOsGk3ucY0oCwgQqAnqXVbUuahCddVHfrxmpyewRpiTHwVHIETYu7Q==", + "dev": true, + "optional": true + }, + "@esbuild/android-arm64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.11.tgz", + "integrity": "sha512-snieiq75Z1z5LJX9cduSAjUr7vEI1OdlzFPMw0HH5YI7qQHDd3qs+WZoMrWYDsfRJSq36lIA6mfZBkvL46KoIw==", + "dev": true, + "optional": true + }, + "@esbuild/android-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.11.tgz", + "integrity": "sha512-iPuoxQEV34+hTF6FT7om+Qwziv1U519lEOvekXO9zaMMlT9+XneAhKL32DW3H7okrCOBQ44BMihE8dclbZtTuw==", + "dev": true, + "optional": true + }, + "@esbuild/darwin-arm64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.11.tgz", + "integrity": "sha512-Gm0QkI3k402OpfMKyQEEMG0RuW2LQsSmI6OeO4El2ojJMoF5NLYb3qMIjvbG/lbMeLOGiW6ooU8xqc+S0fgz2w==", + "dev": true, + "optional": true + }, + "@esbuild/darwin-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.11.tgz", + "integrity": "sha512-N15Vzy0YNHu6cfyDOjiyfJlRJCB/ngKOAvoBf1qybG3eOq0SL2Lutzz9N7DYUbb7Q23XtHPn6lMDF6uWbGv9Fw==", + "dev": true, + "optional": true + }, + "@esbuild/freebsd-arm64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.11.tgz", + "integrity": "sha512-atEyuq6a3omEY5qAh5jIORWk8MzFnCpSTUruBgeyN9jZq1K/QI9uke0ATi3MHu4L8c59CnIi4+1jDKMuqmR71A==", + "dev": true, + "optional": true + }, + "@esbuild/freebsd-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.11.tgz", + "integrity": "sha512-XtuPrEfBj/YYYnAAB7KcorzzpGTvOr/dTtXPGesRfmflqhA4LMF0Gh/n5+a9JBzPuJ+CGk17CA++Hmr1F/gI0Q==", + "dev": true, + "optional": true + }, + "@esbuild/linux-arm": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.11.tgz", + "integrity": "sha512-Idipz+Taso/toi2ETugShXjQ3S59b6m62KmLHkJlSq/cBejixmIydqrtM2XTvNCywFl3VC7SreSf6NV0i6sRyg==", + "dev": true, + "optional": true + }, + "@esbuild/linux-arm64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.11.tgz", + "integrity": "sha512-c6Vh2WS9VFKxKZ2TvJdA7gdy0n6eSy+yunBvv4aqNCEhSWVor1TU43wNRp2YLO9Vng2G+W94aRz+ILDSwAiYog==", + "dev": true, + "optional": true + }, + "@esbuild/linux-ia32": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.11.tgz", + "integrity": "sha512-S3hkIF6KUqRh9n1Q0dSyYcWmcVa9Cg+mSoZEfFuzoYXXsk6196qndrM+ZiHNwpZKi3XOXpShZZ+9dfN5ykqjjw==", + "dev": true, + "optional": true + }, + "@esbuild/linux-loong64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.11.tgz", + "integrity": "sha512-MRESANOoObQINBA+RMZW+Z0TJWpibtE7cPFnahzyQHDCA9X9LOmGh68MVimZlM9J8n5Ia8lU773te6O3ILW8kw==", + "dev": true, + "optional": true + }, + "@esbuild/linux-mips64el": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.11.tgz", + "integrity": "sha512-qVyPIZrXNMOLYegtD1u8EBccCrBVshxMrn5MkuFc3mEVsw7CCQHaqZ4jm9hbn4gWY95XFnb7i4SsT3eflxZsUg==", + "dev": true, + "optional": true + }, + "@esbuild/linux-ppc64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.11.tgz", + "integrity": "sha512-T3yd8vJXfPirZaUOoA9D2ZjxZX4Gr3QuC3GztBJA6PklLotc/7sXTOuuRkhE9W/5JvJP/K9b99ayPNAD+R+4qQ==", + "dev": true, + "optional": true + }, + "@esbuild/linux-riscv64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.11.tgz", + "integrity": "sha512-evUoRPWiwuFk++snjH9e2cAjF5VVSTj+Dnf+rkO/Q20tRqv+644279TZlPK8nUGunjPAtQRCj1jQkDAvL6rm2w==", + "dev": true, + "optional": true + }, + "@esbuild/linux-s390x": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.11.tgz", + "integrity": "sha512-/SlRJ15XR6i93gRWquRxYCfhTeC5PdqEapKoLbX63PLCmAkXZHY2uQm2l9bN0oPHBsOw2IswRZctMYS0MijFcg==", + "dev": true, + "optional": true + }, + "@esbuild/linux-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.11.tgz", + "integrity": "sha512-xcncej+wF16WEmIwPtCHi0qmx1FweBqgsRtEL1mSHLFR6/mb3GEZfLQnx+pUDfRDEM4DQF8dpXIW7eDOZl1IbA==", + "dev": true, + "optional": true + }, + "@esbuild/netbsd-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.11.tgz", + "integrity": "sha512-aSjMHj/F7BuS1CptSXNg6S3M4F3bLp5wfFPIJM+Km2NfIVfFKhdmfHF9frhiCLIGVzDziggqWll0B+9AUbud/Q==", + "dev": true, + "optional": true + }, + "@esbuild/openbsd-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.11.tgz", + "integrity": "sha512-tNBq+6XIBZtht0xJGv7IBB5XaSyvYPCm1PxJ33zLQONdZoLVM0bgGqUrXnJyiEguD9LU4AHiu+GCXy/Hm9LsdQ==", + "dev": true, + "optional": true + }, + "@esbuild/sunos-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.11.tgz", + "integrity": "sha512-kxfbDOrH4dHuAAOhr7D7EqaYf+W45LsAOOhAet99EyuxxQmjbk8M9N4ezHcEiCYPaiW8Dj3K26Z2V17Gt6p3ng==", + "dev": true, + "optional": true + }, + "@esbuild/win32-arm64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.11.tgz", + "integrity": "sha512-Sh0dDRyk1Xi348idbal7lZyfSkjhJsdFeuC13zqdipsvMetlGiFQNdO+Yfp6f6B4FbyQm7qsk16yaZk25LChzg==", + "dev": true, + "optional": true + }, + "@esbuild/win32-ia32": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.11.tgz", + "integrity": "sha512-o9JUIKF1j0rqJTFbIoF4bXj6rvrTZYOrfRcGyL0Vm5uJ/j5CkBD/51tpdxe9lXEDouhRgdr/BYzUrDOvrWwJpg==", + "dev": true, + "optional": true + }, + "@esbuild/win32-x64": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.11.tgz", + "integrity": "sha512-rQI4cjLHd2hGsM1LqgDI7oOCYbQ6IBOVsX9ejuRMSze0GqXUG2ekwiKkiBU1pRGSeCqFFHxTrcEydB2Hyoz9CA==", + "dev": true, + "optional": true + }, "@jridgewell/gen-mapping": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", @@ -5842,6 +6430,12 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "@jspm/core": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@jspm/core/-/core-2.0.1.tgz", + "integrity": "sha512-Lg3PnLp0QXpxwLIAuuJboLeRaIhrgJjeuh797QADg3xz8wGLugQOS5DpsE8A6i6Adgzf+bacllkKZG3J0tGfDw==", + "dev": true + }, "@mlabs-haskell/csl-gc-wrapper": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@mlabs-haskell/csl-gc-wrapper/-/csl-gc-wrapper-1.0.1.tgz", @@ -7294,6 +7888,52 @@ "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz", "integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==" }, + "esbuild": { + "version": "0.18.11", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.11.tgz", + "integrity": "sha512-i8u6mQF0JKJUlGR3OdFLKldJQMMs8OqM9Cc3UCi9XXziJ9WERM5bfkHaEAy0YAvPRMgqSW55W7xYn84XtEFTtA==", + "dev": true, + "requires": { + "@esbuild/android-arm": "0.18.11", + "@esbuild/android-arm64": "0.18.11", + "@esbuild/android-x64": "0.18.11", + "@esbuild/darwin-arm64": "0.18.11", + "@esbuild/darwin-x64": "0.18.11", + "@esbuild/freebsd-arm64": "0.18.11", + "@esbuild/freebsd-x64": "0.18.11", + "@esbuild/linux-arm": "0.18.11", + "@esbuild/linux-arm64": "0.18.11", + "@esbuild/linux-ia32": "0.18.11", + "@esbuild/linux-loong64": "0.18.11", + "@esbuild/linux-mips64el": "0.18.11", + "@esbuild/linux-ppc64": "0.18.11", + "@esbuild/linux-riscv64": "0.18.11", + "@esbuild/linux-s390x": "0.18.11", + "@esbuild/linux-x64": "0.18.11", + "@esbuild/netbsd-x64": "0.18.11", + "@esbuild/openbsd-x64": "0.18.11", + "@esbuild/sunos-x64": "0.18.11", + "@esbuild/win32-arm64": "0.18.11", + "@esbuild/win32-ia32": "0.18.11", + "@esbuild/win32-x64": "0.18.11" + } + }, + "esbuild-plugin-polyfill-node": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/esbuild-plugin-polyfill-node/-/esbuild-plugin-polyfill-node-0.3.0.tgz", + "integrity": "sha512-SHG6CKUfWfYyYXGpW143NEZtcVVn8S/WHcEOxk62LuDXnY4Zpmc+WmxJKN6GMTgTClXJXhEM5KQlxKY6YjbucQ==", + "dev": true, + "requires": { + "@jspm/core": "^2.0.1", + "import-meta-resolve": "^3.0.0" + } + }, + "esbuild-plugin-wasm": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/esbuild-plugin-wasm/-/esbuild-plugin-wasm-1.1.0.tgz", + "integrity": "sha512-0bQ6+1tUbySSnxzn5jnXHMDvYnT0cN/Wd4Syk8g/sqAIJUg7buTIi22svS3Qz6ssx895NT+TgLPb33xi1OkZig==", + "dev": true + }, "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -7976,6 +8616,12 @@ "resolve-cwd": "^3.0.0" } }, + "import-meta-resolve": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-3.0.0.tgz", + "integrity": "sha512-4IwhLhNNA8yy445rPjD/lWh++7hMDOml2eHtd58eG7h+qK3EryMuuRbsHGPikCoAgIkkDnckKfWSk2iDla/ejg==", + "dev": true + }, "indent-string": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", diff --git a/templates/ctl-scaffold/package.json b/templates/ctl-scaffold/package.json index f70c6484a3..de6c65827a 100644 --- a/templates/ctl-scaffold/package.json +++ b/templates/ctl-scaffold/package.json @@ -1,4 +1,5 @@ { + "type": "module", "name": "ctl-scaffold", "version": "0.1.0", "description": "", @@ -49,6 +50,9 @@ }, "devDependencies": { "buffer": "6.0.3", + "esbuild": "0.18.11", + "esbuild-plugin-polyfill-node": "^0.3.0", + "esbuild-plugin-wasm": "^1.1.0", "html-webpack-plugin": "5.5.0", "webpack": "5.67.0", "webpack-cli": "4.10", diff --git a/templates/ctl-scaffold/packages.dhall b/templates/ctl-scaffold/packages.dhall index e2b2f8c645..4d54f6f7db 100644 --- a/templates/ctl-scaffold/packages.dhall +++ b/templates/ctl-scaffold/packages.dhall @@ -105,8 +105,8 @@ in upstream ------------------------------- -} let upstream = - https://github.com/purescript/package-sets/releases/download/psc-0.14.5-20220224/packages.dhall - sha256:67cc3d4f0e8fb72bb1413ba94ddd72a3ceb0783eb725e3b22ad7568b3b581163 + https://github.com/purescript/package-sets/releases/download/psc-0.15.4-20230105/packages.dhall + sha256:3e9fbc9ba03e9a1fcfd895f65e2d50ee2f5e86c4cd273f3d5c841b655a0e1bda let additions = { aeson = @@ -145,8 +145,8 @@ let additions = , "uint" , "untagged-union" ] - , repo = "https://github.com/mlabs-haskell/purescript-aeson.git" - , version = "bfd8f4dcd0522a076320f9dc710c24817438e02e" + , repo = "https://github.com/errfrom/purescript-aeson.git" + , version = "f092a1fc9b0ecc2445accf5bf0aad10e6eade89b" } , sequences = { dependencies = @@ -168,8 +168,8 @@ let additions = , "unfoldable" , "unsafe-coerce" ] - , repo = "https://github.com/hdgarrood/purescript-sequences" - , version = "v3.0.2" + , repo = "https://github.com/garganscript/purescript-sequences" + , version = "cae456c1a7463785ad33981a93e7a9cb5fc7872c" } , properties = { dependencies = [ "prelude", "console" ] @@ -228,8 +228,8 @@ let additions = , "unordered-collections" , "unsafe-coerce" ] - , repo = "https://github.com/juspay/medea-ps.git" - , version = "8b215851959aa8bbf33e6708df6bd683c89d1a5a" + , repo = "https://github.com/errfrom/medea-ps.git" + , version = "00981e4ce7249808413a6db8d88d849bbe85245a" } , purescript-toppokki = { dependencies = @@ -241,8 +241,8 @@ let additions = , "node-buffer" , "node-fs-aff" ] - , repo = "https://github.com/firefrorefiddle/purescript-toppokki" - , version = "6983e07bf0aa55ab779bcef12df3df339a2b5bd9" + , repo = "https://github.com/errfrom/purescript-toppokki" + , version = "b043e9342463df76972d05981ac4ec25316834bf" } , bignumber = { dependencies = @@ -256,8 +256,8 @@ let additions = , "prelude" , "tuples" ] - , repo = "https://github.com/mlabs-haskell/purescript-bignumber" - , version = "705923edd892a3397b90d28ce7db9a7181dcd599" + , repo = "https://github.com/errfrom/purescript-bignumber" + , version = "9b3179ad07428d189e42a7a205aab9c7c4849d4a" } , cardano-transaction-lib = { dependencies = @@ -298,7 +298,6 @@ let additions = , "js-date" , "lattice" , "lists" - , "math" , "maybe" , "medea" , "media-types" @@ -330,6 +329,7 @@ let additions = , "quickcheck" , "quickcheck-combinators" , "quickcheck-laws" + , "random" , "rationals" , "record" , "refs" @@ -345,15 +345,14 @@ let additions = , "typelevel" , "typelevel-prelude" , "uint" - , "undefined" , "unfoldable" , "untagged-union" , "variant" - , "web-storage" , "web-html" + , "web-storage" ] , repo = "https://github.com/Plutonomicon/cardano-transaction-lib.git" - , version = "167bc59308d00be43c01706e03f8c0e7993b6d69" + , version = "ef1441b9a401586c8ecfb3d8cdbbb42d4bcda3ea" } , noble-secp256k1 = { dependencies = @@ -366,10 +365,9 @@ let additions = , "unsafe-coerce" ] , repo = - "https://github.com/mlabs-haskell/purescript-noble-secp256k1.git" - , version = "710c15c48c5afae5e0623664d982a587ff2bd177" + "https://github.com/errfrom/purescript-noble-secp256k1.git" + , version = "9fc5db67e2b6e8b027c415e4dd1625c3f1d8b623" } } in (upstream // additions) - with parsing.version = "v7.0.1" diff --git a/templates/ctl-scaffold/spago-packages.nix b/templates/ctl-scaffold/spago-packages.nix index b04ba26235..ac96e1e3e8 100644 --- a/templates/ctl-scaffold/spago-packages.nix +++ b/templates/ctl-scaffold/spago-packages.nix @@ -7,11 +7,11 @@ let "aeson" = pkgs.stdenv.mkDerivation { name = "aeson"; - version = "bfd8f4dcd0522a076320f9dc710c24817438e02e"; + version = "f092a1fc9b0ecc2445accf5bf0aad10e6eade89b"; src = pkgs.fetchgit { - url = "https://github.com/mlabs-haskell/purescript-aeson.git"; - rev = "bfd8f4dcd0522a076320f9dc710c24817438e02e"; - sha256 = "1ywm51wqvwjqfrmhav6m4hyl9il3h77yyhzgyhvkvg0lkc0nn575"; + url = "https://github.com/errfrom/purescript-aeson.git"; + rev = "f092a1fc9b0ecc2445accf5bf0aad10e6eade89b"; + sha256 = "057cndwgcl8y8qh2afw3210hqcizr1ccsx1zkygn3bs2gpyx7h3q"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -19,11 +19,11 @@ let "aff" = pkgs.stdenv.mkDerivation { name = "aff"; - version = "v6.0.0"; + version = "v7.1.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-aff.git"; - rev = "d0eb009f2f47cb1f5ba1d8592d90c95e8e7ff75d"; - sha256 = "1780sgqyvbdgh8ynxmxn5d44vvhaz7kn9sv3l44c2s9q8xfjkfgm"; + rev = "6adec6ff048a7876f74c294c440374cd21342d39"; + sha256 = "1viplap030ym9ya033xl6x41hvdc12v9ngwp1v64ayl40a5m1d47"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -31,11 +31,11 @@ let "aff-promise" = pkgs.stdenv.mkDerivation { name = "aff-promise"; - version = "v3.0.0"; + version = "v4.0.0"; src = pkgs.fetchgit { url = "https://github.com/nwolverson/purescript-aff-promise.git"; - rev = "45cfba7f663fce12fe69285fe5acaa4ff025144c"; - sha256 = "12fnlwcrj5p6kc5rls7qxwg53zd83gkdpklpmp8jyav945hlgbj2"; + rev = "3aa74e68e3e4c3e38d821375703e0b2f49d831eb"; + sha256 = "10gv3b05dxnlmr9zmigqs1hz4xqrx7da30aqh12kqg3zrg49k9cc"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -43,11 +43,11 @@ let "aff-retry" = pkgs.stdenv.mkDerivation { name = "aff-retry"; - version = "v1.2.1"; + version = "v2.0.0"; src = pkgs.fetchgit { url = "https://github.com/Unisay/purescript-aff-retry.git"; - rev = "936fad803e3610f149df724ead288657a905cb84"; - sha256 = "08651ly153ywzviab0ipd0zrhwdr8nz4xfym45dlpbgabgrh8pra"; + rev = "4464f4bf62151651c8a86b33fc3c3149f7c71580"; + sha256 = "00xmfrx41giflrbdxm6hzmr23iqzr34x656kjpbmk3zvm49n6726"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -55,11 +55,11 @@ let "affjax" = pkgs.stdenv.mkDerivation { name = "affjax"; - version = "v12.0.0"; + version = "v13.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-affjax.git"; - rev = "5be197edc213fbededb8da908f77b69908eaa6f8"; - sha256 = "1f2snaimnl9ry8f3kankfcyy50wkba54vvin4wsrglahqgs1nrgb"; + rev = "87a8ffce89a476c1425370eb4b2b7e15408e0d1c"; + sha256 = "02hd0pfa1lb06a8qg2mqmkhyn3cz8hbvh6r9h2i6xcfqh0r8jg7s"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -67,11 +67,11 @@ let "ansi" = pkgs.stdenv.mkDerivation { name = "ansi"; - version = "v6.1.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/hdgarrood/purescript-ansi.git"; - rev = "e89e6fede616bd16b001841cf30ac320c95313a6"; - sha256 = "1jsll0h7nz13zgscs036cnkkc6frnlcnk6fwjdwsyp6wbmjri2zm"; + rev = "7d898732d643a977a78004851112a4417909e126"; + sha256 = "1aml84m5p1s14kj29m39182byg44nf275p4cinx3kgwhv1gj0qcp"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -79,11 +79,11 @@ let "argonaut" = pkgs.stdenv.mkDerivation { name = "argonaut"; - version = "v8.0.0"; + version = "v9.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-argonaut.git"; - rev = "e5137df76065c14e5de70c4e2820222bd7c78fc2"; - sha256 = "05sq1102rl1phm2gadx0gp966yvk9q1r492bb30q1m0nz762q4v2"; + rev = "7505a47f2edb0c9cacaac4f11dcedf4723a3e9c8"; + sha256 = "18yxhlrwri6q858krz1klyq29fx8nvfm16c04wm2rn91mgyasn6x"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -91,11 +91,11 @@ let "argonaut-codecs" = pkgs.stdenv.mkDerivation { name = "argonaut-codecs"; - version = "v8.1.0"; + version = "v9.1.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-argonaut-codecs.git"; - rev = "b0a041d92bfd548e2cd793cc7c02363464325a13"; - sha256 = "11vmlq98s4jmg5grvdrrlfkqj9vk3la44ky8158a440ipcpinjkq"; + rev = "f8fdc1e34142fa84e66022ea5d417a008d709146"; + sha256 = "1ncpl512k2xdaf7r5ixwxkm6i4vym7a6a3ih71z489h9ad781q73"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -103,11 +103,11 @@ let "argonaut-core" = pkgs.stdenv.mkDerivation { name = "argonaut-core"; - version = "v6.0.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-argonaut-core.git"; - rev = "673971dee79667882a83f9fda7097e50530726f1"; - sha256 = "13ka4xybc8ql54xlkkhy4919nnapfigdlk51ja85f8xwhr64x9kq"; + rev = "68da81dd80ec36d3b013eff46dc067a972c22e5d"; + sha256 = "0hxl17ddbflkk0hchjgk5xj6j9fwp3b182w4g073p0dwscdl4f08"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -115,11 +115,11 @@ let "argonaut-traversals" = pkgs.stdenv.mkDerivation { name = "argonaut-traversals"; - version = "v9.0.0"; + version = "v10.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-argonaut-traversals.git"; - rev = "36f2e368ceea1ed681bd8e2884eaca451945fc44"; - sha256 = "0bj88s7rz50jfhyawq4h97lvbr3h7pksbqnz4lmh714f5fda6ncx"; + rev = "8d2403d8d57afb568933dbb36063d5670ce770a0"; + sha256 = "0v965bcl1hdp1hacbzxcm35kxxclixj0kpsdm816gs7m548z6l43"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -127,11 +127,11 @@ let "arraybuffer-types" = pkgs.stdenv.mkDerivation { name = "arraybuffer-types"; - version = "v3.0.1"; + version = "v3.0.2"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-arraybuffer-types.git"; - rev = "48cd7f4887791db1d9c2daf5fd98b62ba00e15bd"; - sha256 = "09r6bhsiq9iqdsjf9p8m3p31qkszsipsafvy836mfdi8af6h5fv6"; + rev = "9b0b7a0f9ee034e039f3d3a2a9c3f74eb7c9264a"; + sha256 = "1q3111jk6jj64bxy86lc7ik6q5mgdz87bc086wj5rm57dmlivlxx"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -139,11 +139,11 @@ let "arrays" = pkgs.stdenv.mkDerivation { name = "arrays"; - version = "v6.0.1"; + version = "v7.1.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-arrays.git"; - rev = "c0aa3176b077ad7a46b11ef34487485c28142e53"; - sha256 = "0lm0m5hapimchzgfywr648pkw1hpggr6qibh8d19p2impbnc94c0"; + rev = "bb1b821530d368110eebf8a3541af90823e8af65"; + sha256 = "1mb9a4pb1bd7fj4vqj6msv5z27jbb5f89w3nczgjjhs02909phk9"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -151,11 +151,11 @@ let "assert" = pkgs.stdenv.mkDerivation { name = "assert"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-assert.git"; - rev = "71a3b1f3b9917c23691fdbb1858de171be871a10"; - sha256 = "0r1l7j67an8dy1w4xdpr8nc30lsxv31xwqph9mkfh3nd49jlyyd3"; + rev = "27c0edb57d2ee497eb5fab664f5601c35b613eda"; + sha256 = "02qpcsijil64qq4kcikv2ynxl85zkryvv0vmzjm6752956ymzi0j"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -163,11 +163,11 @@ let "avar" = pkgs.stdenv.mkDerivation { name = "avar"; - version = "v4.0.0"; + version = "v5.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-avar.git"; - rev = "ac3cbbb8d4b71ff19a78a3178355c089e44d3b4d"; - sha256 = "005046wl61w6r5v3qwd16srhcx82vdz3yvp4xzad2xaasb6iq55l"; + rev = "d00f5784d9cc8f079babd62740f5c52b87e5caa5"; + sha256 = "132g0ccmjr8328xpaycww8b5wmx1vi3li4irxxqcjk5wi47i8c9h"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -175,11 +175,11 @@ let "bifunctors" = pkgs.stdenv.mkDerivation { name = "bifunctors"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-bifunctors.git"; - rev = "a31d0fc4bbebf19d5e9b21b65493c28b8d3fba62"; - sha256 = "0xc2hf8ccdgqw3m9qcmr38kmzv05fsxvakd07wyrqshvkzg3xn0d"; + rev = "16ba2fb6dd7f05528ebd9e2f9ca3a068b325e5b3"; + sha256 = "1qz5aaiq5w4g1rhjb63z47h6nqhw8hw23x1zw5alam047pq4vfkg"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -187,11 +187,11 @@ let "bigints" = pkgs.stdenv.mkDerivation { name = "bigints"; - version = "v6.0.0"; + version = "v7.0.1"; src = pkgs.fetchgit { - url = "https://github.com/sharkdp/purescript-bigints.git"; - rev = "d5151e04db7e18641fbb2b5892f4198b1cab5907"; - sha256 = "0x8s6d6q2rpfkk56bmayg57a7hl2h7sq9ljrxfc8sjnwd7mfs193"; + url = "https://github.com/purescript-contrib/purescript-bigints.git"; + rev = "e73f55b866e437c7bf04c7d262de7c205c47bbca"; + sha256 = "0msh5sv6g0k69fi0qv4xi1g89bfwai099f0ycjb8a69mnjq8x21n"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -199,11 +199,11 @@ let "bignumber" = pkgs.stdenv.mkDerivation { name = "bignumber"; - version = "705923edd892a3397b90d28ce7db9a7181dcd599"; + version = "9b3179ad07428d189e42a7a205aab9c7c4849d4a"; src = pkgs.fetchgit { - url = "https://github.com/mlabs-haskell/purescript-bignumber"; - rev = "705923edd892a3397b90d28ce7db9a7181dcd599"; - sha256 = "0wddkx161xk457r1mb1f1r79l8qgxja0xhdvxjd1ai43nwp9cgkf"; + url = "https://github.com/errfrom/purescript-bignumber"; + rev = "9b3179ad07428d189e42a7a205aab9c7c4849d4a"; + sha256 = "03py821gnkgi5p7zaxwr4rqsiv67v83y5c04i6x4v15nr6aaf7vz"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -211,11 +211,11 @@ let "cardano-transaction-lib" = pkgs.stdenv.mkDerivation { name = "cardano-transaction-lib"; - version = "167bc59308d00be43c01706e03f8c0e7993b6d69"; + version = "ef1441b9a401586c8ecfb3d8cdbbb42d4bcda3ea"; src = pkgs.fetchgit { url = "https://github.com/Plutonomicon/cardano-transaction-lib.git"; - rev = "167bc59308d00be43c01706e03f8c0e7993b6d69"; - sha256 = "0w2h1a18yf37r4lh7wjb0fnnmbxibqa07vsv3axbg84ljanh8ph2"; + rev = "ef1441b9a401586c8ecfb3d8cdbbb42d4bcda3ea"; + sha256 = "0ghiyqkc5lqi3m2v41qdrq5g18k7pnlm5p7vrbdqs46nq8x0krm9"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -223,11 +223,11 @@ let "catenable-lists" = pkgs.stdenv.mkDerivation { name = "catenable-lists"; - version = "v6.0.1"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-catenable-lists.git"; - rev = "ee03395f2c5d59a7fd8529a0faac6ec1ebcbb682"; - sha256 = "1lz06fx0za5sl65wccn5fl37mw3x4jnvrriz1gg0aqsmm9lag7ss"; + rev = "09abe1f4888bc00841ad2b59e56a9e7ce7ebd4ab"; + sha256 = "0fn6caspdnb0nrlj31sy7d5hxrhndfz7a2b9wfkxf5bv5vpjyawb"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -247,11 +247,11 @@ let "console" = pkgs.stdenv.mkDerivation { name = "console"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-console.git"; - rev = "d7cb69ef8fed8a51466afe1b623868bb29e8586e"; - sha256 = "0fzzzqjgrz33pb2jf7cdqpg09ilxb7bsrc7sbfq52wjg0sx9aq6g"; + rev = "3b83d7b792d03872afeea5e62b4f686ab0f09842"; + sha256 = "0fr5l1myhscp910mybp04cg6g8f2hy3ikjfc8fkqlb2dm2cqzdfs"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -259,11 +259,11 @@ let "const" = pkgs.stdenv.mkDerivation { name = "const"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-const.git"; - rev = "3a3a4bdc44f71311cf27de9bd22039b110277540"; - sha256 = "0aq9qjbrvf8mf8hmas6imv4mg6n3zi13hkf449ns1hn12lw8qv4g"; + rev = "ab9570cf2b6e67f7e441178211db1231cfd75c37"; + sha256 = "0mcpwqqf5bcwxlzk53smvsjjz1ymlnq0ypphg6sc83ibw70g64f6"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -271,11 +271,11 @@ let "contravariant" = pkgs.stdenv.mkDerivation { name = "contravariant"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-contravariant.git"; - rev = "ae1a765f7ddbfd96ae1f12e399e46d554d8e3b38"; - sha256 = "029hb8i3n4759x4gc06wkfgr7wim5x1w5jy2bsiy42n0g731h5qc"; + rev = "9ad3e105b8855bcc25f4e0893c784789d05a58de"; + sha256 = "1xkd3rfs8v20w7mj6sj6dmhfb2vb1zpmjv245xj1rahk3g16qm7m"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -283,11 +283,11 @@ let "control" = pkgs.stdenv.mkDerivation { name = "control"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-control.git"; - rev = "18d582e311f1f8523f9eb55fb93c91bd21e22837"; - sha256 = "06dc06yli4g5yr8fb9sdpqbhiaff37g977qcsbds9q2mlhnjgfx9"; + rev = "a6033808790879a17b2729e73747a9ed3fb2264e"; + sha256 = "05sdgywprwpav62d2bvlb80yd39brxhnmhhl1f116mm9hw5clqia"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -295,11 +295,11 @@ let "crypto" = pkgs.stdenv.mkDerivation { name = "crypto"; - version = "v4.0.0"; + version = "v5.0.1"; src = pkgs.fetchgit { url = "https://github.com/oreshinya/purescript-crypto.git"; - rev = "cbc19e06c5e4d528e7733633e50c070b1aa0f77e"; - sha256 = "142p9f0mg1yi4bccg3jwhhyn4k4yy5fskh08p05n9sfym27ss126"; + rev = "c72b4b789e52a1fb31c65cd318ea82bf295af1ec"; + sha256 = "07p7153j3brsfyc1pik4y760g054zx1kwy2ap67pfs41zv982s03"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -307,11 +307,11 @@ let "datetime" = pkgs.stdenv.mkDerivation { name = "datetime"; - version = "v5.0.2"; + version = "v6.1.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-datetime.git"; - rev = "e110462829ea656d2bc0924266d4edff222108d4"; - sha256 = "1mhzn2ymdkzki7wjlr9xrdbngm0886wmfbh2c46flnf9lmfyw54y"; + rev = "7f6062346055e654942caed6c44612b59031f059"; + sha256 = "0z5f62arrli0dgmggv6z2qkv1qc9isdivcn7njywsa8wmc4vd47n"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -319,11 +319,11 @@ let "debug" = pkgs.stdenv.mkDerivation { name = "debug"; - version = "v5.0.0"; + version = "v6.0.2"; src = pkgs.fetchgit { url = "https://github.com/garyb/purescript-debug.git"; - rev = "144305842dba81169a93b3a3cc75429d5c8389e9"; - sha256 = "09j69bgrq8nzw1l3aj1hka3y5ycmcsn9dlgf22k5ifrd74iic60y"; + rev = "a37b82f62c89734934c0962ece3412913020460a"; + sha256 = "0q3r21zh0kjy9aq8q2siaf8841q63cmxjl2fbk0z3r0z4cfihccg"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -331,11 +331,11 @@ let "distributive" = pkgs.stdenv.mkDerivation { name = "distributive"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-distributive.git"; - rev = "11f3f87ca5720899e1739cedb58dd6227cae6ad5"; - sha256 = "0788znmdyh6b1c9pln624ah397l88xmd3fxlxiy3z1qy8bzr4r54"; + rev = "6005e513642e855ebf6f884d24a35c2803ca252a"; + sha256 = "0x6cfsx9ff66kvw9l10pxd5vv16r91mmfxrfc68w1xfdfi81lhdx"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -343,11 +343,11 @@ let "effect" = pkgs.stdenv.mkDerivation { name = "effect"; - version = "v3.0.0"; + version = "v4.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-effect.git"; - rev = "985d97bd5721ddcc41304c55a7ca2bb0c0bfdc2a"; - sha256 = "1n9qr85knvpm4i0qhm8xbgfk46v9y843p76j278phfs9l6aywzsn"; + rev = "a192ddb923027d426d6ea3d8deb030c9aa7c7dda"; + sha256 = "0aa10lc6h9mlf4xf3g3ziig7v6kxdqvbh20kma8ay59w0b1bhmj1"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -355,11 +355,11 @@ let "either" = pkgs.stdenv.mkDerivation { name = "either"; - version = "v5.0.0"; + version = "v6.1.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-either.git"; - rev = "c1a1af35684f10eecaf6ac7d38dbf6bd48af2ced"; - sha256 = "18dk159yyv7vs0xsnh9m5fajd7zy6zw5b2mpyd6nqdh3c6bb9wh6"; + rev = "af655a04ed2fd694b6688af39ee20d7907ad0763"; + sha256 = "05zps4klvgmvlm06f4hrycssm8q0pysbqnjsrk26lfvmid6mmg63"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -367,11 +367,11 @@ let "encoding" = pkgs.stdenv.mkDerivation { name = "encoding"; - version = "v0.0.7"; + version = "v0.0.8"; src = pkgs.fetchgit { url = "https://github.com/menelaos/purescript-encoding.git"; - rev = "0a4187136f9ea4ea51ddf635e3b3c2cd2461faac"; - sha256 = "1rsnn8g2lx24k9wflr1jj12281i0smprb76nfm2f61yqqiwgij4d"; + rev = "a9d1913de736821c133ecd7944a08b2ab07ad774"; + sha256 = "0c23bpfw67ik1n821bq3s0w036sk7yqi4fy5fd7dgf4325abk6zn"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -379,11 +379,11 @@ let "enums" = pkgs.stdenv.mkDerivation { name = "enums"; - version = "v5.0.0"; + version = "v6.0.1"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-enums.git"; - rev = "170d959644eb99e0025f4ab2e38f5f132fd85fa4"; - sha256 = "1lci5iy6s6cmh93bpkfcmp0j4n5dnij7dswb0075bk0kzd9xp7rs"; + rev = "cd373c580b69fdc00e412bddbc299adabe242cc5"; + sha256 = "1wk98ddmgyii1ifqawnhqkiqlrs405qcp3m12jsg1yp8jv6ppv47"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -391,11 +391,11 @@ let "exceptions" = pkgs.stdenv.mkDerivation { name = "exceptions"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-exceptions.git"; - rev = "410d0b8813592bda3c25028540eeb2cda312ddc9"; - sha256 = "1yjbrx34a0rnxgpvywb63n9jzhkdgb2q2acyzbwh290mrrggc95x"; + rev = "afab3c07c820bb49b6c5be50049db46a964a6161"; + sha256 = "04xrbrcjwsv8gj465ygrlqhv1majxmr6m242iazg6apxlr89hgvg"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -403,11 +403,11 @@ let "exists" = pkgs.stdenv.mkDerivation { name = "exists"; - version = "v5.1.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-exists.git"; - rev = "c34820f8b2d15be29abdd5097c3d636f5df8f28c"; - sha256 = "15qp52cpp2yvxihkzfmn6gabyvx5s6iz5lafvqhyfgp4wfnz0bds"; + rev = "f765b4ace7869c27b9c05949e18c843881f9173b"; + sha256 = "0xnxi8fsmi15wrpq5d99gg94glk8a45hpx7pf4pmxg5r6rn1vjvx"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -427,11 +427,11 @@ let "fixed-points" = pkgs.stdenv.mkDerivation { name = "fixed-points"; - version = "v6.0.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-fixed-points.git"; - rev = "3b643d948479aee7cd3e36c95258f1f84df0c35f"; - sha256 = "0w2j0sarylzsmg8b228pmn3qndif0bzw2vmxrx30ar15qy7jdb5d"; + rev = "2b7f480038a15c707adf49178181cefed167afb2"; + sha256 = "1iib0yxl749lg4m7ysqmb9aby67a9829x38xc2rma5fk9fv30cw7"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -439,11 +439,11 @@ let "foldable-traversable" = pkgs.stdenv.mkDerivation { name = "foldable-traversable"; - version = "v5.0.1"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-foldable-traversable.git"; - rev = "d581caf260772b1b446c11ac3c8be807b290b220"; - sha256 = "182na4np7hk2dqyxywy4jij2csrzx4bz02m6bq8yx1j27hlgjvsd"; + rev = "b3926f870532d287ea59e2d5cd3873b81ef2a93a"; + sha256 = "0xg8qvyc6r9wqgy7wnw1rjqljl4wpgdrkxsm5x9rsagj2k5brxip"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -451,11 +451,11 @@ let "foreign" = pkgs.stdenv.mkDerivation { name = "foreign"; - version = "v6.0.1"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-foreign.git"; - rev = "7ee18c6689c56c89755172ea53326f948da10bd3"; - sha256 = "16j7712cck79p8q53xbhn4hs886bm0ls5wvmchrhqnaghj48m85g"; + rev = "2dd222d1ec7363fa0a0a7adb0d8eaf81bb7006dd"; + sha256 = "0ycjaal8b2rsg3zl3b7acv166vjfdvziiza3fs8nhfw0rx0xmm1m"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -463,11 +463,11 @@ let "foreign-object" = pkgs.stdenv.mkDerivation { name = "foreign-object"; - version = "v3.0.0"; + version = "v4.1.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-foreign-object.git"; - rev = "c9a7b7bb8bed1b87c5545c4ebe85a70f86c0e6b1"; - sha256 = "0accw6qd93qqry19rskjgl7y54xi2wd70rglbqyjx6c5ybcjnavr"; + rev = "9bfb4eb6271b151414594cfec669fb4b18b91bd1"; + sha256 = "1fr5hwzkan7yv2kbgvii2b8kanhjkqrbixcyj7kyv9fwkk8dk96a"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -475,11 +475,11 @@ let "fork" = pkgs.stdenv.mkDerivation { name = "fork"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-fork.git"; - rev = "153cc29e6e51fb1108368efc622d41d9f80bd707"; - sha256 = "1hyvaixza8151zbylk2kv859x48yyhla536lcjghcwd62vzfwmdn"; + rev = "a5c3bc6f357e97669e8c29c6f79f5f55be0d42c0"; + sha256 = "0yzh55vfrhrr660ni3sbbljypjirbka5jlks4zibqmhwrmy3wnj9"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -487,11 +487,11 @@ let "form-urlencoded" = pkgs.stdenv.mkDerivation { name = "form-urlencoded"; - version = "v6.0.2"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-form-urlencoded.git"; - rev = "860b2c4bf0a848322d2077faaefbeb98762cb8d6"; - sha256 = "1pi3vxix10crisisnd94li1vmmgiawlh5lgl51z7ssd9azygg0b0"; + rev = "e0e3eebc76f62f2594a0e823e8d6241ca00b2459"; + sha256 = "1ay946w7gkgqrxxv5qf28w83mh59r1q4j8kk6pndhripz9pby68w"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -499,11 +499,11 @@ let "formatters" = pkgs.stdenv.mkDerivation { name = "formatters"; - version = "v6.0.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-formatters.git"; - rev = "b2e65b2bccd09a3c17a396f07e13e5cdca90e4e4"; - sha256 = "02c43sv6ci2698mjkmvkv3cjv99ilxv8ii8x7n9wqf18r4hlmk0y"; + rev = "0b4deda4c6664209173e3e21b8fcbc6151a4549c"; + sha256 = "0z3w5qbfd8z8bakir3rwanq6dcf554f3apacxw5l2vxscvikyra3"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -511,11 +511,11 @@ let "free" = pkgs.stdenv.mkDerivation { name = "free"; - version = "v6.2.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-free.git"; - rev = "c185c0b2144ddfb2bc3ac2b345df32e33221b21d"; - sha256 = "10zsw49wzlzz78882b3grl19gpca5llpdk3ph608075h0ygk3q3k"; + rev = "e2d8fa8023a864363857834e11393483bced5e38"; + sha256 = "0gyy0k297m26gw76w7kx8k1zjczlqbqb3nmh2h4gb3r84gl05g6r"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -523,11 +523,11 @@ let "freet" = pkgs.stdenv.mkDerivation { name = "freet"; - version = "v6.0.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-freet.git"; - rev = "507c2edd9173cda5ad44dd0638133edd69fd9acd"; - sha256 = "0f5bibw604sd9ffmp51b3jppka88r54mh7sdz91zy5b92wgsy5yr"; + rev = "21be6fba22599a25812430dda6ba2ca8135920a1"; + sha256 = "006wbr7f19k7vs1jg4wgkwyx1q4wvvs2wqscfcxsp8fzfpn2yqw8"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -535,11 +535,11 @@ let "functions" = pkgs.stdenv.mkDerivation { name = "functions"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-functions.git"; - rev = "691b3345bc2feaf914e5299796c606b6a6bf9ca9"; - sha256 = "1gnk6xh5x04zcahn82gwp49qpglxd5jkfqn0i58m27jfihvblaxd"; + rev = "f626f20580483977c5b27a01aac6471e28aff367"; + sha256 = "1bsf2y8hx103a92yrc6m05q2dv51ckag1srd7q5n9vaf2k9byrj9"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -547,11 +547,11 @@ let "functors" = pkgs.stdenv.mkDerivation { name = "functors"; - version = "v4.1.1"; + version = "v5.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-functors.git"; - rev = "e936f7a8d2ec53a344c478ccada5add93273848c"; - sha256 = "0i1x14r54758s5jx5d7zy4l07mg6gabljadgybldnbpmdqk6b966"; + rev = "022ffd7a2a7ec12080314f3d217b400674a247b4"; + sha256 = "1pnw3r1nk0rx8mrw3ajjml40zvx9v26qrqwj77pz7hpwxigxfbff"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -559,11 +559,11 @@ let "gen" = pkgs.stdenv.mkDerivation { name = "gen"; - version = "v3.0.0"; + version = "v4.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-gen.git"; - rev = "85c369f56545a3de834b7e7475a56bc9193bb4b4"; - sha256 = "1h396rqn1fc2c155i58vnaksqjrpajly128ah6wq1w426vwr1vrf"; + rev = "9fbcc2a1261c32e30d79c5418edef4d96fe76931"; + sha256 = "0kajzcp9a8dmqvb3ga27hlf18m2smbp98a0bmzzb9vv156ckw0b4"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -571,11 +571,11 @@ let "heterogeneous" = pkgs.stdenv.mkDerivation { name = "heterogeneous"; - version = "v0.5.1"; + version = "v0.6.0"; src = pkgs.fetchgit { url = "https://github.com/natefaubion/purescript-heterogeneous.git"; - rev = "550445cf7932e158395423fc087cdc05bab41c40"; - sha256 = "08bpgm9p8ib1jzrmssqpa1bqqzfmba43lsih1xvr3pf1jfizayxg"; + rev = "5b7542bdd9547c5aef95b8878f103f0ce4ee1383"; + sha256 = "0ff1wjq2ayhy67ydggbb2qlzbhvmv1m1z8dcp48p9zhxiq9fpfsz"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -583,11 +583,11 @@ let "http-methods" = pkgs.stdenv.mkDerivation { name = "http-methods"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-http-methods.git"; - rev = "d373066a45017e886d1580cd359372368231de47"; - sha256 = "1g0ywd5zpckmhq28mr14yr4k28hiii1px8r8xbdx8nv45ryw69l3"; + rev = "99b48d54b978e4e6438d850015d59e57ac64824e"; + sha256 = "126x1cqr1769a3yzigpp8sp33n6s4fadai7w30mb2nk9dbxy0hw5"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -595,11 +595,11 @@ let "identity" = pkgs.stdenv.mkDerivation { name = "identity"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-identity.git"; - rev = "5c150ac5ee4fa6f145932f6322a1020463dae8e9"; - sha256 = "0a58y71ihvb5b7plnn2sxsbphqzd9nzfafak4d5a576agn76q0ql"; + rev = "ef6768f8a52ab0bc943a85f5761ba07c257f639f"; + sha256 = "1lh0pkwwdyd8q9bgf4l1m96gdnardki4r2s359cnhrwp94b43fyr"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -607,11 +607,11 @@ let "integers" = pkgs.stdenv.mkDerivation { name = "integers"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-integers.git"; - rev = "8a783f2d92596c43afca53066ac18eb389d15981"; - sha256 = "1rrygw0ai61brnvgap7dfhdzacyhg5439pz6yrmmyg32cvf0znhv"; + rev = "54d712b25c594833083d15dc9ff2418eb9c52822"; + sha256 = "04j9sqvkgyxxvbm8jfc2118wzmgswn8jva9fysgbsnmsg9vcxfm6"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -619,11 +619,11 @@ let "invariant" = pkgs.stdenv.mkDerivation { name = "invariant"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-invariant.git"; - rev = "c421b49dec7a1511073bb408a08bdd8c9d17d7b1"; - sha256 = "0vwkbh7kv00g50xjgvxc0mv5b99mrj6q0sxznxwk32hb9hkbhy5l"; + rev = "1d2a196d51e90623adb88496c2cfd759c6736894"; + sha256 = "07rqag47ykdiqc5yfbc1a64ijaqliljhcw1vgbv81m7ljzzd2xna"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -631,23 +631,11 @@ let "js-date" = pkgs.stdenv.mkDerivation { name = "js-date"; - version = "v7.0.0"; + version = "v8.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-js-date.git"; - rev = "a6834eef986e3af0490cb672dc4a8b4b089dcb15"; - sha256 = "1dpiwn65qww862ilpfbd06gwfazpxvz3jwvsjsdrcxqqfcbjp8n8"; - }; - phases = "installPhase"; - installPhase = "ln -s $src $out"; - }; - - "js-timers" = pkgs.stdenv.mkDerivation { - name = "js-timers"; - version = "v5.0.1"; - src = pkgs.fetchgit { - url = "https://github.com/purescript-contrib/purescript-js-timers.git"; - rev = "86afef13f457b9506acdfe88559ee18f1cd2c2d8"; - sha256 = "0008paz0qkz5n1pfrzagkkac6jny9z2rd1ij10ww2k1pkb9cy59z"; + rev = "1ea020316946cc4b87195bca9c54d0c16abaa490"; + sha256 = "03535g8hc4bzyzig25hf75dls9ypsgrdk2nc45h8zw4xyy4ha0gz"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -655,11 +643,11 @@ let "js-uri" = pkgs.stdenv.mkDerivation { name = "js-uri"; - version = "v2.0.0"; + version = "v3.1.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-js-uri.git"; - rev = "6145d5e631be3d57d8a4a9cf976ae140713dee35"; - sha256 = "1q34ir93cqbcl9g49vv1qfj8jxbbdj7f85a14y4mzd7yjq0a042g"; + rev = "06f7ae755ccb36bfa80bc3702533165af5c7ef06"; + sha256 = "0c9k1fpf4ljlqsnb07i3gwa6jiwlli0046pnglmk56ls53l6d4aj"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -679,11 +667,11 @@ let "lazy" = pkgs.stdenv.mkDerivation { name = "lazy"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-lazy.git"; - rev = "2f73f61e7ac1ae1cfe05564112e3313530e673ff"; - sha256 = "1wxfx019911gbkifq266hgn67zwm89pxhi83bai77mva5n9j3f6l"; + rev = "48347841226b27af5205a1a8ec71e27a93ce86fd"; + sha256 = "0dxlc3b2bdqsri45i7a9bvwvv0gg43cc1gq61zi41f290a29ny2q"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -691,11 +679,11 @@ let "lcg" = pkgs.stdenv.mkDerivation { name = "lcg"; - version = "v3.0.0"; + version = "v4.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-lcg.git"; - rev = "8fb2eb16bbba2cee1d115a6729659ac649da811b"; - sha256 = "04r9bmx9kc3jqx59hh9yqqkl95mf869la9as5h36jv85ynn464dx"; + rev = "67c6c6483a563a59ae036d9dca0f1be2835326a5"; + sha256 = "1shzn6zvc1cxd7v0bvfsk7x3xf59vxby8c5lfjvd746r6396zn65"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -703,11 +691,11 @@ let "lists" = pkgs.stdenv.mkDerivation { name = "lists"; - version = "v6.0.1"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-lists.git"; - rev = "6383c4f202b3f69474f9f7da182c2d42fcc3111c"; - sha256 = "0xmg918s3mqvfvwgjfqcs1yvcz6hy2n7h3ygqz2iyvk868gz25qs"; + rev = "b113451e5b41cad87d669a3165f955c71cd863e2"; + sha256 = "1mg7vy44k8jlqkri7x4ikciixx92b17wi35887x09dwdsicjf0sx"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -715,23 +703,11 @@ let "literals" = pkgs.stdenv.mkDerivation { name = "literals"; - version = "v0.2.0"; - src = pkgs.fetchgit { - url = "https://github.com/jvliwanag/purescript-literals.git"; - rev = "11457380e1b28c9526c41381eeb0ee840982db5c"; - sha256 = "1jjnpfmh9qfmffyrmcfnn9p25irmsmaji6lwrsrd2r9xdhpzmqg7"; - }; - phases = "installPhase"; - installPhase = "ln -s $src $out"; - }; - - "math" = pkgs.stdenv.mkDerivation { - name = "math"; - version = "v3.0.0"; + version = "v1.0.2"; src = pkgs.fetchgit { - url = "https://github.com/purescript/purescript-math.git"; - rev = "59746cc74e23fb1f04e09342884c5d1e3943a04f"; - sha256 = "0hkf0vyiga21992d9vbvdbnzdkvgljmsi497jjas1rk3vhblx8sq"; + url = "https://github.com/rowtype-yoga/purescript-literals.git"; + rev = "ae3ef4e9c1ae7c57ec77bd13906fa60ae8abba4a"; + sha256 = "1dvzi3qx6jbfw2g28wgbh1s9zv8z59wrf7r7jhib4g5ibgzq5r8q"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -739,11 +715,11 @@ let "maybe" = pkgs.stdenv.mkDerivation { name = "maybe"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-maybe.git"; - rev = "8e96ca0187208e78e8df6a464c281850e5c9400c"; - sha256 = "0vyk3r9gklvv7awzpph7ra53zxxbin1ngmqflb5vvr2365v5xyqy"; + rev = "c6f98ac1088766287106c5d9c8e30e7648d36786"; + sha256 = "0n33g8c579vcs06ii0r7f14jjdwzjw7p583w4nmrv9h442q2cvlz"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -751,11 +727,11 @@ let "medea" = pkgs.stdenv.mkDerivation { name = "medea"; - version = "8b215851959aa8bbf33e6708df6bd683c89d1a5a"; + version = "00981e4ce7249808413a6db8d88d849bbe85245a"; src = pkgs.fetchgit { - url = "https://github.com/juspay/medea-ps.git"; - rev = "8b215851959aa8bbf33e6708df6bd683c89d1a5a"; - sha256 = "05gnar9l1li0v1vv12kga0sssskfm4f1x9y6smpmqbqg9396pmsq"; + url = "https://github.com/errfrom/medea-ps.git"; + rev = "00981e4ce7249808413a6db8d88d849bbe85245a"; + sha256 = "0sxv9l53hqjx5n7gdnpr5ydxp0zr2wv0ikk2sc0ch9whq5rridcy"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -763,11 +739,11 @@ let "media-types" = pkgs.stdenv.mkDerivation { name = "media-types"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-media-types.git"; - rev = "b6efa4c1e6808b31f399d8030b5938acec87cb48"; - sha256 = "0l51nd1w52756pyy3zliwmhfbin0px4pxr7d2h5vchl1wq895fja"; + rev = "af853de226592f319a953637069a943dd261cba3"; + sha256 = "0bxpsd2yw3zg58ay649v3xld7n17n7j7n9y8l841cjih9bc7ccxx"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -775,11 +751,11 @@ let "mmorph" = pkgs.stdenv.mkDerivation { name = "mmorph"; - version = "v6.0.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/Thimoteus/purescript-mmorph.git"; - rev = "ebe16afbfa16dd600f3379ccedc7529417402393"; - sha256 = "0ds88hray8v0519n9k546qsc4qs8bj1k5h5az7nwfp0gaq0r5wpk"; + rev = "94bc558ac34184d5236a7a9b2463dcc7551ced8e"; + sha256 = "0m3m1kjy4i9lwzj8l5qlafxawyhbdxj035wa5ys4j8v4013a92xg"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -823,11 +799,11 @@ let "newtype" = pkgs.stdenv.mkDerivation { name = "newtype"; - version = "v4.0.0"; + version = "v5.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-newtype.git"; - rev = "7b292fcd2ac7c4a25d7a7a8d3387d0ee7de89b13"; - sha256 = "1fgzbxslckva2psn0sia30hfakx8xchz3wx2kkh3w8rr4nn2py8v"; + rev = "29d8e6dd77aec2c975c948364ec3faf26e14ee7b"; + sha256 = "0kfc644zn2f9rpx8fy4gjvmz04k9mv1c2xrqis8m3s0ydnhbffd7"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -835,11 +811,11 @@ let "noble-secp256k1" = pkgs.stdenv.mkDerivation { name = "noble-secp256k1"; - version = "710c15c48c5afae5e0623664d982a587ff2bd177"; + version = "9fc5db67e2b6e8b027c415e4dd1625c3f1d8b623"; src = pkgs.fetchgit { - url = "https://github.com/mlabs-haskell/purescript-noble-secp256k1.git"; - rev = "710c15c48c5afae5e0623664d982a587ff2bd177"; - sha256 = "014wapsgg6xa76i3f368aag4kps644g8qqqha9xbgyxmrhxsln6q"; + url = "https://github.com/errfrom/purescript-noble-secp256k1.git"; + rev = "9fc5db67e2b6e8b027c415e4dd1625c3f1d8b623"; + sha256 = "0n2q83n210ih5l54p6wrrjqmy40xhhdd3mam5mzixgr2hszm8969"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -847,11 +823,11 @@ let "node-buffer" = pkgs.stdenv.mkDerivation { name = "node-buffer"; - version = "v7.0.1"; + version = "v8.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-node-buffer.git"; - rev = "0721f1e8d768df48ae429547c8c60b121ca120cb"; - sha256 = "14bf3llsa20ivkwp5hlyk8v8zfzpzhhsni9pd8rfqdyzp6zrdx3b"; + rev = "7be7bd082b7d3e15de2ed5a626d43af746bdb35e"; + sha256 = "1l1j4ml0lyhnxs1zcy3jchlc0mbsn40g1pxyb4lv6slhp0qdhjhp"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -859,11 +835,11 @@ let "node-child-process" = pkgs.stdenv.mkDerivation { name = "node-child-process"; - version = "v7.1.0"; + version = "v9.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-node-child-process.git"; - rev = "5c4e560eceead04efc1d5a3ec1f6de91bb1d512e"; - sha256 = "18va367xims00hmjwiasiifdfak3cbs0sp4sr52ihb20n19n6h5b"; + rev = "ceaa5dcd21697da24a916b81c73ba013592cf378"; + sha256 = "1h93r8q0gpdp3vz89b9aazdr0dc99kyx0wx8xb1ap8v2img8xid1"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -871,11 +847,11 @@ let "node-fs" = pkgs.stdenv.mkDerivation { name = "node-fs"; - version = "v6.2.0"; + version = "v8.1.1"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-node-fs.git"; - rev = "3cb63cc55a02e506fe07d3940a50d6f0eb6ca2f2"; - sha256 = "1b89sxr6asxvgx59myhfbahiiz1z6sg2qfrm9bqd46h93ai8bhn1"; + rev = "a9da8b9860f8a1f67e38701f5cce72a0f2c3901d"; + sha256 = "0ywv0d8w2fbqnj9z1dxbm2a9na10g960b5gznjcf7d70gs22ixhj"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -883,11 +859,11 @@ let "node-fs-aff" = pkgs.stdenv.mkDerivation { name = "node-fs-aff"; - version = "v7.0.0"; + version = "v9.1.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-node-fs-aff.git"; - rev = "1da5d326573c3b17c6d4dba3d0e0157e60869f91"; - sha256 = "10aglq89gbchykwlckmg5xsln705qha76f125snkmk056kq2w89h"; + rev = "ac9b6fd272eb52c906b490be1c714423dd36a5bf"; + sha256 = "0mi91kd1b0ix8ygaaj5jspw0m53b8rv5mingrk2lvxhimsxa3f81"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -895,11 +871,11 @@ let "node-http" = pkgs.stdenv.mkDerivation { name = "node-http"; - version = "v6.0.0"; + version = "v8.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-node-http.git"; - rev = "48a4da07051f0cc9a9d08fbfe8179ebf55aff39a"; - sha256 = "1521ab70jx7a9d7kk4gn1sk4w6knfi13pai1kanhrvwp5lfys5wl"; + rev = "9baab9d9b45064e8cc1d53913bb1668bfa799b16"; + sha256 = "1bi7kwai15l4lqcnaq14mi906cppcjm3iqax4qq3vjihf68b66r4"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -907,11 +883,11 @@ let "node-net" = pkgs.stdenv.mkDerivation { name = "node-net"; - version = "v2.0.1"; + version = "v4.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-node-net.git"; - rev = "e25a2c538dfa524cd9b75bf12fd7a393efe2f7e9"; - sha256 = "17sx9r74kdjq85dafm5kisbvgdb0wn11lq9gaazpdirhshpm2wl5"; + rev = "812ce3142b67c33db225a0f94fabd6a6776bf0be"; + sha256 = "18z42zqinm357qzr8r7w7lwhjnmd2693ywqkb1ndjd2p3dz7x4zm"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -919,11 +895,11 @@ let "node-path" = pkgs.stdenv.mkDerivation { name = "node-path"; - version = "v4.0.0"; + version = "v5.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-node-path.git"; - rev = "a2d7cf05e40b607ef7d048a3684cda788cd42890"; - sha256 = "1384qyf4v84wbahafzvqdxjllqy8qkd5dpkhsl3js444vsm2aplr"; + rev = "d5f08cfde829b831408c4c6587cec83f2cd6a58e"; + sha256 = "1d38ipij4lb1nq8wkv7kmpk77z5ac0spfc89hfc9yn6jnscl6sky"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -931,11 +907,11 @@ let "node-process" = pkgs.stdenv.mkDerivation { name = "node-process"; - version = "v8.2.0"; + version = "v10.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-node-process.git"; - rev = "e1e807ac7831d1a8a15e242964f7e5005e42f76b"; - sha256 = "0nl9r271s8f71a9wqfkadq9b490h8phwgqc61jbzhm4ags23pqpg"; + rev = "9d126d9d4f898723e7cab69895770bbac0c3a0b8"; + sha256 = "07gcg33g56f74ph2bqmj5lysy752f6y31y7mkrgd2m0jzi7wknn3"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -943,11 +919,11 @@ let "node-readline" = pkgs.stdenv.mkDerivation { name = "node-readline"; - version = "v5.0.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-node-readline.git"; - rev = "c59deb30c7ff5cc91d6b062120c5a3979bd4ccff"; - sha256 = "0c299bvkhrdbij88fxb75sdm7bl4wpgv9fz7wsj0hw6gkxmplpj9"; + rev = "fbe80a949275f15643b80f9db7c01d5a6b4031ed"; + sha256 = "1gxldf016w8xjm6jj95mshglgb4gcs9scxfr5ckxry1rzk6fzz1d"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -955,11 +931,11 @@ let "node-streams" = pkgs.stdenv.mkDerivation { name = "node-streams"; - version = "v5.0.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-node-streams.git"; - rev = "886bb2045685e3b9031687d69ccfed29972147bb"; - sha256 = "1jc3d4x0v77h8qcwq7hpwprsdr3gqmdfiyr1ph0kiy7r9bbrqwfx"; + rev = "8395652f9f347101fe042f58726edc592ae5086c"; + sha256 = "1cgkh3dwnhv90r7dak3x4dq698gh30ghfxncrw0ngwrv5pismn0x"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -967,11 +943,11 @@ let "node-url" = pkgs.stdenv.mkDerivation { name = "node-url"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-node-url.git"; - rev = "d5671f5e38051f4fa7acacd9ec157ed9dc6ded46"; - sha256 = "0w78q23vxa2nldy0dfj4nb5kv0pcrc1yq7dp1mysz7cdi9f72zp9"; + rev = "de7b279df13a9eeef2455af561525f37568c190e"; + sha256 = "14qkni1138jn02s8hpchc0i73n7brj1j9d3gwc8kh1wz1ddhjypw"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -979,11 +955,11 @@ let "nonempty" = pkgs.stdenv.mkDerivation { name = "nonempty"; - version = "v6.1.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-nonempty.git"; - rev = "7696eaf915da5333173bca7d779a51f91a525b83"; - sha256 = "0hhhw5x5xvs2bd9373gklja1545glnzi1xc2sj16kkznnayrmvsn"; + rev = "28150ecc7419238b187abd609a92a645273348bb"; + sha256 = "1mwdc2sny2ygp67kyk7h2493vq7syf7j18s3d9a5gwf1y7jlf7gh"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -991,11 +967,11 @@ let "now" = pkgs.stdenv.mkDerivation { name = "now"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-now.git"; - rev = "4c994dae8bb650787de1e4d9e709f2565fb354fb"; - sha256 = "1wa4j2h5rlw1lgfpm7rif3v6ksm8lplxl1x69zpk8hdf0cfyz4qm"; + rev = "b5ffed2381e5fefc063f484e607e8499e79eaf32"; + sha256 = "01khmqs4iz7dhlvd43zxj19q0c0vvqf1m128vgvgxz5mv430zfgr"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1003,11 +979,11 @@ let "nullable" = pkgs.stdenv.mkDerivation { name = "nullable"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-nullable.git"; - rev = "8b19c16b16593102ae5d5d9f5b42eea0e213e2f5"; - sha256 = "0jbmks8kwhpb5fr2b9nb70fjwh6zdnwirycvzr77jafcny24yrnl"; + rev = "3202744c6c65e8d1fbba7f4256a1c482078e7fb5"; + sha256 = "10s3b54pjmr2rxlyzvc8yc99k1dpn0qrijnc4y65yj5z6bxf2791"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1015,11 +991,11 @@ let "numbers" = pkgs.stdenv.mkDerivation { name = "numbers"; - version = "v8.0.0"; + version = "v9.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-numbers.git"; - rev = "f5bbd96cbed58403c4445bd4c73df50fc8d86f46"; - sha256 = "00pm2x4kh4fm91r7nmik1v5jclkgh7gpxz13ambyqxbxbiqjq0vg"; + rev = "2a53528f18f9415334bae28e7bb3cf3be86342c2"; + sha256 = "1h4v6ir1hq6gvkk0kla38vlcd6bv73xkc8pv71jygwqxrdwfxxgw"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1039,11 +1015,11 @@ let "options" = pkgs.stdenv.mkDerivation { name = "options"; - version = "v6.0.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-options.git"; - rev = "0309a42692251ce5e3d1d0be57d4f63f7143f858"; - sha256 = "04f70wfik1pi6nzfq2cn3la9z735akkadpx5cxbs4mx8xg032sjd"; + rev = "93e4eb4610975cb7b3bb290273396707e7384c38"; + sha256 = "1c8qkln40i1sf2lz8c6wn4ijj7jmfgzmgsrn9ax7m4ix9c05r5sq"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1051,11 +1027,11 @@ let "optparse" = pkgs.stdenv.mkDerivation { name = "optparse"; - version = "v4.1.0"; + version = "v5.0.0"; src = pkgs.fetchgit { url = "https://github.com/f-o-a-m/purescript-optparse.git"; - rev = "04f2ed818f32390a9feff04b892f23c96ccb84cb"; - sha256 = "0b05wczcjnann0xw6vdaq2c1a2n9rcgvq9l29wa5461b5mvjyb80"; + rev = "dbc4c385e6c436eed4299ae2c0bb2cc278cf2410"; + sha256 = "05sd1ziz6rx1k0wz1nnhfnl1gz3s6qld3whkkjz8lilrvycxxn47"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1063,11 +1039,11 @@ let "ordered-collections" = pkgs.stdenv.mkDerivation { name = "ordered-collections"; - version = "v2.0.2"; + version = "v3.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-ordered-collections.git"; - rev = "1929b706b07e251995b6be51baa7995c61eb4d83"; - sha256 = "0g57043ylj3kldkm5vn233yd6hiamryhdfh72cxx9h3mn0ra8ghd"; + rev = "9826b7632d0d0a691173bde308a634195f42a419"; + sha256 = "1wk8mcn1zsxi0yk9ybas2v7m0drb492806gld1xxxic8x1i19ws0"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1075,11 +1051,11 @@ let "orders" = pkgs.stdenv.mkDerivation { name = "orders"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-orders.git"; - rev = "c25b7075426cf82bcb960495f28d2541c9a75510"; - sha256 = "0wwy3ycjll0s590ra35zf5gjvs86w97rln09bj428axhg7cvfl0a"; + rev = "f86db621ec5eef1274145f8b1fd8ebbfe0ed4a2c"; + sha256 = "14fjls3v14ia6fr2w4p0i5dqv10zk343wg28m4c77a17jmvbs9r4"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1087,11 +1063,11 @@ let "parallel" = pkgs.stdenv.mkDerivation { name = "parallel"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-parallel.git"; - rev = "16b38a2e148639b04ae67e0ce63cc220da8857f7"; - sha256 = "0x8mvhgs8ygqj34xgyhk6gixqm32p2ymm00zg0zdw13g3lil9p4x"; + rev = "85290dca837771ac4870071008c933d315ef678f"; + sha256 = "0bpwvzq4dn7vx5mfj12w1zvvnamc6w2c45c2v54b9yw36snnwpcf"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1099,11 +1075,11 @@ let "parsing" = pkgs.stdenv.mkDerivation { name = "parsing"; - version = "v7.0.1"; + version = "v10.2.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-parsing.git"; - rev = "a3e82c26ce2c74b5fa38ff7814d7c35bf9233af5"; - sha256 = "15yx51khg3niqiryc6qdii6lwdvni77ak7dkbf9w5zw4h1y51p9a"; + rev = "6dc1e9cab195f4af3394b48c508b4794328edeac"; + sha256 = "1i2idq5l7vanxrd8k6yg4fjp6l3cigrq266qyjs07ri5cc4k8879"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1111,11 +1087,11 @@ let "partial" = pkgs.stdenv.mkDerivation { name = "partial"; - version = "v3.0.0"; + version = "v4.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-partial.git"; - rev = "2f0a5239efab68179a684603263bcec8f1489b08"; - sha256 = "0acxf686hvaj793hyb7kfn9lf96kv3nk0lls2p9j095ylp55sldb"; + rev = "0fa0646f5ea1ec5f0c46dcbd770c705a6c9ad3ec"; + sha256 = "04s1h0r3slyd8kcamhqqrr6piksl9y76nmf2418j0ifhp16qwxmm"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1123,11 +1099,11 @@ let "pipes" = pkgs.stdenv.mkDerivation { name = "pipes"; - version = "v7.0.1"; + version = "v8.0.0"; src = pkgs.fetchgit { url = "https://github.com/felixschl/purescript-pipes.git"; - rev = "42e43f0961ad0fc3f1cef6986fe23ca9f48f6dda"; - sha256 = "0jzgzi34wqqdcfgznbpfv4b8al2prd36yshnndlvkqfv70smx3kh"; + rev = "e3bdc0b0db0a67e89a717b6118b23e78a380e23f"; + sha256 = "1jz3bfbl8b0hgbcm9y98bv2z29b072v1k8snp19vb2xql1zd40sx"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1135,11 +1111,11 @@ let "posix-types" = pkgs.stdenv.mkDerivation { name = "posix-types"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-node/purescript-posix-types.git"; - rev = "e562680fce64b67e26741a61a51160a04fd3e7fb"; - sha256 = "1knhdnnmxx77qsjz3gk1ga7n713l303dxyn8zs46qh7p2hnkalkc"; + rev = "b79ff37f87846ca5caab2123cf84148e700d40d1"; + sha256 = "1zcm2hikfigh5fbwg12c61gvvjhmwgy6fplfcm6bc5aqb7w3czll"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1147,11 +1123,11 @@ let "prelude" = pkgs.stdenv.mkDerivation { name = "prelude"; - version = "v5.0.1"; + version = "v6.0.1"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-prelude.git"; - rev = "68f8012bc2309d9bf5832cdf7316ad052d586905"; - sha256 = "1x0cacvv9mmw80vy6f40y0p959q1dz28fwjswhyd7ws6npbklcy0"; + rev = "f4cad0ae8106185c9ab407f43cf9abf05c256af4"; + sha256 = "0j6mb9w728ifcp10jdv7l9k7k5pw8j1f0fa7xyb8xmbxzc59xqpy"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1159,11 +1135,11 @@ let "profunctor" = pkgs.stdenv.mkDerivation { name = "profunctor"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-profunctor.git"; - rev = "4551b8e437a00268cc9b687cbe691d75e812e82b"; - sha256 = "0fvd2xiv77sp4jd4spgdp4i9812p6pdzzbg4pa96mbr0h19jf39c"; + rev = "0a966a14e7b0c827d44657dc1710cdc712d2e034"; + sha256 = "07rhk8micbc74my6s53xbj2smvvwah2w1drqrcmcnncxdks3lqg3"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1171,11 +1147,11 @@ let "profunctor-lenses" = pkgs.stdenv.mkDerivation { name = "profunctor-lenses"; - version = "v7.0.1"; + version = "v8.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-profunctor-lenses.git"; - rev = "9c3d87a6dab8eb785a93bff11aa183796dc93183"; - sha256 = "1wknj7g6vwk2ga1rq57l470h322308ddjn5bd3x2hhfkiy039kc3"; + rev = "973d567afe458fd802cf4f0d9725b6dc35ad9297"; + sha256 = "0axz7nznn12iqh6sn9qjg6i8qglpdsqgkp30ndwdj98czcnbnybv"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1195,11 +1171,11 @@ let "psci-support" = pkgs.stdenv.mkDerivation { name = "psci-support"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-psci-support.git"; - rev = "f26fe8266a63494080476333e22f971404ea8846"; - sha256 = "16vhf8hapd7rcgmafmjpiq7smhzdh3300f2idk1q4kk01yxn8ddj"; + rev = "897cdb543548cb6078d69b6413b54841404eda72"; + sha256 = "1ix53r8avkn3fw72mngwzw7v6c6mv7j4miw5mrgjrh9hb8p2ydl1"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1207,11 +1183,11 @@ let "purescript-toppokki" = pkgs.stdenv.mkDerivation { name = "purescript-toppokki"; - version = "6983e07bf0aa55ab779bcef12df3df339a2b5bd9"; + version = "b043e9342463df76972d05981ac4ec25316834bf"; src = pkgs.fetchgit { - url = "https://github.com/firefrorefiddle/purescript-toppokki"; - rev = "6983e07bf0aa55ab779bcef12df3df339a2b5bd9"; - sha256 = "01arx2sp2k287cr4y96frnn6jlghcias9hwdr27yr28k4xa5bhfv"; + url = "https://github.com/errfrom/purescript-toppokki"; + rev = "b043e9342463df76972d05981ac4ec25316834bf"; + sha256 = "0kkk4xfnkq6fqr30d95i3x4r6z9479bx7v0ama7xf36pr0y26lk1"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1219,11 +1195,11 @@ let "quickcheck" = pkgs.stdenv.mkDerivation { name = "quickcheck"; - version = "v7.1.0"; + version = "v8.0.1"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-quickcheck.git"; - rev = "990fa1cf14b48b827d9b2d115b1c6977c4b0a76d"; - sha256 = "1dxchng3r2mad0505a0c7cc35vs1f7y2xb5i13p59jpdz6ijqa9k"; + rev = "bf5029f97e6c0d7552d3a08d2ab793a19e2c5e3d"; + sha256 = "142dvh57fl8b6i7mm37a38v7vkc1znbqz6l6wqa704m53hkikvyd"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1243,11 +1219,11 @@ let "quickcheck-laws" = pkgs.stdenv.mkDerivation { name = "quickcheck-laws"; - version = "v6.0.1"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-quickcheck-laws.git"; - rev = "464597522e5e001adc2619676584871f423b9ea0"; - sha256 = "1m397bh2w5a0wvms8rjgfxh71m7krmfkgk11j5krhz86b72k3izd"; + rev = "04f00fb78d88f38a2f2bb73b75f97ce5bf5624fc"; + sha256 = "0izp71wq253k9wih2hspfs4p1s36yins2a5mh13yl57pf1srbrky"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1255,11 +1231,11 @@ let "random" = pkgs.stdenv.mkDerivation { name = "random"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-random.git"; - rev = "3e02da113c7afbac37ea4e16188c39d3057314d5"; - sha256 = "1v6ykgp8jmx488hq8mgb0l0sf1nyhjs6wq0w279iyibk9jxc6nib"; + rev = "9540bc965a9596da02fefd9949418bb19c92533a"; + sha256 = "0qz14qviz5053j9h1jwpk0gnn692hcdx6fp90wckzrnw31d53174"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1267,11 +1243,11 @@ let "rationals" = pkgs.stdenv.mkDerivation { name = "rationals"; - version = "v5.0.0"; + version = "v5.0.1"; src = pkgs.fetchgit { - url = "https://github.com/anttih/purescript-rationals.git"; - rev = "8c52d8cc891d1223150a31416220aa9b99404442"; - sha256 = "1idvjvvx5kwmi8kj2ps95bcvlsgij1xgin4jfw3rmcqd930wqq6q"; + url = "https://github.com/purescript-contrib/purescript-rationals.git"; + rev = "b480bc41dbfc926977ebdf4e2a4b9fed253c91a1"; + sha256 = "06fczcfc937iwpj4r8qhprgw35ryn0hfqgjxmn2rcljx37q70xka"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1279,11 +1255,11 @@ let "record" = pkgs.stdenv.mkDerivation { name = "record"; - version = "v3.0.0"; + version = "v4.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-record.git"; - rev = "091495d61fcaa9d8d8232e7b800f403a3165a38f"; - sha256 = "0yidfvwiajiv8xflfsi2p8dqnp0qmmcz9jry58jyn9ga82z2pqn6"; + rev = "c89cd1ada6b636692571fc374196b1c39c4c9f70"; + sha256 = "1g7s2h1as5cz824wpm0jhjprrh66shha5i4gq37q73yw0s5p2ahm"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1291,11 +1267,11 @@ let "refs" = pkgs.stdenv.mkDerivation { name = "refs"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-refs.git"; - rev = "f66d3cdf6a6bf4510e5181b3fac215054d8f1e2e"; - sha256 = "1jhc2v784jy8bvkqy4zsh2z7pnqrhwa8n5kx98xhxx73n1bf38sg"; + rev = "f8e6216da4cb9309fde1f20cd6f69ac3a3b7f9e8"; + sha256 = "09bvfxhjfwfwv55py45s71maazwrr68k0rk4v8ynfqv91h34319h"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1303,11 +1279,11 @@ let "safe-coerce" = pkgs.stdenv.mkDerivation { name = "safe-coerce"; - version = "v1.0.0"; + version = "v2.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-safe-coerce.git"; - rev = "e719defd227d932da067a1f0d62a60b3d3ff3637"; - sha256 = "0m942lc23317izspz1sxw957mwl9yb9bgk8dh23f7b3a8w9hh8ff"; + rev = "7fa799ae80a38b8d948efcb52608e58e198b3da7"; + sha256 = "00m4l733gpl0153cbl6n5kly7jr8ids399apza2rbczif40brp9g"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1327,11 +1303,11 @@ let "sequences" = pkgs.stdenv.mkDerivation { name = "sequences"; - version = "v3.0.2"; + version = "cae456c1a7463785ad33981a93e7a9cb5fc7872c"; src = pkgs.fetchgit { - url = "https://github.com/hdgarrood/purescript-sequences"; - rev = "1f1d828ef30070569c812d0af23eb7253bb1e990"; - sha256 = "0mc0jjs1119c2nyd08yhdmliq3s47lhrdknhziga3lnbzja889k4"; + url = "https://github.com/garganscript/purescript-sequences"; + rev = "cae456c1a7463785ad33981a93e7a9cb5fc7872c"; + sha256 = "0dimbcmj7f4mbxq3yq591spizib60iir9igjzb6lbydir7kc6934"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1339,11 +1315,11 @@ let "spec" = pkgs.stdenv.mkDerivation { name = "spec"; - version = "v5.0.1"; + version = "v7.2.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-spec/purescript-spec.git"; - rev = "2cfa11573dbb695c117efce0a8f76a3daba12e87"; - sha256 = "0hpca1sa738029ww74zpw31br5x339q35kzb10iqd55lp6611k80"; + rev = "1ae536c4d9848d26087fe5e0606409740aa421b7"; + sha256 = "1vyk0fn39qfwx4i7vanazr5v0q0w0sxsxzmlliwlpcb9kvd1b2b3"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1351,11 +1327,11 @@ let "spec-quickcheck" = pkgs.stdenv.mkDerivation { name = "spec-quickcheck"; - version = "v4.0.0"; + version = "v5.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-spec/purescript-spec-quickcheck.git"; - rev = "c2991f475b8fa11de8b68bcb5895b36be04d1e82"; - sha256 = "01xcbfyqzax9c5najbfy12q0nvfklfm37llj2vkmi3wgkskg4prz"; + rev = "c83de337db1f74ff75e0d7c574a2f7407bc5f2b2"; + sha256 = "1y9rzb8kbahhchplswdxrjqm4qjkv1bnv9mzg8v62m1ipk3kdndj"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1363,11 +1339,11 @@ let "st" = pkgs.stdenv.mkDerivation { name = "st"; - version = "v5.0.1"; + version = "v6.2.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-st.git"; - rev = "994eb5e650f3caedac385dcc61694f691df57983"; - sha256 = "14hz254f1y0k3v83z719np0ddrgbca0hdsd9dvv244i07vlvm2zj"; + rev = "fc2fe2972bb12e6a2bd3b295baf01577240c23ac"; + sha256 = "17syc11gxhi1law4lskrr4swr62n4r7irj5imdyjjp8z0p5c6p8z"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1375,11 +1351,11 @@ let "strings" = pkgs.stdenv.mkDerivation { name = "strings"; - version = "v5.0.0"; + version = "v6.0.1"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-strings.git"; - rev = "157e372a23e4becd594d7e7bff6f372a6f63dd82"; - sha256 = "0hyaa4d8gyyvac2nxnwqkn2rvi5vax4bi4yv10mpk7rgb8rv7mb8"; + rev = "3d3e2f7197d4f7aacb15e854ee9a645489555fff"; + sha256 = "1dx6l4j4yw6w6nxa687gf04q4caa99ccl4cp4q22nda6ghsz7yjl"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1387,11 +1363,11 @@ let "stringutils" = pkgs.stdenv.mkDerivation { name = "stringutils"; - version = "v0.0.11"; + version = "v0.0.12"; src = pkgs.fetchgit { url = "https://github.com/menelaos/purescript-stringutils.git"; - rev = "e149d04cd5bcc25222c1807f2e1edafb36b5f70e"; - sha256 = "1hbr936bvnm5iil4cfr9qhkbzd1i00yrxf5jd0rnny29df5wsq1w"; + rev = "51d92cacd8c8102fc4e6137b4f709a2b11ca5186"; + sha256 = "0wdmishvnlfw8r6b3ivzr8d7300cxg1m77qd74ip4c0gd4zqvhs4"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1399,23 +1375,11 @@ let "tailrec" = pkgs.stdenv.mkDerivation { name = "tailrec"; - version = "v5.0.1"; + version = "v6.1.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-tailrec.git"; - rev = "5fbf0ac05dc6ab1a228b2897630195eb7483b962"; - sha256 = "1jjl2q2hyhjcdxpamzr1cdlxhmq2bl170x5p3jajb9zgwkqx0x22"; - }; - phases = "installPhase"; - installPhase = "ln -s $src $out"; - }; - - "test-unit" = pkgs.stdenv.mkDerivation { - name = "test-unit"; - version = "v16.0.0"; - src = pkgs.fetchgit { - url = "https://github.com/bodil/purescript-test-unit.git"; - rev = "56d06897b621df5d2f619433d19ababb5bb8ebd1"; - sha256 = "0qz903phxkgrn7qdz1xi49bydkf5cbxssyb4xk029zi4lshb35mw"; + rev = "5661a10afbd4849bd2e45139ea567beb40b20f9f"; + sha256 = "0snhrvkpd429r0d0bzs0mxwwz3am9bpa1m9f5a9hpmyjjkl7gddw"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1423,11 +1387,11 @@ let "these" = pkgs.stdenv.mkDerivation { name = "these"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-these.git"; - rev = "38dcf86a9bd772091e1153f2f1c13223703599b7"; - sha256 = "0d6yg3lwgralh1kcm5cd4myyz66k9qzld61hc5dg3z92d96zbvlr"; + rev = "ad4de7d2bb9ce684a9dff5def6489630736985b8"; + sha256 = "1i73qz7pk11mbiymhfg21i3nq92hqjmqzj4gjp1n6l2zkm0lmql3"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1435,11 +1399,11 @@ let "transformers" = pkgs.stdenv.mkDerivation { name = "transformers"; - version = "v5.2.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-transformers.git"; - rev = "1e5d4193b38c613c97ea1ebdb721c6b94cd8c50a"; - sha256 = "0lggimnq016v98ib6h68gnciraambxrfqm2s033wm34srcy8xs06"; + rev = "be72ab52357d9a665cbf93d73ba1c07c4b0957ee"; + sha256 = "0ijrdsppl8vx0rlbwc9p0vjbmvwlcy4ia7xymvk6y34zbxzjlzm6"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1447,11 +1411,11 @@ let "tuples" = pkgs.stdenv.mkDerivation { name = "tuples"; - version = "v6.0.1"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-tuples.git"; - rev = "d4fe8ffe9e8c512111ee0bc18a6ba0fd056a6773"; - sha256 = "0s2ar2gih4r34km8r8dqngh21s8899yb93mb7mips08ndy3ajq3a"; + rev = "4f52da2729b448c8564369378f1232d8d2dc1d8b"; + sha256 = "1m1ng0xxicb73945jymcl1hn2y2hmynlnmhb2k0kkn1jrjwgcc3d"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1459,11 +1423,11 @@ let "type-equality" = pkgs.stdenv.mkDerivation { name = "type-equality"; - version = "v4.0.0"; + version = "v4.0.1"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-type-equality.git"; - rev = "f7644468f22ed267a15d398173d234fa6f45e2e0"; - sha256 = "126pg4zg3bsrn8dzvv75xp586nznxyswzgjlr7cag3ij3j1z0kl0"; + rev = "0525b7d39e0fbd81b4209518139fb8ab02695774"; + sha256 = "1ass38jdycsjisdimdc4drg2w8vkkwp6lkvz3kvy7q0h98vdmlbr"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1483,11 +1447,11 @@ let "typelevel-prelude" = pkgs.stdenv.mkDerivation { name = "typelevel-prelude"; - version = "v6.0.0"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-typelevel-prelude.git"; - rev = "83ddcdb23d06c8d5ea6196596a70438f42cd4afd"; - sha256 = "1vwf3yhn8mir5y41wvlyszkgd5fxvrcyfd0l8cn20c8vfq36yzgk"; + rev = "dca2fe3c8cfd5527d4fe70c4bedfda30148405bf"; + sha256 = "0x86mrg33kpnrnsfp4p3c92j5lpyqzy87bxdynwf7smk3inqr2jc"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1495,23 +1459,11 @@ let "uint" = pkgs.stdenv.mkDerivation { name = "uint"; - version = "v6.0.3"; + version = "v7.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-uint.git"; - rev = "17fda2aff989ad7fa9f29171bf4c1196ca9ed504"; - sha256 = "1lwbkwc3yj0d5qmw7gni924wj47npgy1aqbc0ika4phc4q0shw8d"; - }; - phases = "installPhase"; - installPhase = "ln -s $src $out"; - }; - - "undefined" = pkgs.stdenv.mkDerivation { - name = "undefined"; - version = "v1.0.2"; - src = pkgs.fetchgit { - url = "https://github.com/bklaric/purescript-undefined.git"; - rev = "4012dc06b58feae301140bc081135d0f24c432b0"; - sha256 = "0kj504j3r9wr7m3yhm53bcfdzai0c2g99d2pdxlfinxk4pmixyrd"; + rev = "9e4f76ffd5192472f75583844172fe8ab3c0cb9f"; + sha256 = "173bhrd006q53s7agwyasxhfbr89x9jpz5b47vm2fr74l3jcw3lq"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1519,11 +1471,11 @@ let "unfoldable" = pkgs.stdenv.mkDerivation { name = "unfoldable"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-unfoldable.git"; - rev = "bbcc2b062b9b7d3d61f123cfb32cc8c7fb811aa6"; - sha256 = "1v3bz04wj6hj7s6mcf49hajylg6w58n78q54sqi2ra2zq8h99kpw"; + rev = "493dfe04ed590e20d8f69079df2f58486882748d"; + sha256 = "15z2k639ph8wdkrc2y838m5am1z7szw2vqymmv021skzisyn7zwf"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1531,11 +1483,11 @@ let "unicode" = pkgs.stdenv.mkDerivation { name = "unicode"; - version = "v5.0.1"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-contrib/purescript-unicode.git"; - rev = "2b66dcdb2ea533c7bc864574e860012c57ace2aa"; - sha256 = "0xh9wwyrl9nsw3h3wzalc1gaph39drj0i6k648cf9bnbb96nxa4z"; + rev = "6454d59d9e1fd1bc5a72e80e985d8282022a567a"; + sha256 = "0w2gsmqcy7pj5vd22qzpig20bdgzmbagyqxrg9mm1njjfsmcm8cv"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1543,11 +1495,11 @@ let "unordered-collections" = pkgs.stdenv.mkDerivation { name = "unordered-collections"; - version = "v2.1.4"; + version = "v3.0.1"; src = pkgs.fetchgit { url = "https://github.com/fehrenbach/purescript-unordered-collections.git"; - rev = "1be289188cef093520098e318ec910cf3ea5b40d"; - sha256 = "0vgfpdymxvgqf3sh8ji2w2b01w3s294v5mh04046s21qaywdi1jh"; + rev = "0192d2c9d0759895b7492cc00651631eb9abc5b5"; + sha256 = "0b60isac4wzakd3hh57wkdm9b5kawbis8v8ymli6b4m13673pvxw"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1555,11 +1507,11 @@ let "unsafe-coerce" = pkgs.stdenv.mkDerivation { name = "unsafe-coerce"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript/purescript-unsafe-coerce.git"; - rev = "ee24f0d3b94bf925d9c50fcc2b449579580178c0"; - sha256 = "0l2agnm1k910v4yp1hz19wrsrywsr5scb397762y7pigm3frzs8r"; + rev = "ab956f82e66e633f647fb3098e8ddd3ec58d689f"; + sha256 = "0r6d3dx8jalfzvrvkagz9v05yxwkkhgbzlpswg4w1cyl03zjcla4"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1567,11 +1519,11 @@ let "untagged-union" = pkgs.stdenv.mkDerivation { name = "untagged-union"; - version = "v0.3.0"; + version = "v1.0.0"; src = pkgs.fetchgit { - url = "https://github.com/jvliwanag/purescript-untagged-union.git"; - rev = "364e172e759ebe722bd7ec12a599d532b527c0ef"; - sha256 = "06013431acz8xry9dish8p2qyj18bi505fgfikpjiblxgjazl9zx"; + url = "https://github.com/rowtype-yoga/purescript-untagged-union.git"; + rev = "ed8262a966e15e751322c327e2759a9b9c0ef3f3"; + sha256 = "163blv01abd3dhcpqz499851lhwnmb4dlfbzkr3cs53d30w3yldx"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1579,11 +1531,11 @@ let "variant" = pkgs.stdenv.mkDerivation { name = "variant"; - version = "v7.0.3"; + version = "v8.0.0"; src = pkgs.fetchgit { url = "https://github.com/natefaubion/purescript-variant.git"; - rev = "3f12411ede5edd342d25340c1babce9ae81d6793"; - sha256 = "1q2pky3gf177ihy2zjzqvp1cj18ycaki9vm4ghw18p7hf256lqmc"; + rev = "8b2bd73a4202257d80a955c4dd36f6055f149823"; + sha256 = "18nyxnaqqg1zzydwd2hh9hbzr31j509g5yb1lnd0m60bma4l9h5g"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1591,11 +1543,11 @@ let "web-dom" = pkgs.stdenv.mkDerivation { name = "web-dom"; - version = "v5.0.0"; + version = "v6.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-web/purescript-web-dom.git"; - rev = "03dfc2f512e124615ab183ade357e3d54007c79d"; - sha256 = "06g9cp9fkzyfwbz5cs0wxjxgdydm9hy7756p2w4vx94myki20hgx"; + rev = "568a1ee158b29e6e739e7a9aaed3e35ca4c4305a"; + sha256 = "0angs86ld0h3ld889ag55lh62101dfn3fknyqrfv0imgn40vwm44"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1603,11 +1555,11 @@ let "web-events" = pkgs.stdenv.mkDerivation { name = "web-events"; - version = "v3.0.0"; + version = "v4.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-web/purescript-web-events.git"; - rev = "c8a50893f04f54e2a59be7f885d25caef3589c57"; - sha256 = "1dxwrl2r39vazb3g1ka4dkpy6idyi17aq4hf9vvdsmcwf2jjwbn9"; + rev = "2124356117be7b764a2f3948032255ac4dab7051"; + sha256 = "0l47gsgj71x0gjbhjqwsar2y44ljhq3xa0nkgr1qvqxmcm00llqf"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1615,11 +1567,11 @@ let "web-file" = pkgs.stdenv.mkDerivation { name = "web-file"; - version = "v3.0.0"; + version = "v4.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-web/purescript-web-file.git"; - rev = "3e42263b4392d82c0e379b7a481bbee9b38b1308"; - sha256 = "11x1inhr5pvs2iyg818cywwdskb33q777592sd3b4g4jyczcb1li"; + rev = "023786ae62bbb8bf58156dd7f02011fa38221ef1"; + sha256 = "1wjf1m5y2qsba83is297icv9zyl7jilxdga0192mm1rp0j16jjln"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1627,11 +1579,11 @@ let "web-html" = pkgs.stdenv.mkDerivation { name = "web-html"; - version = "v3.2.0"; + version = "v4.1.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-web/purescript-web-html.git"; - rev = "3a249b966ee72c19874b4a2ec6db4059087500e4"; - sha256 = "1ds26vwyba0chhpa09m938brw9q8pxjk6z1n3d4nc30hvdkrjnbh"; + rev = "40e9a0c5c927e4d9f7ba7c1204e4792f4d24cc27"; + sha256 = "0ifvk7swjn58nbk19pi4f19r247d67zhl5xgvcwb56vlmrk2pk83"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1639,11 +1591,11 @@ let "web-storage" = pkgs.stdenv.mkDerivation { name = "web-storage"; - version = "v4.0.0"; + version = "v5.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-web/purescript-web-storage.git"; - rev = "22fa56bac204c708e521e746ad4ca2b5810f62c5"; - sha256 = "1viy027k9qyr7mckqkvizwbwkfskc6frppsa1v9a0hq6gc08mpjx"; + rev = "6b74461e136755db70c271dc898d51776363d7e2"; + sha256 = "0q1grh8cp6h1szsqg3xmwlzrc1bbz8yzlwxlcl1iym5mjiyzgkcs"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1651,11 +1603,11 @@ let "web-xhr" = pkgs.stdenv.mkDerivation { name = "web-xhr"; - version = "v4.1.0"; + version = "v5.0.0"; src = pkgs.fetchgit { url = "https://github.com/purescript-web/purescript-web-xhr.git"; - rev = "997b87caa6dcdf66b6db22f29f522d722559956b"; - sha256 = "0hzmqga8l24l20kyd98bcpd8bmz7by14vl311m9yfdg5mjkjg42g"; + rev = "476122fe3ad19031aeb69186209b480e2fc9ef25"; + sha256 = "1swpprc000gfqid6r05pxs8wvlc5xjry5s2kk8lk3ah2dgv297sf"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; diff --git a/templates/ctl-scaffold/spago.dhall b/templates/ctl-scaffold/spago.dhall index 38fe179f53..d56a902bcb 100644 --- a/templates/ctl-scaffold/spago.dhall +++ b/templates/ctl-scaffold/spago.dhall @@ -15,7 +15,6 @@ You can edit this file as you like. , "posix-types" , "prelude" , "spec" - , "uint" ] , packages = ./packages.dhall , sources = [ "src/**/*.purs", "exe/**/*.purs", "test/**/*.purs" ] From 5a80b60131647e5520c6091b0a90e0a96e52ee9b Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Fri, 7 Jul 2023 13:54:23 +0200 Subject: [PATCH 29/85] build: update dependencies --- packages.dhall | 10 +++++----- spago-packages.nix | 12 ++++++------ templates/ctl-scaffold/packages.dhall | 10 +++++----- templates/ctl-scaffold/spago-packages.nix | 12 ++++++------ 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/packages.dhall b/packages.dhall index e937395da1..d1a236ec9f 100644 --- a/packages.dhall +++ b/packages.dhall @@ -145,8 +145,8 @@ let additions = , "uint" , "untagged-union" ] - , repo = "https://github.com/errfrom/purescript-aeson.git" - , version = "f092a1fc9b0ecc2445accf5bf0aad10e6eade89b" + , repo = "https://github.com/mlabs-haskell/purescript-aeson.git" + , version = "97d6d06e29c466542c0d3c7893a24325d07913db" } , bignumber = { dependencies = @@ -256,7 +256,7 @@ let additions = , "node-buffer" , "node-fs-aff" ] - , repo = "https://github.com/errfrom/purescript-toppokki" + , repo = "https://github.com/mlabs-haskell/purescript-toppokki" , version = "b043e9342463df76972d05981ac4ec25316834bf" } , noble-secp256k1 = @@ -270,8 +270,8 @@ let additions = , "unsafe-coerce" ] , repo = - "https://github.com/errfrom/purescript-noble-secp256k1.git" - , version = "9fc5db67e2b6e8b027c415e4dd1625c3f1d8b623" + "https://github.com/mlabs-haskell/purescript-noble-secp256k1.git" + , version = "a3c0f67e9fdb0086016d7aebfad35d09a08b4ecd" } } diff --git a/spago-packages.nix b/spago-packages.nix index 71f297fae2..f1f6fc68c1 100644 --- a/spago-packages.nix +++ b/spago-packages.nix @@ -7,10 +7,10 @@ let "aeson" = pkgs.stdenv.mkDerivation { name = "aeson"; - version = "f092a1fc9b0ecc2445accf5bf0aad10e6eade89b"; + version = "97d6d06e29c466542c0d3c7893a24325d07913db"; src = pkgs.fetchgit { - url = "https://github.com/errfrom/purescript-aeson.git"; - rev = "f092a1fc9b0ecc2445accf5bf0aad10e6eade89b"; + url = "https://github.com/mlabs-haskell/purescript-aeson.git"; + rev = "97d6d06e29c466542c0d3c7893a24325d07913db"; sha256 = "057cndwgcl8y8qh2afw3210hqcizr1ccsx1zkygn3bs2gpyx7h3q"; }; phases = "installPhase"; @@ -799,10 +799,10 @@ let "noble-secp256k1" = pkgs.stdenv.mkDerivation { name = "noble-secp256k1"; - version = "9fc5db67e2b6e8b027c415e4dd1625c3f1d8b623"; + version = "a3c0f67e9fdb0086016d7aebfad35d09a08b4ecd"; src = pkgs.fetchgit { - url = "https://github.com/errfrom/purescript-noble-secp256k1.git"; - rev = "9fc5db67e2b6e8b027c415e4dd1625c3f1d8b623"; + url = "https://github.com/mlabs-haskell/purescript-noble-secp256k1.git"; + rev = "a3c0f67e9fdb0086016d7aebfad35d09a08b4ecd"; sha256 = "0n2q83n210ih5l54p6wrrjqmy40xhhdd3mam5mzixgr2hszm8969"; }; phases = "installPhase"; diff --git a/templates/ctl-scaffold/packages.dhall b/templates/ctl-scaffold/packages.dhall index 4d54f6f7db..6628cfb538 100644 --- a/templates/ctl-scaffold/packages.dhall +++ b/templates/ctl-scaffold/packages.dhall @@ -145,8 +145,8 @@ let additions = , "uint" , "untagged-union" ] - , repo = "https://github.com/errfrom/purescript-aeson.git" - , version = "f092a1fc9b0ecc2445accf5bf0aad10e6eade89b" + , repo = "https://github.com/mlabs-haskell/purescript-aeson.git" + , version = "97d6d06e29c466542c0d3c7893a24325d07913db" } , sequences = { dependencies = @@ -241,7 +241,7 @@ let additions = , "node-buffer" , "node-fs-aff" ] - , repo = "https://github.com/errfrom/purescript-toppokki" + , repo = "https://github.com/mlabs-haskell/purescript-toppokki" , version = "b043e9342463df76972d05981ac4ec25316834bf" } , bignumber = @@ -365,8 +365,8 @@ let additions = , "unsafe-coerce" ] , repo = - "https://github.com/errfrom/purescript-noble-secp256k1.git" - , version = "9fc5db67e2b6e8b027c415e4dd1625c3f1d8b623" + "https://github.com/mlabs-haskell/purescript-noble-secp256k1.git" + , version = "a3c0f67e9fdb0086016d7aebfad35d09a08b4ecd" } } diff --git a/templates/ctl-scaffold/spago-packages.nix b/templates/ctl-scaffold/spago-packages.nix index ac96e1e3e8..388e048631 100644 --- a/templates/ctl-scaffold/spago-packages.nix +++ b/templates/ctl-scaffold/spago-packages.nix @@ -7,10 +7,10 @@ let "aeson" = pkgs.stdenv.mkDerivation { name = "aeson"; - version = "f092a1fc9b0ecc2445accf5bf0aad10e6eade89b"; + version = "97d6d06e29c466542c0d3c7893a24325d07913db"; src = pkgs.fetchgit { - url = "https://github.com/errfrom/purescript-aeson.git"; - rev = "f092a1fc9b0ecc2445accf5bf0aad10e6eade89b"; + url = "https://github.com/mlabs-haskell/purescript-aeson.git"; + rev = "97d6d06e29c466542c0d3c7893a24325d07913db"; sha256 = "057cndwgcl8y8qh2afw3210hqcizr1ccsx1zkygn3bs2gpyx7h3q"; }; phases = "installPhase"; @@ -811,10 +811,10 @@ let "noble-secp256k1" = pkgs.stdenv.mkDerivation { name = "noble-secp256k1"; - version = "9fc5db67e2b6e8b027c415e4dd1625c3f1d8b623"; + version = "a3c0f67e9fdb0086016d7aebfad35d09a08b4ecd"; src = pkgs.fetchgit { - url = "https://github.com/errfrom/purescript-noble-secp256k1.git"; - rev = "9fc5db67e2b6e8b027c415e4dd1625c3f1d8b623"; + url = "https://github.com/mlabs-haskell/purescript-noble-secp256k1.git"; + rev = "a3c0f67e9fdb0086016d7aebfad35d09a08b4ecd"; sha256 = "0n2q83n210ih5l54p6wrrjqmy40xhhdd3mam5mzixgr2hszm8969"; }; phases = "installPhase"; From e5c6014c749f7e4c23b24f715c445a3402bfe46c Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Fri, 7 Jul 2023 14:05:48 +0200 Subject: [PATCH 30/85] build: drop `sequences` dependency --- packages.dhall | 28 ++--------------------- spago-packages.nix | 20 ++++------------ templates/ctl-scaffold/packages.dhall | 28 ++--------------------- templates/ctl-scaffold/spago-packages.nix | 20 ++++------------ 4 files changed, 12 insertions(+), 84 deletions(-) diff --git a/packages.dhall b/packages.dhall index d1a236ec9f..f1adb8dccb 100644 --- a/packages.dhall +++ b/packages.dhall @@ -136,7 +136,6 @@ let additions = , "prelude" , "quickcheck" , "record" - , "sequences" , "spec" , "strings" , "tuples" @@ -145,8 +144,8 @@ let additions = , "uint" , "untagged-union" ] - , repo = "https://github.com/mlabs-haskell/purescript-aeson.git" - , version = "97d6d06e29c466542c0d3c7893a24325d07913db" + , repo = "https://github.com/errfrom/purescript-aeson.git" + , version = "f614a840036aabb059017d03cf365f4199b9547b" } , bignumber = { dependencies = @@ -163,29 +162,6 @@ let additions = , repo = "https://github.com/errfrom/purescript-bignumber" , version = "9b3179ad07428d189e42a7a205aab9c7c4849d4a" } - , sequences = - { dependencies = - [ "arrays" - , "assert" - , "console" - , "effect" - , "lazy" - , "maybe" - , "newtype" - , "nonempty" - , "partial" - , "prelude" - , "profunctor" - , "psci-support" - , "quickcheck" - , "quickcheck-laws" - , "tuples" - , "unfoldable" - , "unsafe-coerce" - ] - , repo = "https://github.com/garganscript/purescript-sequences" - , version = "cae456c1a7463785ad33981a93e7a9cb5fc7872c" - } , properties = { dependencies = [ "prelude", "console" ] , repo = "https://github.com/Risto-Stevcev/purescript-properties.git" diff --git a/spago-packages.nix b/spago-packages.nix index f1f6fc68c1..aab9a94b96 100644 --- a/spago-packages.nix +++ b/spago-packages.nix @@ -7,11 +7,11 @@ let "aeson" = pkgs.stdenv.mkDerivation { name = "aeson"; - version = "97d6d06e29c466542c0d3c7893a24325d07913db"; + version = "f614a840036aabb059017d03cf365f4199b9547b"; src = pkgs.fetchgit { - url = "https://github.com/mlabs-haskell/purescript-aeson.git"; - rev = "97d6d06e29c466542c0d3c7893a24325d07913db"; - sha256 = "057cndwgcl8y8qh2afw3210hqcizr1ccsx1zkygn3bs2gpyx7h3q"; + url = "https://github.com/errfrom/purescript-aeson.git"; + rev = "f614a840036aabb059017d03cf365f4199b9547b"; + sha256 = "01wqbd9pz1pmz1f0z5w4gwaswbdnkr9md7fihg4d91vs690zf792"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1289,18 +1289,6 @@ let installPhase = "ln -s $src $out"; }; - "sequences" = pkgs.stdenv.mkDerivation { - name = "sequences"; - version = "cae456c1a7463785ad33981a93e7a9cb5fc7872c"; - src = pkgs.fetchgit { - url = "https://github.com/garganscript/purescript-sequences"; - rev = "cae456c1a7463785ad33981a93e7a9cb5fc7872c"; - sha256 = "0dimbcmj7f4mbxq3yq591spizib60iir9igjzb6lbydir7kc6934"; - }; - phases = "installPhase"; - installPhase = "ln -s $src $out"; - }; - "spec" = pkgs.stdenv.mkDerivation { name = "spec"; version = "v7.2.0"; diff --git a/templates/ctl-scaffold/packages.dhall b/templates/ctl-scaffold/packages.dhall index 6628cfb538..7f72d473da 100644 --- a/templates/ctl-scaffold/packages.dhall +++ b/templates/ctl-scaffold/packages.dhall @@ -136,7 +136,6 @@ let additions = , "prelude" , "quickcheck" , "record" - , "sequences" , "spec" , "strings" , "tuples" @@ -145,31 +144,8 @@ let additions = , "uint" , "untagged-union" ] - , repo = "https://github.com/mlabs-haskell/purescript-aeson.git" - , version = "97d6d06e29c466542c0d3c7893a24325d07913db" - } - , sequences = - { dependencies = - [ "arrays" - , "assert" - , "console" - , "effect" - , "lazy" - , "maybe" - , "newtype" - , "nonempty" - , "partial" - , "prelude" - , "profunctor" - , "psci-support" - , "quickcheck" - , "quickcheck-laws" - , "tuples" - , "unfoldable" - , "unsafe-coerce" - ] - , repo = "https://github.com/garganscript/purescript-sequences" - , version = "cae456c1a7463785ad33981a93e7a9cb5fc7872c" + , repo = "https://github.com/errfrom/purescript-aeson.git" + , version = "f614a840036aabb059017d03cf365f4199b9547b" } , properties = { dependencies = [ "prelude", "console" ] diff --git a/templates/ctl-scaffold/spago-packages.nix b/templates/ctl-scaffold/spago-packages.nix index 388e048631..a357a39643 100644 --- a/templates/ctl-scaffold/spago-packages.nix +++ b/templates/ctl-scaffold/spago-packages.nix @@ -7,11 +7,11 @@ let "aeson" = pkgs.stdenv.mkDerivation { name = "aeson"; - version = "97d6d06e29c466542c0d3c7893a24325d07913db"; + version = "f614a840036aabb059017d03cf365f4199b9547b"; src = pkgs.fetchgit { - url = "https://github.com/mlabs-haskell/purescript-aeson.git"; - rev = "97d6d06e29c466542c0d3c7893a24325d07913db"; - sha256 = "057cndwgcl8y8qh2afw3210hqcizr1ccsx1zkygn3bs2gpyx7h3q"; + url = "https://github.com/errfrom/purescript-aeson.git"; + rev = "f614a840036aabb059017d03cf365f4199b9547b"; + sha256 = "01wqbd9pz1pmz1f0z5w4gwaswbdnkr9md7fihg4d91vs690zf792"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -1301,18 +1301,6 @@ let installPhase = "ln -s $src $out"; }; - "sequences" = pkgs.stdenv.mkDerivation { - name = "sequences"; - version = "cae456c1a7463785ad33981a93e7a9cb5fc7872c"; - src = pkgs.fetchgit { - url = "https://github.com/garganscript/purescript-sequences"; - rev = "cae456c1a7463785ad33981a93e7a9cb5fc7872c"; - sha256 = "0dimbcmj7f4mbxq3yq591spizib60iir9igjzb6lbydir7kc6934"; - }; - phases = "installPhase"; - installPhase = "ln -s $src $out"; - }; - "spec" = pkgs.stdenv.mkDerivation { name = "spec"; version = "v7.2.0"; From 218b70c708efe3fa6b1a0272ffb0c3e4849866ed Mon Sep 17 00:00:00 2001 From: Dzmitry Shuysky Date: Tue, 11 Jul 2023 14:36:04 +0200 Subject: [PATCH 31/85] build: fix bundling using `webpack` --- .gitignore | 3 + Makefile | 27 +- dist/esbuild/index.html | 4 +- dist/esbuild/wrapper.js | 6 - dist/webpack/.gitkeep | 0 esbuild/bundle.js | 0 esbuild/config.js | 2 +- esbuild/serve.js | 0 examples/index.html | 4 +- package-lock.json | 2411 ++++++++++++++++++--------------------- package.json | 16 +- webpack.config.cjs | 110 ++ webpack.config.js | 107 -- 13 files changed, 1265 insertions(+), 1425 deletions(-) delete mode 100644 dist/esbuild/wrapper.js create mode 100644 dist/webpack/.gitkeep mode change 100644 => 100755 esbuild/bundle.js mode change 100755 => 100644 esbuild/config.js mode change 100644 => 100755 esbuild/serve.js create mode 100644 webpack.config.cjs delete mode 100644 webpack.config.js diff --git a/.gitignore b/.gitignore index 3b2eadffe0..50485c0093 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,9 @@ result-* /dist/esbuild/* !/dist/esbuild/index.html !/dist/esbuild/wrapper.js +!/dist/webpack/ +/dist/webpack/* +!/dist/webpack/.gitkeep output.js .DS_Store .idea/ diff --git a/Makefile b/Makefile index 765c301315..e7c7db1d65 100644 --- a/Makefile +++ b/Makefile @@ -1,32 +1,35 @@ SHELL := bash .ONESHELL: -.PHONY: run-dev run-build check-format format query-testnet-tip clean check-explicit-exports +.PHONY: esbuild-bundle esbuild-serve webpack-bundle webpack-serve check-format format query-testnet-tip clean check-explicit-exports .SHELLFLAGS := -eu -o pipefail -c ps-sources := $(shell fd --no-ignore-parent -epurs) nix-sources := $(shell fd --no-ignore-parent -enix --exclude='spago*') js-sources := $(shell fd --no-ignore-parent -ejs) ps-entrypoint := Ctl.Examples.ByUrl # points to one of the example PureScript modules in examples/ -ps-bundle = spago bundle-module -m ${ps-entrypoint} --to output.js preview-node-ipc = $(shell docker volume inspect store_node-preview-ipc | jq -r '.[0].Mountpoint') preprod-node-ipc = $(shell docker volume inspect store_node-preprod-ipc | jq -r '.[0].Mountpoint') -run-dev: - @${ps-bundle} --minify && BROWSER_RUNTIME=1 webpack-dev-server --progress - -run-build: - @${ps-bundle} && BROWSER_RUNTIME=1 webpack --mode=production - esbuild-bundle: - @spago build && BROWSER_RUNTIME=1 node esbuild/bundle.js ${ps-entrypoint} + @spago build \ + && cp -rf fixtures dist/esbuild \ + && BROWSER_RUNTIME=1 node esbuild/bundle.js ${ps-entrypoint} esbuild-serve: @spago build \ - && cd dist/esbuild \ - && ln -sfn ../../fixtures fixtures \ - && cd ../.. \ + && cp -rf fixtures dist/esbuild \ && BROWSER_RUNTIME=1 node esbuild/serve.js ${ps-entrypoint} +webpack-bundle: + @spago build \ + && rm -rf dist/webpack/* \ + && cp -rf fixtures/* dist/webpack \ + && BROWSER_RUNTIME=1 webpack --mode=production --env entry=./output/${ps-entrypoint}/index.js + +webpack-serve: + @spago build \ + && BROWSER_RUNTIME=1 webpack-dev-server --progress --env entry=./output/${ps-entrypoint}/index.js + .ONESHELL: check-explicit-exports: @if grep -rn '(\.\.)' ${ps-sources}; then diff --git a/dist/esbuild/index.html b/dist/esbuild/index.html index 7c9b27620b..e3c16ed392 100644 --- a/dist/esbuild/index.html +++ b/dist/esbuild/index.html @@ -5,7 +5,9 @@ - + Examples source code is located in examples/ directory.
diff --git a/dist/esbuild/wrapper.js b/dist/esbuild/wrapper.js deleted file mode 100644 index 9f0811035f..0000000000 --- a/dist/esbuild/wrapper.js +++ /dev/null @@ -1,6 +0,0 @@ -"use strict"; - -import * as m from "./index.js"; - -m.main(); -console.log("app starting"); diff --git a/dist/webpack/.gitkeep b/dist/webpack/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/esbuild/bundle.js b/esbuild/bundle.js old mode 100644 new mode 100755 diff --git a/esbuild/config.js b/esbuild/config.js old mode 100755 new mode 100644 index 8c3d46424d..0b32adc2ab --- a/esbuild/config.js +++ b/esbuild/config.js @@ -24,5 +24,5 @@ export const buildOptions = { platform: "browser", format: "esm", treeShaking: true, - logLevel: "warning", + logLevel: "error", }; diff --git a/esbuild/serve.js b/esbuild/serve.js old mode 100644 new mode 100755 diff --git a/examples/index.html b/examples/index.html index 0cee19da71..3247c9a066 100644 --- a/examples/index.html +++ b/examples/index.html @@ -5,7 +5,9 @@ - + Examples source code is located in examples/ directory.
diff --git a/package-lock.json b/package-lock.json index df17096ec6..409a9a8462 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,6 @@ "blakejs": "1.2.1", "bufferutil": "4.0.5", "jssha": "3.2.0", - "node-polyfill-webpack-plugin": "1.1.4", "puppeteer-core": "^15.3.2", "reconnecting-websocket": "4.4.0", "uniqid": "5.4.0", @@ -38,10 +37,11 @@ "esbuild": "0.18.11", "esbuild-plugin-polyfill-node": "^0.3.0", "esbuild-plugin-wasm": "^1.1.0", - "html-webpack-plugin": "5.5.0", - "webpack": "5.67.0", - "webpack-cli": "4.10", - "webpack-dev-server": "4.7.4" + "html-webpack-plugin": "5.5.3", + "node-polyfill-webpack-plugin": "2.0.1", + "webpack": "5.88.1", + "webpack-cli": "5.1.4", + "webpack-dev-server": "4.15.1" } }, "node_modules/@discoveryjs/json-ext": { @@ -426,9 +426,10 @@ } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", + "dev": true, "dependencies": { "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -439,9 +440,10 @@ } }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz", - "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", + "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "dev": true, "engines": { "node": ">=6.0.0" } @@ -450,31 +452,35 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "dev": true, "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/source-map": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", - "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz", + "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==", + "dev": true, "dependencies": { "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.13", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz", - "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==" + "version": "1.4.14", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", + "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", + "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.13", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz", - "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==", + "version": "0.3.18", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz", + "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==", + "dev": true, "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/resolve-uri": "3.1.0", + "@jridgewell/sourcemap-codec": "1.4.14" } }, "node_modules/@jspm/core": { @@ -483,6 +489,12 @@ "integrity": "sha512-Lg3PnLp0QXpxwLIAuuJboLeRaIhrgJjeuh797QADg3xz8wGLugQOS5DpsE8A6i6Adgzf+bacllkKZG3J0tGfDw==", "dev": true }, + "node_modules/@leichtgewicht/ip-codec": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz", + "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==", + "dev": true + }, "node_modules/@mlabs-haskell/csl-gc-wrapper": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@mlabs-haskell/csl-gc-wrapper/-/csl-gc-wrapper-1.0.1.tgz", @@ -518,41 +530,6 @@ } ] }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/@textlint/ast-node-types": { "version": "12.2.2", "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.2.2.tgz", @@ -641,6 +618,7 @@ "version": "8.4.3", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.3.tgz", "integrity": "sha512-YP1S7YJRMPs+7KZKDb9G63n8YejIwW9BALq7a5j2+H4yl6iOv9CB29edho+cuFRrvmJbbaH2yiVChKLJVysDGw==", + "dev": true, "dependencies": { "@types/estree": "*", "@types/json-schema": "*" @@ -650,15 +628,17 @@ "version": "3.7.3", "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz", "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==", + "dev": true, "dependencies": { "@types/eslint": "*", "@types/estree": "*" } }, "node_modules/@types/estree": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz", - "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz", + "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==", + "dev": true }, "node_modules/@types/express": { "version": "4.17.13", @@ -701,7 +681,8 @@ "node_modules/@types/json-schema": { "version": "7.0.11", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==" + "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "dev": true }, "node_modules/@types/mdast": { "version": "3.0.10", @@ -721,7 +702,8 @@ "node_modules/@types/node": { "version": "17.0.35", "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.35.tgz", - "integrity": "sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==" + "integrity": "sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==", + "devOptional": true }, "node_modules/@types/qs": { "version": "6.9.7", @@ -776,9 +758,9 @@ "dev": true }, "node_modules/@types/ws": { - "version": "8.5.3", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz", - "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==", + "version": "8.5.5", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz", + "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==", "dev": true, "dependencies": { "@types/node": "*" @@ -794,165 +776,188 @@ } }, "node_modules/@webassemblyjs/ast": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", - "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", + "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", + "dev": true, "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1" + "@webassemblyjs/helper-numbers": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6" } }, "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", - "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==" + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", + "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", + "dev": true }, "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", - "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==" + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", + "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", + "dev": true }, "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", - "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==" + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", + "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==", + "dev": true }, "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", - "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", + "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", + "dev": true, "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", + "@webassemblyjs/floating-point-hex-parser": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", - "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==" + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", + "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", + "dev": true }, "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", - "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", + "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", + "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6" } }, "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", - "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", + "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", + "dev": true, "dependencies": { "@xtuc/ieee754": "^1.2.0" } }, "node_modules/@webassemblyjs/leb128": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", - "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", + "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", + "dev": true, "dependencies": { "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/utf8": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", - "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==" + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", + "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", + "dev": true }, "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", - "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", + "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", + "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/helper-wasm-section": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-opt": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "@webassemblyjs/wast-printer": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-opt": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6", + "@webassemblyjs/wast-printer": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", - "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", + "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", + "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", - "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", + "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", + "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", - "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", + "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", + "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "node_modules/@webassemblyjs/wast-printer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", - "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", + "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", + "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/ast": "1.11.6", "@xtuc/long": "4.2.2" } }, "node_modules/@webpack-cli/configtest": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz", - "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz", + "integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==", "dev": true, + "engines": { + "node": ">=14.15.0" + }, "peerDependencies": { - "webpack": "4.x.x || 5.x.x", - "webpack-cli": "4.x.x" + "webpack": "5.x.x", + "webpack-cli": "5.x.x" } }, "node_modules/@webpack-cli/info": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz", - "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz", + "integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==", "dev": true, - "dependencies": { - "envinfo": "^7.7.3" + "engines": { + "node": ">=14.15.0" }, "peerDependencies": { - "webpack-cli": "4.x.x" + "webpack": "5.x.x", + "webpack-cli": "5.x.x" } }, "node_modules/@webpack-cli/serve": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz", - "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz", + "integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==", "dev": true, + "engines": { + "node": ">=14.15.0" + }, "peerDependencies": { - "webpack-cli": "4.x.x" + "webpack": "5.x.x", + "webpack-cli": "5.x.x" }, "peerDependenciesMeta": { "webpack-dev-server": { @@ -963,12 +968,26 @@ "node_modules/@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==" + "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", + "dev": true }, "node_modules/@xtuc/long": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" + "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", + "dev": true + }, + "node_modules/abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "dev": true, + "dependencies": { + "event-target-shim": "^5.0.0" + }, + "engines": { + "node": ">=6.5" + } }, "node_modules/accepts": { "version": "1.3.8", @@ -984,9 +1003,10 @@ } }, "node_modules/acorn": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", - "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", + "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", + "dev": true, "bin": { "acorn": "bin/acorn" }, @@ -995,9 +1015,10 @@ } }, "node_modules/acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", + "dev": true, "peerDependencies": { "acorn": "^8" } @@ -1034,23 +1055,11 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "node_modules/aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "dependencies": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -1105,6 +1114,7 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "dev": true, "peerDependencies": { "ajv": "^6.9.1" } @@ -1168,19 +1178,11 @@ "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", "dev": true }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/asn1.js": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", + "dev": true, "dependencies": { "bn.js": "^4.0.0", "inherits": "^2.0.1", @@ -1191,12 +1193,14 @@ "node_modules/asn1.js/node_modules/bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true }, "node_modules/assert": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz", "integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==", + "dev": true, "dependencies": { "es6-object-assign": "^1.1.0", "is-nan": "^1.2.1", @@ -1204,19 +1208,11 @@ "util": "^0.12.0" } }, - "node_modules/async": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", - "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", - "dev": true, - "dependencies": { - "lodash": "^4.17.14" - } - }, "node_modules/available-typed-arrays": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", + "dev": true, "engines": { "node": ">= 0.4" }, @@ -1338,7 +1334,8 @@ "node_modules/bn.js": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", - "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" + "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==", + "dev": true }, "node_modules/body-parser": { "version": "1.20.0", @@ -1373,18 +1370,16 @@ "node": ">= 0.8" } }, - "node_modules/bonjour": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", - "integrity": "sha512-RaVTblr+OnEli0r/ud8InrU7D+G0y6aJhlxaLa6Pwty4+xoxboF1BsUI45tujvRpbj9dQVoglChqonGAsjEBYg==", + "node_modules/bonjour-service": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz", + "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==", "dev": true, "dependencies": { - "array-flatten": "^2.1.0", - "deep-equal": "^1.0.1", + "array-flatten": "^2.1.2", "dns-equal": "^1.0.0", - "dns-txt": "^2.0.2", - "multicast-dns": "^6.0.1", - "multicast-dns-service-types": "^1.1.0" + "fast-deep-equal": "^3.1.3", + "multicast-dns": "^7.2.5" } }, "node_modules/boolbase": { @@ -1417,12 +1412,14 @@ "node_modules/brorand": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==" + "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==", + "dev": true }, "node_modules/browserify-aes": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", + "dev": true, "dependencies": { "buffer-xor": "^1.0.3", "cipher-base": "^1.0.0", @@ -1436,6 +1433,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", + "dev": true, "dependencies": { "browserify-aes": "^1.0.4", "browserify-des": "^1.0.0", @@ -1446,6 +1444,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", + "dev": true, "dependencies": { "cipher-base": "^1.0.1", "des.js": "^1.0.0", @@ -1457,6 +1456,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz", "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==", + "dev": true, "dependencies": { "bn.js": "^5.0.0", "randombytes": "^2.0.1" @@ -1466,6 +1466,7 @@ "version": "4.2.1", "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", + "dev": true, "dependencies": { "bn.js": "^5.1.1", "browserify-rsa": "^4.0.1", @@ -1482,6 +1483,7 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", + "dev": true, "dependencies": { "pako": "~1.0.5" } @@ -1490,6 +1492,7 @@ "version": "4.21.0", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.0.tgz", "integrity": "sha512-UQxE0DIhRB5z/zDz9iA03BOfxaN2+GQdBYH/2WrSIWEUrnpzTPJbhqt+umq6r3acaPRTW1FNTkrcp0PXgtFkvA==", + "dev": true, "funding": [ { "type": "opencollective", @@ -1517,6 +1520,7 @@ "version": "6.0.3", "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "dev": true, "funding": [ { "type": "github", @@ -1547,18 +1551,14 @@ "node_modules/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" - }, - "node_modules/buffer-indexof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz", - "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, "node_modules/buffer-xor": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", - "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==" + "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==", + "dev": true }, "node_modules/bufferutil": { "version": "4.0.5", @@ -1575,7 +1575,8 @@ "node_modules/builtin-status-codes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", - "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==" + "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==", + "dev": true }, "node_modules/bytes": { "version": "3.0.0", @@ -1590,6 +1591,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, "dependencies": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" @@ -1612,6 +1614,7 @@ "version": "1.0.30001358", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001358.tgz", "integrity": "sha512-hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw==", + "dev": true, "funding": [ { "type": "opencollective", @@ -1699,6 +1702,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", + "dev": true, "engines": { "node": ">=6.0" } @@ -1707,6 +1711,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", + "dev": true, "dependencies": { "inherits": "^2.0.1", "safe-buffer": "^5.0.1" @@ -1724,15 +1729,6 @@ "node": ">= 10.0" } }, - "node_modules/clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/clone-deep": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", @@ -1804,9 +1800,9 @@ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, "node_modules/connect-history-api-fallback": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", - "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz", + "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==", "dev": true, "engines": { "node": ">=0.8" @@ -1815,12 +1811,14 @@ "node_modules/console-browserify": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", - "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" + "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==", + "dev": true }, "node_modules/constants-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", - "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==" + "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==", + "dev": true }, "node_modules/content-disposition": { "version": "0.5.4", @@ -1868,6 +1866,7 @@ "version": "4.0.4", "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", + "dev": true, "dependencies": { "bn.js": "^4.1.0", "elliptic": "^6.5.3" @@ -1876,12 +1875,14 @@ "node_modules/create-ecdh/node_modules/bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true }, "node_modules/create-hash": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", + "dev": true, "dependencies": { "cipher-base": "^1.0.1", "inherits": "^2.0.1", @@ -1894,6 +1895,7 @@ "version": "1.1.7", "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", + "dev": true, "dependencies": { "cipher-base": "^1.0.3", "create-hash": "^1.1.0", @@ -1929,6 +1931,7 @@ "version": "3.12.0", "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", + "dev": true, "dependencies": { "browserify-cipher": "^1.0.0", "browserify-sign": "^4.0.0", @@ -1983,23 +1986,6 @@ "ms": "2.0.0" } }, - "node_modules/deep-equal": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", - "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", - "dev": true, - "dependencies": { - "is-arguments": "^1.0.4", - "is-date-object": "^1.0.1", - "is-regex": "^1.0.4", - "object-is": "^1.0.1", - "object-keys": "^1.1.1", - "regexp.prototype.flags": "^1.2.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/default-gateway": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz", @@ -2025,6 +2011,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", + "dev": true, "dependencies": { "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" @@ -2036,28 +2023,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/del": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz", - "integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==", - "dev": true, - "dependencies": { - "globby": "^11.0.1", - "graceful-fs": "^4.2.4", - "is-glob": "^4.0.1", - "is-path-cwd": "^2.2.0", - "is-path-inside": "^3.0.2", - "p-map": "^4.0.0", - "rimraf": "^3.0.2", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -2071,6 +2036,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", + "dev": true, "dependencies": { "inherits": "^2.0.1", "minimalistic-assert": "^1.0.0" @@ -2101,6 +2067,7 @@ "version": "5.0.3", "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", + "dev": true, "dependencies": { "bn.js": "^4.1.0", "miller-rabin": "^4.0.0", @@ -2110,19 +2077,8 @@ "node_modules/diffie-hellman/node_modules/bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" - }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true }, "node_modules/dns-equal": { "version": "1.0.0", @@ -2131,22 +2087,15 @@ "dev": true }, "node_modules/dns-packet": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz", - "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==", - "dev": true, - "dependencies": { - "ip": "^1.1.0", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/dns-txt": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz", - "integrity": "sha512-Ix5PrWjphuSoUXV/Zv5gaFHjnaJtb02F2+Si3Ht9dyJ87+Z/lMmy+dpNHtTGraNK958ndXq2i+GLkWsWHcKaBQ==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.0.tgz", + "integrity": "sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ==", "dev": true, "dependencies": { - "buffer-indexof": "^1.0.0" + "@leichtgewicht/ip-codec": "^2.0.1" + }, + "engines": { + "node": ">=6" } }, "node_modules/doctoc": { @@ -2224,6 +2173,7 @@ "version": "4.22.0", "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-4.22.0.tgz", "integrity": "sha512-IGBwjF7tNk3cwypFNH/7bfzBcgSCbaMOD3GsaY1AU/JRrnHnYgEM0+9kQt52iZxjNsjBtJYtao146V+f8jFZNw==", + "dev": true, "engines": { "node": ">=10" }, @@ -2291,12 +2241,14 @@ "node_modules/electron-to-chromium": { "version": "1.4.167", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.167.tgz", - "integrity": "sha512-lPHuHXBwpkr4RcfaZBKm6TKOWG/1N9mVggUpP4fY3l1JIUU2x4fkM8928smYdZ5lF+6KCTAxo1aK9JmqT+X71Q==" + "integrity": "sha512-lPHuHXBwpkr4RcfaZBKm6TKOWG/1N9mVggUpP4fY3l1JIUU2x4fkM8928smYdZ5lF+6KCTAxo1aK9JmqT+X71Q==", + "dev": true }, "node_modules/elliptic": { "version": "6.5.4", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", + "dev": true, "dependencies": { "bn.js": "^4.11.9", "brorand": "^1.1.0", @@ -2310,7 +2262,8 @@ "node_modules/elliptic/node_modules/bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true }, "node_modules/emoji-regex": { "version": "10.1.0", @@ -2336,9 +2289,10 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz", - "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", + "dev": true, "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -2357,9 +2311,9 @@ } }, "node_modules/envinfo": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz", - "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.10.0.tgz", + "integrity": "sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==", "dev": true, "bin": { "envinfo": "dist/cli.js" @@ -2372,6 +2326,7 @@ "version": "1.20.1", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz", "integrity": "sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", @@ -2405,14 +2360,16 @@ } }, "node_modules/es-module-lexer": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", - "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==" + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz", + "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==", + "dev": true }, "node_modules/es-to-primitive": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, "dependencies": { "is-callable": "^1.1.4", "is-date-object": "^1.0.1", @@ -2428,7 +2385,8 @@ "node_modules/es6-object-assign": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz", - "integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==" + "integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==", + "dev": true }, "node_modules/esbuild": { "version": "0.18.11", @@ -2497,6 +2455,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true, "engines": { "node": ">=6" } @@ -2523,6 +2482,7 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^4.1.1" @@ -2535,6 +2495,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, "dependencies": { "estraverse": "^5.2.0" }, @@ -2546,6 +2507,7 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, "engines": { "node": ">=4.0" } @@ -2554,6 +2516,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, "engines": { "node": ">=4.0" } @@ -2567,6 +2530,15 @@ "node": ">= 0.6" } }, + "node_modules/event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/eventemitter3": { "version": "4.0.7", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", @@ -2577,6 +2549,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", + "dev": true, "engines": { "node": ">=0.8.x" } @@ -2585,6 +2558,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", + "dev": true, "dependencies": { "md5.js": "^1.3.4", "safe-buffer": "^5.1.1" @@ -2724,28 +2698,14 @@ "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" - }, - "node_modules/fast-glob": { - "version": "3.2.11", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", - "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true }, "node_modules/fastest-levenshtein": { "version": "1.0.14", @@ -2756,15 +2716,6 @@ "node": ">= 4.9.1" } }, - "node_modules/fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", - "dev": true, - "dependencies": { - "reusify": "^1.0.4" - } - }, "node_modules/fault": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz", @@ -2814,6 +2765,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-2.0.2.tgz", "integrity": "sha512-lO3ttPjHZRfjMcxWKb1j1eDhTFsu4meeR3lnMcnBFhk6RuLhvEiuALu2TlfL310ph4lCYYwgF/ElIjdP739tdg==", + "dev": true, "engines": { "node": ">=8" } @@ -2872,6 +2824,7 @@ "version": "0.3.3", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "dev": true, "dependencies": { "is-callable": "^1.1.3" } @@ -2936,12 +2889,14 @@ "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true }, "node_modules/function.prototype.name": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", @@ -2959,6 +2914,7 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -2967,6 +2923,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "dev": true, "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -2992,6 +2949,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.1.1" @@ -3037,32 +2995,14 @@ "node_modules/glob-to-regexp": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" - }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", + "dev": true }, "node_modules/graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "dev": true }, "node_modules/handle-thing": { "version": "2.0.1", @@ -3074,6 +3014,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, "dependencies": { "function-bind": "^1.1.1" }, @@ -3085,6 +3026,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", + "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -3093,6 +3035,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, "engines": { "node": ">=8" } @@ -3101,6 +3044,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "dev": true, "dependencies": { "get-intrinsic": "^1.1.1" }, @@ -3112,6 +3056,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "dev": true, "engines": { "node": ">= 0.4" }, @@ -3123,6 +3068,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "dev": true, "dependencies": { "has-symbols": "^1.0.2" }, @@ -3137,6 +3083,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz", "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", + "dev": true, "dependencies": { "inherits": "^2.0.4", "readable-stream": "^3.6.0", @@ -3150,6 +3097,7 @@ "version": "1.1.7", "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", + "dev": true, "dependencies": { "inherits": "^2.0.3", "minimalistic-assert": "^1.0.1" @@ -3168,6 +3116,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", + "dev": true, "dependencies": { "hash.js": "^1.0.3", "minimalistic-assert": "^1.0.0", @@ -3244,9 +3193,9 @@ } }, "node_modules/html-webpack-plugin": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz", - "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==", + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz", + "integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==", "dev": true, "dependencies": { "@types/html-minifier-terser": "^6.0.0", @@ -3354,7 +3303,8 @@ "node_modules/https-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", - "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==" + "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==", + "dev": true }, "node_modules/https-proxy-agent": { "version": "5.0.1", @@ -3429,15 +3379,6 @@ } ] }, - "node_modules/ignore": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", - "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, "node_modules/import-local": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", @@ -3467,15 +3408,6 @@ "url": "https://github.com/sponsors/wooorm" } }, - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -3494,6 +3426,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz", "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==", + "dev": true, "dependencies": { "get-intrinsic": "^1.1.0", "has": "^1.0.3", @@ -3504,20 +3437,14 @@ } }, "node_modules/interpret": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz", - "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz", + "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==", "dev": true, "engines": { - "node": ">= 0.10" + "node": ">=10.13.0" } }, - "node_modules/ip": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz", - "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==", - "dev": true - }, "node_modules/ipaddr.js": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz", @@ -3555,6 +3482,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -3570,6 +3498,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "dev": true, "dependencies": { "has-bigints": "^1.0.1" }, @@ -3593,6 +3522,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -3631,6 +3561,7 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", + "dev": true, "engines": { "node": ">= 0.4" }, @@ -3639,9 +3570,9 @@ } }, "node_modules/is-core-module": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", - "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz", + "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==", "dev": true, "dependencies": { "has": "^1.0.3" @@ -3654,6 +3585,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "dev": true, "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -3702,6 +3634,7 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", + "dev": true, "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -3738,6 +3671,7 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz", "integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==", + "dev": true, "dependencies": { "call-bind": "^1.0.0", "define-properties": "^1.1.3" @@ -3753,6 +3687,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", + "dev": true, "engines": { "node": ">= 0.4" }, @@ -3773,6 +3708,7 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", + "dev": true, "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -3783,24 +3719,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-path-cwd": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", - "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/is-plain-obj": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", @@ -3829,6 +3747,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -3844,6 +3763,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", + "dev": true, "dependencies": { "call-bind": "^1.0.2" }, @@ -3867,6 +3787,7 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "dev": true, "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -3881,6 +3802,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", + "dev": true, "dependencies": { "has-symbols": "^1.0.2" }, @@ -3895,6 +3817,7 @@ "version": "1.1.9", "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz", "integrity": "sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==", + "dev": true, "dependencies": { "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", @@ -3913,6 +3836,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", + "dev": true, "dependencies": { "call-bind": "^1.0.2" }, @@ -3957,6 +3881,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", + "dev": true, "dependencies": { "@types/node": "*", "merge-stream": "^2.0.0", @@ -3966,15 +3891,17 @@ "node": ">= 10.13.0" } }, - "node_modules/json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true }, "node_modules/jssha": { "version": "3.2.0", @@ -3993,10 +3920,21 @@ "node": ">=0.10.0" } }, + "node_modules/launch-editor": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz", + "integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==", + "dev": true, + "dependencies": { + "picocolors": "^1.0.0", + "shell-quote": "^1.7.3" + } + }, "node_modules/loader-runner": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", + "dev": true, "engines": { "node": ">=6.11.5" } @@ -4054,6 +3992,7 @@ "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", + "dev": true, "dependencies": { "hash-base": "^3.0.0", "inherits": "^2.0.1", @@ -4249,16 +4188,8 @@ "node_modules/merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" - }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, - "engines": { - "node": ">= 8" - } + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true }, "node_modules/methods": { "version": "1.1.2", @@ -4435,6 +4366,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", + "dev": true, "dependencies": { "bn.js": "^4.0.0", "brorand": "^1.0.1" @@ -4446,7 +4378,8 @@ "node_modules/miller-rabin/node_modules/bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true }, "node_modules/mime": { "version": "1.6.0", @@ -4464,6 +4397,7 @@ "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true, "engines": { "node": ">= 0.6" } @@ -4472,6 +4406,7 @@ "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, "dependencies": { "mime-db": "1.52.0" }, @@ -4491,12 +4426,14 @@ "node_modules/minimalistic-assert": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", + "dev": true }, "node_modules/minimalistic-crypto-utils": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==" + "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==", + "dev": true }, "node_modules/minimatch": { "version": "3.1.2", @@ -4515,18 +4452,6 @@ "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, - "node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, "node_modules/mkdirp-classic": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", @@ -4539,24 +4464,18 @@ "dev": true }, "node_modules/multicast-dns": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz", - "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==", + "version": "7.2.5", + "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz", + "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==", "dev": true, "dependencies": { - "dns-packet": "^1.3.1", + "dns-packet": "^5.2.2", "thunky": "^1.0.2" }, "bin": { "multicast-dns": "cli.js" } }, - "node_modules/multicast-dns-service-types": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", - "integrity": "sha512-cnAsSVxIDsYt0v7HmC0hWZFwwXSh+E6PgCrREDuN/EsjgLwA5XRmlMHhSiDPrt6HxY1gTivEa/Zh7GtODoLevQ==", - "dev": true - }, "node_modules/negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", @@ -4569,7 +4488,8 @@ "node_modules/neo-async": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true }, "node_modules/no-case": { "version": "3.0.4", @@ -4639,9 +4559,10 @@ } }, "node_modules/node-polyfill-webpack-plugin": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/node-polyfill-webpack-plugin/-/node-polyfill-webpack-plugin-1.1.4.tgz", - "integrity": "sha512-Z0XTKj1wRWO8o/Vjobsw5iOJCN+Sua3EZEUc2Ziy9CyVvmHKu6o+t4gUH9GOE0czyPR94LI6ZCV/PpcM8b5yow==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/node-polyfill-webpack-plugin/-/node-polyfill-webpack-plugin-2.0.1.tgz", + "integrity": "sha512-ZUMiCnZkP1LF0Th2caY6J/eKKoA0TefpoVa68m/LQU1I/mE8rGt4fNYGgNuCcK+aG8P8P43nbeJ2RqJMOL/Y1A==", + "dev": true, "dependencies": { "assert": "^2.0.0", "browserify-zlib": "^0.2.0", @@ -4649,7 +4570,7 @@ "console-browserify": "^1.2.0", "constants-browserify": "^1.0.0", "crypto-browserify": "^3.12.0", - "domain-browser": "^4.19.0", + "domain-browser": "^4.22.0", "events": "^3.3.0", "filter-obj": "^2.0.2", "https-browserify": "^1.0.0", @@ -4658,27 +4579,45 @@ "process": "^0.11.10", "punycode": "^2.1.1", "querystring-es3": "^0.2.1", - "readable-stream": "^3.6.0", + "readable-stream": "^4.0.0", "stream-browserify": "^3.0.0", "stream-http": "^3.2.0", "string_decoder": "^1.3.0", "timers-browserify": "^2.0.12", "tty-browserify": "^0.0.1", + "type-fest": "^2.14.0", "url": "^0.11.0", "util": "^0.12.4", "vm-browserify": "^1.1.2" }, "engines": { - "node": ">=10" + "node": ">=12" }, "peerDependencies": { "webpack": ">=5" } }, + "node_modules/node-polyfill-webpack-plugin/node_modules/readable-stream": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.2.tgz", + "integrity": "sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==", + "dev": true, + "dependencies": { + "abort-controller": "^3.0.0", + "buffer": "^6.0.3", + "events": "^3.3.0", + "process": "^0.11.10", + "string_decoder": "^1.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, "node_modules/node-releases": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz", - "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==" + "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==", + "dev": true }, "node_modules/normalize-path": { "version": "3.0.0", @@ -4717,6 +4656,7 @@ "version": "1.12.1", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.1.tgz", "integrity": "sha512-Y/jF6vnvEtOPGiKD1+q+X0CiUYRQtEHp89MLLUJ7TUivtH8Ugn2+3A7Rynqk7BRsAoqeOQWnFnjpDrKSxDgIGA==", + "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -4725,6 +4665,7 @@ "version": "1.1.5", "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.3" @@ -4740,6 +4681,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true, "engines": { "node": ">= 0.4" } @@ -4748,6 +4690,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "dev": true, "dependencies": { "call-bind": "^1.0.0", "define-properties": "^1.1.3", @@ -4831,7 +4774,8 @@ "node_modules/os-browserify": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", - "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==" + "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==", + "dev": true }, "node_modules/p-limit": { "version": "2.3.0", @@ -4858,21 +4802,6 @@ "node": ">=8" } }, - "node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "dependencies": { - "aggregate-error": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/p-retry": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz", @@ -4897,7 +4826,8 @@ "node_modules/pako": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", - "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "dev": true }, "node_modules/param-case": { "version": "3.0.4", @@ -4913,6 +4843,7 @@ "version": "5.1.6", "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", + "dev": true, "dependencies": { "asn1.js": "^5.2.0", "browserify-aes": "^1.0.0", @@ -4961,7 +4892,8 @@ "node_modules/path-browserify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", - "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==" + "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==", + "dev": true }, "node_modules/path-exists": { "version": "4.0.0", @@ -5000,19 +4932,11 @@ "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", "dev": true }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/pbkdf2": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==", + "dev": true, "dependencies": { "create-hash": "^1.1.2", "create-hmac": "^1.1.4", @@ -5032,7 +4956,8 @@ "node_modules/picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true }, "node_modules/picomatch": { "version": "2.3.1", @@ -5057,35 +4982,6 @@ "node": ">=8" } }, - "node_modules/portfinder": { - "version": "1.0.28", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", - "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==", - "dev": true, - "dependencies": { - "async": "^2.6.2", - "debug": "^3.1.1", - "mkdirp": "^0.5.5" - }, - "engines": { - "node": ">= 0.12.0" - } - }, - "node_modules/portfinder/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/portfinder/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true - }, "node_modules/pretty-error": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz", @@ -5100,6 +4996,7 @@ "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", + "dev": true, "engines": { "node": ">= 0.6.0" } @@ -5149,6 +5046,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", + "dev": true, "dependencies": { "bn.js": "^4.1.0", "browserify-rsa": "^4.0.0", @@ -5161,7 +5059,8 @@ "node_modules/public-encrypt/node_modules/bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true }, "node_modules/pump": { "version": "3.0.0", @@ -5176,6 +5075,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true, "engines": { "node": ">=6" } @@ -5263,6 +5163,7 @@ "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==", "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", + "dev": true, "engines": { "node": ">=0.4.x" } @@ -5271,34 +5172,16 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==", + "dev": true, "engines": { "node": ">=0.4.x" } }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, "node_modules/randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, "dependencies": { "safe-buffer": "^5.1.0" } @@ -5307,6 +5190,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", + "dev": true, "dependencies": { "randombytes": "^2.0.5", "safe-buffer": "^5.1.0" @@ -5371,15 +5255,15 @@ } }, "node_modules/rechoir": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", - "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz", + "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==", "dev": true, "dependencies": { - "resolve": "^1.9.0" + "resolve": "^1.20.0" }, "engines": { - "node": ">= 0.10" + "node": ">= 10.13.0" } }, "node_modules/reconnecting-websocket": { @@ -5391,6 +5275,7 @@ "version": "1.4.3", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", @@ -5505,12 +5390,12 @@ "dev": true }, "node_modules/resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "version": "1.22.2", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz", + "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==", "dev": true, "dependencies": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.11.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -5551,16 +5436,6 @@ "node": ">= 4" } }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true, - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, "node_modules/rimraf": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", @@ -5579,34 +5454,12 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", + "dev": true, "dependencies": { "hash-base": "^3.0.0", "inherits": "^2.0.1" } }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -5629,12 +5482,14 @@ "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true }, "node_modules/schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", + "dev": true, "dependencies": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", @@ -5655,9 +5510,9 @@ "dev": true }, "node_modules/selfsigned": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.1.tgz", - "integrity": "sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz", + "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==", "dev": true, "dependencies": { "node-forge": "^1" @@ -5697,9 +5552,10 @@ "dev": true }, "node_modules/serialize-javascript": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", + "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", + "dev": true, "dependencies": { "randombytes": "^2.1.0" } @@ -5785,7 +5641,8 @@ "node_modules/setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==" + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", + "dev": true }, "node_modules/setprototypeof": { "version": "1.2.0", @@ -5797,6 +5654,7 @@ "version": "2.4.11", "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", + "dev": true, "dependencies": { "inherits": "^2.0.1", "safe-buffer": "^5.0.1" @@ -5838,10 +5696,20 @@ "node": ">=8" } }, + "node_modules/shell-quote": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", + "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/side-channel": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "dev": true, "dependencies": { "call-bind": "^1.0.0", "get-intrinsic": "^1.0.2", @@ -5857,15 +5725,6 @@ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/sockjs": { "version": "0.3.24", "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz", @@ -5881,6 +5740,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -5889,6 +5749,7 @@ "version": "0.5.21", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, "dependencies": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -5983,6 +5844,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz", "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==", + "dev": true, "dependencies": { "inherits": "~2.0.4", "readable-stream": "^3.5.0" @@ -5992,6 +5854,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz", "integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==", + "dev": true, "dependencies": { "builtin-status-codes": "^3.0.0", "inherits": "^2.0.4", @@ -6011,6 +5874,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz", "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.4", @@ -6024,6 +5888,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz", "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.4", @@ -6058,6 +5923,7 @@ "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -6084,6 +5950,7 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", + "dev": true, "engines": { "node": ">=6" } @@ -6115,12 +5982,13 @@ } }, "node_modules/terser": { - "version": "5.15.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz", - "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==", + "version": "5.18.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.18.2.tgz", + "integrity": "sha512-Ah19JS86ypbJzTzvUCX7KOsEIhDaRONungA4aYBjEP3JZRf4ocuDzTg4QWZnPn9DEMiMYGJPiSOy7aykoCc70w==", + "dev": true, "dependencies": { - "@jridgewell/source-map": "^0.3.2", - "acorn": "^8.5.0", + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", "commander": "^2.20.0", "source-map-support": "~0.5.20" }, @@ -6132,15 +6000,16 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz", - "integrity": "sha512-Fx60G5HNYknNTNQnzQ1VePRuu89ZVYWfjRAeT5rITuCY/1b08s49e5kSQwHDirKZWuoKOBRFS98EUUoZ9kLEwQ==", + "version": "5.3.9", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz", + "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==", + "dev": true, "dependencies": { - "@jridgewell/trace-mapping": "^0.3.7", + "@jridgewell/trace-mapping": "^0.3.17", "jest-worker": "^27.4.5", "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.0", - "terser": "^5.7.2" + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { "node": ">= 10.13.0" @@ -6167,7 +6036,8 @@ "node_modules/terser/node_modules/commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true }, "node_modules/through": { "version": "2.3.8", @@ -6184,6 +6054,7 @@ "version": "2.0.12", "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz", "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==", + "dev": true, "dependencies": { "setimmediate": "^1.0.4" }, @@ -6240,7 +6111,20 @@ "node_modules/tty-browserify": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz", - "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==" + "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==", + "dev": true + }, + "node_modules/type-fest": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", + "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", + "dev": true, + "engines": { + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/type-is": { "version": "1.6.18", @@ -6259,6 +6143,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "has-bigints": "^1.0.2", @@ -6389,6 +6274,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.3.tgz", "integrity": "sha512-ufSazemeh9Gty0qiWtoRpJ9F5Q5W3xdIPm1UZQqYQv/q0Nyb9EMHUB2lu+O9x1re9WsorpMAUu4Y6Lxcs5n+XQ==", + "dev": true, "funding": [ { "type": "opencollective", @@ -6420,6 +6306,7 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, "dependencies": { "punycode": "^2.1.0" } @@ -6428,6 +6315,7 @@ "version": "0.11.0", "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==", + "dev": true, "dependencies": { "punycode": "1.3.2", "querystring": "0.2.0" @@ -6436,12 +6324,14 @@ "node_modules/url/node_modules/punycode": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==" + "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==", + "dev": true }, "node_modules/util": { "version": "0.12.4", "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz", "integrity": "sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==", + "dev": true, "dependencies": { "inherits": "^2.0.3", "is-arguments": "^1.0.4", @@ -6522,12 +6412,14 @@ "node_modules/vm-browserify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", - "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==" + "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==", + "dev": true }, "node_modules/watchpack": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz", - "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", + "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", + "dev": true, "dependencies": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" @@ -6546,33 +6438,34 @@ } }, "node_modules/webpack": { - "version": "5.67.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.67.0.tgz", - "integrity": "sha512-LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw==", - "dependencies": { - "@types/eslint-scope": "^3.7.0", - "@types/estree": "^0.0.50", - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/wasm-edit": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "acorn": "^8.4.1", - "acorn-import-assertions": "^1.7.6", + "version": "5.88.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.1.tgz", + "integrity": "sha512-FROX3TxQnC/ox4N+3xQoWZzvGXSuscxR32rbzjpXgEzWudJFEJBpdlkkob2ylrv5yzzufD1zph1OoFsLtm6stQ==", + "dev": true, + "dependencies": { + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.8.3", - "es-module-lexer": "^0.9.0", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.2.9", - "json-parse-better-errors": "^1.0.2", + "json-parse-even-better-errors": "^2.3.1", "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", - "schema-utils": "^3.1.0", + "schema-utils": "^3.2.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.1.3", - "watchpack": "^2.3.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", "webpack-sources": "^3.2.3" }, "bin": { @@ -6592,44 +6485,42 @@ } }, "node_modules/webpack-cli": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz", - "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz", + "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==", "dev": true, "dependencies": { "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^1.2.0", - "@webpack-cli/info": "^1.5.0", - "@webpack-cli/serve": "^1.7.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", "colorette": "^2.0.14", - "commander": "^7.0.0", + "commander": "^10.0.1", "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", "fastest-levenshtein": "^1.0.12", "import-local": "^3.0.2", - "interpret": "^2.2.0", - "rechoir": "^0.7.0", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", "webpack-merge": "^5.7.3" }, "bin": { "webpack-cli": "bin/cli.js" }, "engines": { - "node": ">=10.13.0" + "node": ">=14.15.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "webpack": "4.x.x || 5.x.x" + "webpack": "5.x.x" }, "peerDependenciesMeta": { "@webpack-cli/generators": { "optional": true }, - "@webpack-cli/migrate": { - "optional": true - }, "webpack-bundle-analyzer": { "optional": true }, @@ -6639,12 +6530,12 @@ } }, "node_modules/webpack-cli/node_modules/commander": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", "dev": true, "engines": { - "node": ">= 10" + "node": ">=14" } }, "node_modules/webpack-dev-middleware": { @@ -6724,41 +6615,41 @@ } }, "node_modules/webpack-dev-server": { - "version": "4.7.4", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.7.4.tgz", - "integrity": "sha512-nfdsb02Zi2qzkNmgtZjkrMOcXnYZ6FLKcQwpxT7MvmHKc+oTtDsBju8j+NMyAygZ9GW1jMEUpy3itHtqgEhe1A==", + "version": "4.15.1", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz", + "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==", "dev": true, "dependencies": { "@types/bonjour": "^3.5.9", "@types/connect-history-api-fallback": "^1.3.5", "@types/express": "^4.17.13", "@types/serve-index": "^1.9.1", + "@types/serve-static": "^1.13.10", "@types/sockjs": "^0.3.33", - "@types/ws": "^8.2.2", + "@types/ws": "^8.5.5", "ansi-html-community": "^0.0.8", - "bonjour": "^3.5.0", + "bonjour-service": "^1.0.11", "chokidar": "^3.5.3", "colorette": "^2.0.10", "compression": "^1.7.4", - "connect-history-api-fallback": "^1.6.0", + "connect-history-api-fallback": "^2.0.0", "default-gateway": "^6.0.3", - "del": "^6.0.0", - "express": "^4.17.1", + "express": "^4.17.3", "graceful-fs": "^4.2.6", "html-entities": "^2.3.2", - "http-proxy-middleware": "^2.0.0", + "http-proxy-middleware": "^2.0.3", "ipaddr.js": "^2.0.1", + "launch-editor": "^2.6.0", "open": "^8.0.9", "p-retry": "^4.5.0", - "portfinder": "^1.0.28", + "rimraf": "^3.0.2", "schema-utils": "^4.0.0", - "selfsigned": "^2.0.0", + "selfsigned": "^2.1.1", "serve-index": "^1.9.1", - "sockjs": "^0.3.21", + "sockjs": "^0.3.24", "spdy": "^4.0.2", - "strip-ansi": "^7.0.0", "webpack-dev-middleware": "^5.3.1", - "ws": "^8.4.2" + "ws": "^8.13.0" }, "bin": { "webpack-dev-server": "bin/webpack-dev-server.js" @@ -6766,10 +6657,17 @@ "engines": { "node": ">= 12.13.0" }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, "peerDependencies": { "webpack": "^4.37.0 || ^5.0.0" }, "peerDependenciesMeta": { + "webpack": { + "optional": true + }, "webpack-cli": { "optional": true } @@ -6803,18 +6701,6 @@ "ajv": "^8.8.2" } }, - "node_modules/webpack-dev-server/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, "node_modules/webpack-dev-server/node_modules/json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", @@ -6840,32 +6726,17 @@ "url": "https://opencollective.com/webpack" } }, - "node_modules/webpack-dev-server/node_modules/strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", - "dev": true, - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, "node_modules/webpack-dev-server/node_modules/ws": { - "version": "8.6.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz", - "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==", + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", + "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", "dev": true, "engines": { "node": ">=10.0.0" }, "peerDependencies": { "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" + "utf-8-validate": ">=5.0.2" }, "peerDependenciesMeta": { "bufferutil": { @@ -6893,6 +6764,7 @@ "version": "3.2.3", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", + "dev": true, "engines": { "node": ">=10.13.0" } @@ -6939,6 +6811,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "dev": true, "dependencies": { "is-bigint": "^1.0.1", "is-boolean-object": "^1.1.0", @@ -6954,6 +6827,7 @@ "version": "1.1.8", "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz", "integrity": "sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==", + "dev": true, "dependencies": { "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", @@ -7012,6 +6886,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "dev": true, "engines": { "node": ">=0.4" } @@ -7218,9 +7093,10 @@ "optional": true }, "@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", + "dev": true, "requires": { "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -7228,36 +7104,41 @@ } }, "@jridgewell/resolve-uri": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz", - "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", + "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "dev": true }, "@jridgewell/set-array": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==" + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "dev": true }, "@jridgewell/source-map": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", - "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz", + "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==", + "dev": true, "requires": { "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" } }, "@jridgewell/sourcemap-codec": { - "version": "1.4.13", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz", - "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==" + "version": "1.4.14", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", + "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", + "dev": true }, "@jridgewell/trace-mapping": { - "version": "0.3.13", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz", - "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==", + "version": "0.3.18", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz", + "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==", + "dev": true, "requires": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/resolve-uri": "3.1.0", + "@jridgewell/sourcemap-codec": "1.4.14" } }, "@jspm/core": { @@ -7266,6 +7147,12 @@ "integrity": "sha512-Lg3PnLp0QXpxwLIAuuJboLeRaIhrgJjeuh797QADg3xz8wGLugQOS5DpsE8A6i6Adgzf+bacllkKZG3J0tGfDw==", "dev": true }, + "@leichtgewicht/ip-codec": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz", + "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==", + "dev": true + }, "@mlabs-haskell/csl-gc-wrapper": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@mlabs-haskell/csl-gc-wrapper/-/csl-gc-wrapper-1.0.1.tgz", @@ -7289,32 +7176,6 @@ "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.0.tgz", "integrity": "sha512-kbacwGSsH/CTout0ZnZWxnW1B+jH/7r/WAAKLBtrRJ/+CUH7lgmQzl3GTrQua3SGKWNSDsS6lmjnDpIJ5Dxyaw==" }, - "@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - } - }, - "@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true - }, - "@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "requires": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - } - }, "@textlint/ast-node-types": { "version": "12.2.2", "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.2.2.tgz", @@ -7397,6 +7258,7 @@ "version": "8.4.3", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.3.tgz", "integrity": "sha512-YP1S7YJRMPs+7KZKDb9G63n8YejIwW9BALq7a5j2+H4yl6iOv9CB29edho+cuFRrvmJbbaH2yiVChKLJVysDGw==", + "dev": true, "requires": { "@types/estree": "*", "@types/json-schema": "*" @@ -7406,15 +7268,17 @@ "version": "3.7.3", "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz", "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==", + "dev": true, "requires": { "@types/eslint": "*", "@types/estree": "*" } }, "@types/estree": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz", - "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz", + "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==", + "dev": true }, "@types/express": { "version": "4.17.13", @@ -7457,7 +7321,8 @@ "@types/json-schema": { "version": "7.0.11", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==" + "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "dev": true }, "@types/mdast": { "version": "3.0.10", @@ -7477,7 +7342,8 @@ "@types/node": { "version": "17.0.35", "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.35.tgz", - "integrity": "sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==" + "integrity": "sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==", + "devOptional": true }, "@types/qs": { "version": "6.9.7", @@ -7532,9 +7398,9 @@ "dev": true }, "@types/ws": { - "version": "8.5.3", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz", - "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==", + "version": "8.5.5", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz", + "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==", "dev": true, "requires": { "@types/node": "*" @@ -7550,168 +7416,192 @@ } }, "@webassemblyjs/ast": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", - "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", + "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", + "dev": true, "requires": { - "@webassemblyjs/helper-numbers": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1" + "@webassemblyjs/helper-numbers": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6" } }, "@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", - "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==" + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", + "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", + "dev": true }, "@webassemblyjs/helper-api-error": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", - "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==" + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", + "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", + "dev": true }, "@webassemblyjs/helper-buffer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", - "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==" + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", + "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==", + "dev": true }, "@webassemblyjs/helper-numbers": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", - "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", + "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", + "dev": true, "requires": { - "@webassemblyjs/floating-point-hex-parser": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", + "@webassemblyjs/floating-point-hex-parser": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", "@xtuc/long": "4.2.2" } }, "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", - "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==" + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", + "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", + "dev": true }, "@webassemblyjs/helper-wasm-section": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", - "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", + "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", + "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6" } }, "@webassemblyjs/ieee754": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", - "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", + "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", + "dev": true, "requires": { "@xtuc/ieee754": "^1.2.0" } }, "@webassemblyjs/leb128": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", - "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", + "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", + "dev": true, "requires": { "@xtuc/long": "4.2.2" } }, "@webassemblyjs/utf8": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", - "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==" + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", + "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", + "dev": true }, "@webassemblyjs/wasm-edit": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", - "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", + "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", + "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/helper-wasm-section": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-opt": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "@webassemblyjs/wast-printer": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-opt": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6", + "@webassemblyjs/wast-printer": "1.11.6" } }, "@webassemblyjs/wasm-gen": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", - "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", + "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", + "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "@webassemblyjs/wasm-opt": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", - "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", + "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", + "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6" } }, "@webassemblyjs/wasm-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", - "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", + "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", + "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "@webassemblyjs/wast-printer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", - "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", + "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", + "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/ast": "1.11.6", "@xtuc/long": "4.2.2" } }, "@webpack-cli/configtest": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz", - "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz", + "integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==", "dev": true, "requires": {} }, "@webpack-cli/info": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz", - "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz", + "integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==", "dev": true, - "requires": { - "envinfo": "^7.7.3" - } + "requires": {} }, "@webpack-cli/serve": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz", - "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz", + "integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==", "dev": true, "requires": {} }, "@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==" + "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", + "dev": true }, "@xtuc/long": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" + "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", + "dev": true + }, + "abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "dev": true, + "requires": { + "event-target-shim": "^5.0.0" + } }, "accepts": { "version": "1.3.8", @@ -7724,14 +7614,16 @@ } }, "acorn": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", - "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==" + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", + "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", + "dev": true }, "acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", + "dev": true, "requires": {} }, "agent-base": { @@ -7757,20 +7649,11 @@ } } }, - "aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "requires": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - } - }, "ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -7811,6 +7694,7 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "dev": true, "requires": {} }, "anchor-markdown-header": { @@ -7860,16 +7744,11 @@ "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", "dev": true }, - "array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true - }, "asn1.js": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", + "dev": true, "requires": { "bn.js": "^4.0.0", "inherits": "^2.0.1", @@ -7880,7 +7759,8 @@ "bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true } } }, @@ -7888,6 +7768,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz", "integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==", + "dev": true, "requires": { "es6-object-assign": "^1.1.0", "is-nan": "^1.2.1", @@ -7895,19 +7776,11 @@ "util": "^0.12.0" } }, - "async": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", - "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", - "dev": true, - "requires": { - "lodash": "^4.17.14" - } - }, "available-typed-arrays": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==" + "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", + "dev": true }, "bail": { "version": "1.0.5", @@ -7984,7 +7857,8 @@ "bn.js": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", - "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" + "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==", + "dev": true }, "body-parser": { "version": "1.20.0", @@ -8014,18 +7888,16 @@ } } }, - "bonjour": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", - "integrity": "sha512-RaVTblr+OnEli0r/ud8InrU7D+G0y6aJhlxaLa6Pwty4+xoxboF1BsUI45tujvRpbj9dQVoglChqonGAsjEBYg==", + "bonjour-service": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz", + "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==", "dev": true, "requires": { - "array-flatten": "^2.1.0", - "deep-equal": "^1.0.1", + "array-flatten": "^2.1.2", "dns-equal": "^1.0.0", - "dns-txt": "^2.0.2", - "multicast-dns": "^6.0.1", - "multicast-dns-service-types": "^1.1.0" + "fast-deep-equal": "^3.1.3", + "multicast-dns": "^7.2.5" } }, "boolbase": { @@ -8055,12 +7927,14 @@ "brorand": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==" + "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==", + "dev": true }, "browserify-aes": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", + "dev": true, "requires": { "buffer-xor": "^1.0.3", "cipher-base": "^1.0.0", @@ -8074,6 +7948,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", + "dev": true, "requires": { "browserify-aes": "^1.0.4", "browserify-des": "^1.0.0", @@ -8084,6 +7959,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", + "dev": true, "requires": { "cipher-base": "^1.0.1", "des.js": "^1.0.0", @@ -8095,6 +7971,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz", "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==", + "dev": true, "requires": { "bn.js": "^5.0.0", "randombytes": "^2.0.1" @@ -8104,6 +7981,7 @@ "version": "4.2.1", "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", + "dev": true, "requires": { "bn.js": "^5.1.1", "browserify-rsa": "^4.0.1", @@ -8120,6 +7998,7 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", + "dev": true, "requires": { "pako": "~1.0.5" } @@ -8128,6 +8007,7 @@ "version": "4.21.0", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.0.tgz", "integrity": "sha512-UQxE0DIhRB5z/zDz9iA03BOfxaN2+GQdBYH/2WrSIWEUrnpzTPJbhqt+umq6r3acaPRTW1FNTkrcp0PXgtFkvA==", + "dev": true, "requires": { "caniuse-lite": "^1.0.30001358", "electron-to-chromium": "^1.4.164", @@ -8139,6 +8019,7 @@ "version": "6.0.3", "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "dev": true, "requires": { "base64-js": "^1.3.1", "ieee754": "^1.2.1" @@ -8152,18 +8033,14 @@ "buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" - }, - "buffer-indexof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz", - "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, "buffer-xor": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", - "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==" + "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==", + "dev": true }, "bufferutil": { "version": "4.0.5", @@ -8176,7 +8053,8 @@ "builtin-status-codes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", - "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==" + "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==", + "dev": true }, "bytes": { "version": "3.0.0", @@ -8188,6 +8066,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, "requires": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" @@ -8206,7 +8085,8 @@ "caniuse-lite": { "version": "1.0.30001358", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001358.tgz", - "integrity": "sha512-hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw==" + "integrity": "sha512-hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw==", + "dev": true }, "ccount": { "version": "1.1.0", @@ -8256,12 +8136,14 @@ "chrome-trace-event": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", - "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==" + "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", + "dev": true }, "cipher-base": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", + "dev": true, "requires": { "inherits": "^2.0.1", "safe-buffer": "^5.0.1" @@ -8276,12 +8158,6 @@ "source-map": "~0.6.0" } }, - "clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true - }, "clone-deep": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", @@ -8343,20 +8219,22 @@ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, "connect-history-api-fallback": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", - "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz", + "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==", "dev": true }, "console-browserify": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", - "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" + "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==", + "dev": true }, "constants-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", - "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==" + "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==", + "dev": true }, "content-disposition": { "version": "0.5.4", @@ -8395,6 +8273,7 @@ "version": "4.0.4", "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", + "dev": true, "requires": { "bn.js": "^4.1.0", "elliptic": "^6.5.3" @@ -8403,7 +8282,8 @@ "bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true } } }, @@ -8411,6 +8291,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", + "dev": true, "requires": { "cipher-base": "^1.0.1", "inherits": "^2.0.1", @@ -8423,6 +8304,7 @@ "version": "1.1.7", "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", + "dev": true, "requires": { "cipher-base": "^1.0.3", "create-hash": "^1.1.0", @@ -8455,6 +8337,7 @@ "version": "3.12.0", "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", + "dev": true, "requires": { "browserify-cipher": "^1.0.0", "browserify-sign": "^4.0.0", @@ -8497,20 +8380,6 @@ "ms": "2.0.0" } }, - "deep-equal": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", - "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", - "dev": true, - "requires": { - "is-arguments": "^1.0.4", - "is-date-object": "^1.0.1", - "is-regex": "^1.0.4", - "object-is": "^1.0.1", - "object-keys": "^1.1.1", - "regexp.prototype.flags": "^1.2.0" - } - }, "default-gateway": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz", @@ -8530,27 +8399,12 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", + "dev": true, "requires": { "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" } }, - "del": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz", - "integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==", - "dev": true, - "requires": { - "globby": "^11.0.1", - "graceful-fs": "^4.2.4", - "is-glob": "^4.0.1", - "is-path-cwd": "^2.2.0", - "is-path-inside": "^3.0.2", - "p-map": "^4.0.0", - "rimraf": "^3.0.2", - "slash": "^3.0.0" - } - }, "depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -8561,6 +8415,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", + "dev": true, "requires": { "inherits": "^2.0.1", "minimalistic-assert": "^1.0.0" @@ -8587,6 +8442,7 @@ "version": "5.0.3", "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", + "dev": true, "requires": { "bn.js": "^4.1.0", "miller-rabin": "^4.0.0", @@ -8596,19 +8452,11 @@ "bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true } } }, - "dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "requires": { - "path-type": "^4.0.0" - } - }, "dns-equal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", @@ -8616,22 +8464,12 @@ "dev": true }, "dns-packet": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz", - "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==", - "dev": true, - "requires": { - "ip": "^1.1.0", - "safe-buffer": "^5.0.1" - } - }, - "dns-txt": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz", - "integrity": "sha512-Ix5PrWjphuSoUXV/Zv5gaFHjnaJtb02F2+Si3Ht9dyJ87+Z/lMmy+dpNHtTGraNK958ndXq2i+GLkWsWHcKaBQ==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.0.tgz", + "integrity": "sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ==", "dev": true, "requires": { - "buffer-indexof": "^1.0.0" + "@leichtgewicht/ip-codec": "^2.0.1" } }, "doctoc": { @@ -8691,7 +8529,8 @@ "domain-browser": { "version": "4.22.0", "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-4.22.0.tgz", - "integrity": "sha512-IGBwjF7tNk3cwypFNH/7bfzBcgSCbaMOD3GsaY1AU/JRrnHnYgEM0+9kQt52iZxjNsjBtJYtao146V+f8jFZNw==" + "integrity": "sha512-IGBwjF7tNk3cwypFNH/7bfzBcgSCbaMOD3GsaY1AU/JRrnHnYgEM0+9kQt52iZxjNsjBtJYtao146V+f8jFZNw==", + "dev": true }, "domelementtype": { "version": "2.3.0", @@ -8738,12 +8577,14 @@ "electron-to-chromium": { "version": "1.4.167", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.167.tgz", - "integrity": "sha512-lPHuHXBwpkr4RcfaZBKm6TKOWG/1N9mVggUpP4fY3l1JIUU2x4fkM8928smYdZ5lF+6KCTAxo1aK9JmqT+X71Q==" + "integrity": "sha512-lPHuHXBwpkr4RcfaZBKm6TKOWG/1N9mVggUpP4fY3l1JIUU2x4fkM8928smYdZ5lF+6KCTAxo1aK9JmqT+X71Q==", + "dev": true }, "elliptic": { "version": "6.5.4", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", + "dev": true, "requires": { "bn.js": "^4.11.9", "brorand": "^1.1.0", @@ -8757,7 +8598,8 @@ "bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true } } }, @@ -8782,9 +8624,10 @@ } }, "enhanced-resolve": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz", - "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", + "dev": true, "requires": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -8797,15 +8640,16 @@ "dev": true }, "envinfo": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz", - "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.10.0.tgz", + "integrity": "sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==", "dev": true }, "es-abstract": { "version": "1.20.1", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz", "integrity": "sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==", + "dev": true, "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", @@ -8833,14 +8677,16 @@ } }, "es-module-lexer": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", - "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==" + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz", + "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==", + "dev": true }, "es-to-primitive": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, "requires": { "is-callable": "^1.1.4", "is-date-object": "^1.0.1", @@ -8850,7 +8696,8 @@ "es6-object-assign": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz", - "integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==" + "integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==", + "dev": true }, "esbuild": { "version": "0.18.11", @@ -8901,7 +8748,8 @@ "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true }, "escape-html": { "version": "1.0.3", @@ -8919,6 +8767,7 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, "requires": { "esrecurse": "^4.3.0", "estraverse": "^4.1.1" @@ -8928,6 +8777,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, "requires": { "estraverse": "^5.2.0" }, @@ -8935,14 +8785,16 @@ "estraverse": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true } } }, "estraverse": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true }, "etag": { "version": "1.8.1", @@ -8950,6 +8802,12 @@ "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", "dev": true }, + "event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", + "dev": true + }, "eventemitter3": { "version": "4.0.7", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", @@ -8959,12 +8817,14 @@ "events": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==" + "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", + "dev": true }, "evp_bytestokey": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", + "dev": true, "requires": { "md5.js": "^1.3.4", "safe-buffer": "^5.1.1" @@ -9077,25 +8937,14 @@ "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" - }, - "fast-glob": { - "version": "3.2.11", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", - "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - } + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true }, "fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true }, "fastest-levenshtein": { "version": "1.0.14", @@ -9103,15 +8952,6 @@ "integrity": "sha512-tFfWHjnuUfKE186Tfgr+jtaFc0mZTApEgKDOeyN+FwOqRkO/zK/3h1AiRd8u8CY53owL3CUmGr/oI9p/RdyLTA==", "dev": true }, - "fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", - "dev": true, - "requires": { - "reusify": "^1.0.4" - } - }, "fault": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz", @@ -9150,7 +8990,8 @@ "filter-obj": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-2.0.2.tgz", - "integrity": "sha512-lO3ttPjHZRfjMcxWKb1j1eDhTFsu4meeR3lnMcnBFhk6RuLhvEiuALu2TlfL310ph4lCYYwgF/ElIjdP739tdg==" + "integrity": "sha512-lO3ttPjHZRfjMcxWKb1j1eDhTFsu4meeR3lnMcnBFhk6RuLhvEiuALu2TlfL310ph4lCYYwgF/ElIjdP739tdg==", + "dev": true }, "finalhandler": { "version": "1.2.0", @@ -9186,6 +9027,7 @@ "version": "0.3.3", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "dev": true, "requires": { "is-callable": "^1.1.3" } @@ -9234,12 +9076,14 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true }, "function.prototype.name": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", @@ -9250,12 +9094,14 @@ "functions-have-names": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==" + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true }, "get-intrinsic": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "dev": true, "requires": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -9272,6 +9118,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "dev": true, "requires": { "call-bind": "^1.0.2", "get-intrinsic": "^1.1.1" @@ -9302,26 +9149,14 @@ "glob-to-regexp": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" - }, - "globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "requires": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - } + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", + "dev": true }, "graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "dev": true }, "handle-thing": { "version": "2.0.1", @@ -9333,6 +9168,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, "requires": { "function-bind": "^1.1.1" } @@ -9340,17 +9176,20 @@ "has-bigints": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==" + "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", + "dev": true }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true }, "has-property-descriptors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "dev": true, "requires": { "get-intrinsic": "^1.1.1" } @@ -9358,12 +9197,14 @@ "has-symbols": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "dev": true }, "has-tostringtag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "dev": true, "requires": { "has-symbols": "^1.0.2" } @@ -9372,6 +9213,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz", "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", + "dev": true, "requires": { "inherits": "^2.0.4", "readable-stream": "^3.6.0", @@ -9382,6 +9224,7 @@ "version": "1.1.7", "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", + "dev": true, "requires": { "inherits": "^2.0.3", "minimalistic-assert": "^1.0.1" @@ -9397,6 +9240,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", + "dev": true, "requires": { "hash.js": "^1.0.3", "minimalistic-assert": "^1.0.0", @@ -9469,9 +9313,9 @@ } }, "html-webpack-plugin": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz", - "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==", + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz", + "integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==", "dev": true, "requires": { "@types/html-minifier-terser": "^6.0.0", @@ -9545,7 +9389,8 @@ "https-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", - "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==" + "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==", + "dev": true }, "https-proxy-agent": { "version": "5.0.1", @@ -9591,12 +9436,6 @@ "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" }, - "ignore": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", - "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", - "dev": true - }, "import-local": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", @@ -9613,12 +9452,6 @@ "integrity": "sha512-4IwhLhNNA8yy445rPjD/lWh++7hMDOml2eHtd58eG7h+qK3EryMuuRbsHGPikCoAgIkkDnckKfWSk2iDla/ejg==", "dev": true }, - "indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true - }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -9637,6 +9470,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz", "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==", + "dev": true, "requires": { "get-intrinsic": "^1.1.0", "has": "^1.0.3", @@ -9644,15 +9478,9 @@ } }, "interpret": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz", - "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==", - "dev": true - }, - "ip": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz", - "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz", + "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==", "dev": true }, "ipaddr.js": { @@ -9681,6 +9509,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", + "dev": true, "requires": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -9690,6 +9519,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "dev": true, "requires": { "has-bigints": "^1.0.1" } @@ -9707,6 +9537,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "dev": true, "requires": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -9721,12 +9552,13 @@ "is-callable": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", - "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==" + "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", + "dev": true }, "is-core-module": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", - "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz", + "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==", "dev": true, "requires": { "has": "^1.0.3" @@ -9736,6 +9568,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "dev": true, "requires": { "has-tostringtag": "^1.0.0" } @@ -9762,6 +9595,7 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", + "dev": true, "requires": { "has-tostringtag": "^1.0.0" } @@ -9785,6 +9619,7 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz", "integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==", + "dev": true, "requires": { "call-bind": "^1.0.0", "define-properties": "^1.1.3" @@ -9793,7 +9628,8 @@ "is-negative-zero": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==" + "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", + "dev": true }, "is-number": { "version": "7.0.0", @@ -9805,22 +9641,11 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", + "dev": true, "requires": { "has-tostringtag": "^1.0.0" } }, - "is-path-cwd": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", - "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==", - "dev": true - }, - "is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true - }, "is-plain-obj": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", @@ -9840,6 +9665,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, "requires": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -9849,6 +9675,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", + "dev": true, "requires": { "call-bind": "^1.0.2" } @@ -9863,6 +9690,7 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "dev": true, "requires": { "has-tostringtag": "^1.0.0" } @@ -9871,6 +9699,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", + "dev": true, "requires": { "has-symbols": "^1.0.2" } @@ -9879,6 +9708,7 @@ "version": "1.1.9", "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz", "integrity": "sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==", + "dev": true, "requires": { "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", @@ -9891,6 +9721,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", + "dev": true, "requires": { "call-bind": "^1.0.2" } @@ -9926,21 +9757,24 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", + "dev": true, "requires": { "@types/node": "*", "merge-stream": "^2.0.0", "supports-color": "^8.0.0" } }, - "json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" + "json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true }, "jssha": { "version": "3.2.0", @@ -9953,10 +9787,21 @@ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true }, + "launch-editor": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz", + "integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==", + "dev": true, + "requires": { + "picocolors": "^1.0.0", + "shell-quote": "^1.7.3" + } + }, "loader-runner": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", - "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==" + "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", + "dev": true }, "locate-path": { "version": "5.0.0", @@ -10000,6 +9845,7 @@ "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", + "dev": true, "requires": { "hash-base": "^3.0.0", "inherits": "^2.0.1", @@ -10145,12 +9991,7 @@ "merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" - }, - "merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", "dev": true }, "methods": { @@ -10274,6 +10115,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", + "dev": true, "requires": { "bn.js": "^4.0.0", "brorand": "^1.0.1" @@ -10282,7 +10124,8 @@ "bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true } } }, @@ -10295,12 +10138,14 @@ "mime-db": { "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true }, "mime-types": { "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, "requires": { "mime-db": "1.52.0" } @@ -10314,12 +10159,14 @@ "minimalistic-assert": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", + "dev": true }, "minimalistic-crypto-utils": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==" + "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==", + "dev": true }, "minimatch": { "version": "3.1.2", @@ -10335,15 +10182,6 @@ "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, - "mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "requires": { - "minimist": "^1.2.6" - } - }, "mkdirp-classic": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", @@ -10356,21 +10194,15 @@ "dev": true }, "multicast-dns": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz", - "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==", + "version": "7.2.5", + "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz", + "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==", "dev": true, "requires": { - "dns-packet": "^1.3.1", + "dns-packet": "^5.2.2", "thunky": "^1.0.2" } }, - "multicast-dns-service-types": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", - "integrity": "sha512-cnAsSVxIDsYt0v7HmC0hWZFwwXSh+E6PgCrREDuN/EsjgLwA5XRmlMHhSiDPrt6HxY1gTivEa/Zh7GtODoLevQ==", - "dev": true - }, "negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", @@ -10380,7 +10212,8 @@ "neo-async": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true }, "no-case": { "version": "3.0.4", @@ -10433,9 +10266,10 @@ "integrity": "sha512-amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ==" }, "node-polyfill-webpack-plugin": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/node-polyfill-webpack-plugin/-/node-polyfill-webpack-plugin-1.1.4.tgz", - "integrity": "sha512-Z0XTKj1wRWO8o/Vjobsw5iOJCN+Sua3EZEUc2Ziy9CyVvmHKu6o+t4gUH9GOE0czyPR94LI6ZCV/PpcM8b5yow==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/node-polyfill-webpack-plugin/-/node-polyfill-webpack-plugin-2.0.1.tgz", + "integrity": "sha512-ZUMiCnZkP1LF0Th2caY6J/eKKoA0TefpoVa68m/LQU1I/mE8rGt4fNYGgNuCcK+aG8P8P43nbeJ2RqJMOL/Y1A==", + "dev": true, "requires": { "assert": "^2.0.0", "browserify-zlib": "^0.2.0", @@ -10443,7 +10277,7 @@ "console-browserify": "^1.2.0", "constants-browserify": "^1.0.0", "crypto-browserify": "^3.12.0", - "domain-browser": "^4.19.0", + "domain-browser": "^4.22.0", "events": "^3.3.0", "filter-obj": "^2.0.2", "https-browserify": "^1.0.0", @@ -10452,21 +10286,38 @@ "process": "^0.11.10", "punycode": "^2.1.1", "querystring-es3": "^0.2.1", - "readable-stream": "^3.6.0", + "readable-stream": "^4.0.0", "stream-browserify": "^3.0.0", "stream-http": "^3.2.0", "string_decoder": "^1.3.0", "timers-browserify": "^2.0.12", "tty-browserify": "^0.0.1", + "type-fest": "^2.14.0", "url": "^0.11.0", "util": "^0.12.4", "vm-browserify": "^1.1.2" + }, + "dependencies": { + "readable-stream": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.2.tgz", + "integrity": "sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==", + "dev": true, + "requires": { + "abort-controller": "^3.0.0", + "buffer": "^6.0.3", + "events": "^3.3.0", + "process": "^0.11.10", + "string_decoder": "^1.3.0" + } + } } }, "node-releases": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz", - "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==" + "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==", + "dev": true }, "normalize-path": { "version": "3.0.0", @@ -10495,12 +10346,14 @@ "object-inspect": { "version": "1.12.1", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.1.tgz", - "integrity": "sha512-Y/jF6vnvEtOPGiKD1+q+X0CiUYRQtEHp89MLLUJ7TUivtH8Ugn2+3A7Rynqk7BRsAoqeOQWnFnjpDrKSxDgIGA==" + "integrity": "sha512-Y/jF6vnvEtOPGiKD1+q+X0CiUYRQtEHp89MLLUJ7TUivtH8Ugn2+3A7Rynqk7BRsAoqeOQWnFnjpDrKSxDgIGA==", + "dev": true }, "object-is": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", + "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3" @@ -10509,12 +10362,14 @@ "object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true }, "object.assign": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "dev": true, "requires": { "call-bind": "^1.0.0", "define-properties": "^1.1.3", @@ -10574,7 +10429,8 @@ "os-browserify": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", - "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==" + "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==", + "dev": true }, "p-limit": { "version": "2.3.0", @@ -10592,15 +10448,6 @@ "p-limit": "^2.2.0" } }, - "p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "requires": { - "aggregate-error": "^3.0.0" - } - }, "p-retry": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz", @@ -10619,7 +10466,8 @@ "pako": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", - "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "dev": true }, "param-case": { "version": "3.0.4", @@ -10635,6 +10483,7 @@ "version": "5.1.6", "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", + "dev": true, "requires": { "asn1.js": "^5.2.0", "browserify-aes": "^1.0.0", @@ -10676,7 +10525,8 @@ "path-browserify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", - "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==" + "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==", + "dev": true }, "path-exists": { "version": "4.0.0", @@ -10706,16 +10556,11 @@ "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", "dev": true }, - "path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true - }, "pbkdf2": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==", + "dev": true, "requires": { "create-hash": "^1.1.2", "create-hmac": "^1.1.4", @@ -10732,7 +10577,8 @@ "picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true }, "picomatch": { "version": "2.3.1", @@ -10748,34 +10594,6 @@ "find-up": "^4.0.0" } }, - "portfinder": { - "version": "1.0.28", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", - "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==", - "dev": true, - "requires": { - "async": "^2.6.2", - "debug": "^3.1.1", - "mkdirp": "^0.5.5" - }, - "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true - } - } - }, "pretty-error": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz", @@ -10789,7 +10607,8 @@ "process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==" + "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", + "dev": true }, "process-nextick-args": { "version": "2.0.1", @@ -10829,6 +10648,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", + "dev": true, "requires": { "bn.js": "^4.1.0", "browserify-rsa": "^4.0.0", @@ -10841,7 +10661,8 @@ "bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true } } }, @@ -10857,7 +10678,8 @@ "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true }, "puppeteer-core": { "version": "15.3.2", @@ -10911,23 +10733,20 @@ "querystring": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==" + "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==", + "dev": true }, "querystring-es3": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", - "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==" - }, - "queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==", "dev": true }, "randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, "requires": { "safe-buffer": "^5.1.0" } @@ -10936,6 +10755,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", + "dev": true, "requires": { "randombytes": "^2.0.5", "safe-buffer": "^5.1.0" @@ -10987,12 +10807,12 @@ } }, "rechoir": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", - "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz", + "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==", "dev": true, "requires": { - "resolve": "^1.9.0" + "resolve": "^1.20.0" } }, "reconnecting-websocket": { @@ -11004,6 +10824,7 @@ "version": "1.4.3", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", + "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", @@ -11087,12 +10908,12 @@ "dev": true }, "resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "version": "1.22.2", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz", + "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==", "dev": true, "requires": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.11.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" } @@ -11118,12 +10939,6 @@ "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", "dev": true }, - "reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true - }, "rimraf": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", @@ -11136,20 +10951,12 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", + "dev": true, "requires": { "hash-base": "^3.0.0", "inherits": "^2.0.1" } }, - "run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "requires": { - "queue-microtask": "^1.2.2" - } - }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -11158,12 +10965,14 @@ "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true }, "schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", + "dev": true, "requires": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", @@ -11177,9 +10986,9 @@ "dev": true }, "selfsigned": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.1.tgz", - "integrity": "sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz", + "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==", "dev": true, "requires": { "node-forge": "^1" @@ -11215,9 +11024,10 @@ } }, "serialize-javascript": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", + "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", + "dev": true, "requires": { "randombytes": "^2.1.0" } @@ -11290,7 +11100,8 @@ "setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==" + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", + "dev": true }, "setprototypeof": { "version": "1.2.0", @@ -11302,6 +11113,7 @@ "version": "2.4.11", "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", + "dev": true, "requires": { "inherits": "^2.0.1", "safe-buffer": "^5.0.1" @@ -11331,10 +11143,17 @@ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true }, + "shell-quote": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", + "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", + "dev": true + }, "side-channel": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "dev": true, "requires": { "call-bind": "^1.0.0", "get-intrinsic": "^1.0.2", @@ -11347,12 +11166,6 @@ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, "sockjs": { "version": "0.3.24", "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz", @@ -11367,12 +11180,14 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true }, "source-map-support": { "version": "0.5.21", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -11449,6 +11264,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz", "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==", + "dev": true, "requires": { "inherits": "~2.0.4", "readable-stream": "^3.5.0" @@ -11458,6 +11274,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz", "integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==", + "dev": true, "requires": { "builtin-status-codes": "^3.0.0", "inherits": "^2.0.4", @@ -11477,6 +11294,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz", "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==", + "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.4", @@ -11487,6 +11305,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz", "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==", + "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.4", @@ -11512,6 +11331,7 @@ "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -11525,7 +11345,8 @@ "tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", - "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", + "dev": true }, "tar-fs": { "version": "2.1.1", @@ -11551,12 +11372,13 @@ } }, "terser": { - "version": "5.15.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz", - "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==", + "version": "5.18.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.18.2.tgz", + "integrity": "sha512-Ah19JS86ypbJzTzvUCX7KOsEIhDaRONungA4aYBjEP3JZRf4ocuDzTg4QWZnPn9DEMiMYGJPiSOy7aykoCc70w==", + "dev": true, "requires": { - "@jridgewell/source-map": "^0.3.2", - "acorn": "^8.5.0", + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", "commander": "^2.20.0", "source-map-support": "~0.5.20" }, @@ -11564,20 +11386,22 @@ "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true } } }, "terser-webpack-plugin": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz", - "integrity": "sha512-Fx60G5HNYknNTNQnzQ1VePRuu89ZVYWfjRAeT5rITuCY/1b08s49e5kSQwHDirKZWuoKOBRFS98EUUoZ9kLEwQ==", + "version": "5.3.9", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz", + "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==", + "dev": true, "requires": { - "@jridgewell/trace-mapping": "^0.3.7", + "@jridgewell/trace-mapping": "^0.3.17", "jest-worker": "^27.4.5", "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.0", - "terser": "^5.7.2" + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } }, "through": { @@ -11595,6 +11419,7 @@ "version": "2.0.12", "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz", "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==", + "dev": true, "requires": { "setimmediate": "^1.0.4" } @@ -11635,7 +11460,14 @@ "tty-browserify": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz", - "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==" + "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==", + "dev": true + }, + "type-fest": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", + "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", + "dev": true }, "type-is": { "version": "1.6.18", @@ -11651,6 +11483,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", + "dev": true, "requires": { "call-bind": "^1.0.2", "has-bigints": "^1.0.2", @@ -11746,6 +11579,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.3.tgz", "integrity": "sha512-ufSazemeh9Gty0qiWtoRpJ9F5Q5W3xdIPm1UZQqYQv/q0Nyb9EMHUB2lu+O9x1re9WsorpMAUu4Y6Lxcs5n+XQ==", + "dev": true, "requires": { "escalade": "^3.1.1", "picocolors": "^1.0.0" @@ -11761,6 +11595,7 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, "requires": { "punycode": "^2.1.0" } @@ -11769,6 +11604,7 @@ "version": "0.11.0", "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==", + "dev": true, "requires": { "punycode": "1.3.2", "querystring": "0.2.0" @@ -11777,7 +11613,8 @@ "punycode": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==" + "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==", + "dev": true } } }, @@ -11785,6 +11622,7 @@ "version": "0.12.4", "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz", "integrity": "sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==", + "dev": true, "requires": { "inherits": "^2.0.3", "is-arguments": "^1.0.4", @@ -11848,12 +11686,14 @@ "vm-browserify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", - "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==" + "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==", + "dev": true }, "watchpack": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz", - "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", + "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", + "dev": true, "requires": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" @@ -11869,60 +11709,62 @@ } }, "webpack": { - "version": "5.67.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.67.0.tgz", - "integrity": "sha512-LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw==", - "requires": { - "@types/eslint-scope": "^3.7.0", - "@types/estree": "^0.0.50", - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/wasm-edit": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "acorn": "^8.4.1", - "acorn-import-assertions": "^1.7.6", + "version": "5.88.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.1.tgz", + "integrity": "sha512-FROX3TxQnC/ox4N+3xQoWZzvGXSuscxR32rbzjpXgEzWudJFEJBpdlkkob2ylrv5yzzufD1zph1OoFsLtm6stQ==", + "dev": true, + "requires": { + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.8.3", - "es-module-lexer": "^0.9.0", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.2.9", - "json-parse-better-errors": "^1.0.2", + "json-parse-even-better-errors": "^2.3.1", "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", - "schema-utils": "^3.1.0", + "schema-utils": "^3.2.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.1.3", - "watchpack": "^2.3.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", "webpack-sources": "^3.2.3" } }, "webpack-cli": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz", - "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz", + "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==", "dev": true, "requires": { "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^1.2.0", - "@webpack-cli/info": "^1.5.0", - "@webpack-cli/serve": "^1.7.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", "colorette": "^2.0.14", - "commander": "^7.0.0", + "commander": "^10.0.1", "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", "fastest-levenshtein": "^1.0.12", "import-local": "^3.0.2", - "interpret": "^2.2.0", - "rechoir": "^0.7.0", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", "webpack-merge": "^5.7.3" }, "dependencies": { "commander": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", "dev": true } } @@ -11982,41 +11824,41 @@ } }, "webpack-dev-server": { - "version": "4.7.4", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.7.4.tgz", - "integrity": "sha512-nfdsb02Zi2qzkNmgtZjkrMOcXnYZ6FLKcQwpxT7MvmHKc+oTtDsBju8j+NMyAygZ9GW1jMEUpy3itHtqgEhe1A==", + "version": "4.15.1", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz", + "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==", "dev": true, "requires": { "@types/bonjour": "^3.5.9", "@types/connect-history-api-fallback": "^1.3.5", "@types/express": "^4.17.13", "@types/serve-index": "^1.9.1", + "@types/serve-static": "^1.13.10", "@types/sockjs": "^0.3.33", - "@types/ws": "^8.2.2", + "@types/ws": "^8.5.5", "ansi-html-community": "^0.0.8", - "bonjour": "^3.5.0", + "bonjour-service": "^1.0.11", "chokidar": "^3.5.3", "colorette": "^2.0.10", "compression": "^1.7.4", - "connect-history-api-fallback": "^1.6.0", + "connect-history-api-fallback": "^2.0.0", "default-gateway": "^6.0.3", - "del": "^6.0.0", - "express": "^4.17.1", + "express": "^4.17.3", "graceful-fs": "^4.2.6", "html-entities": "^2.3.2", - "http-proxy-middleware": "^2.0.0", + "http-proxy-middleware": "^2.0.3", "ipaddr.js": "^2.0.1", + "launch-editor": "^2.6.0", "open": "^8.0.9", "p-retry": "^4.5.0", - "portfinder": "^1.0.28", + "rimraf": "^3.0.2", "schema-utils": "^4.0.0", - "selfsigned": "^2.0.0", + "selfsigned": "^2.1.1", "serve-index": "^1.9.1", - "sockjs": "^0.3.21", + "sockjs": "^0.3.24", "spdy": "^4.0.2", - "strip-ansi": "^7.0.0", "webpack-dev-middleware": "^5.3.1", - "ws": "^8.4.2" + "ws": "^8.13.0" }, "dependencies": { "ajv": { @@ -12040,12 +11882,6 @@ "fast-deep-equal": "^3.1.3" } }, - "ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true - }, "json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", @@ -12064,19 +11900,10 @@ "ajv-keywords": "^5.0.0" } }, - "strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", - "dev": true, - "requires": { - "ansi-regex": "^6.0.1" - } - }, "ws": { - "version": "8.6.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz", - "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==", + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", + "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", "dev": true, "requires": {} } @@ -12095,7 +11922,8 @@ "webpack-sources": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==" + "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", + "dev": true }, "websocket-driver": { "version": "0.7.4", @@ -12127,6 +11955,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "dev": true, "requires": { "is-bigint": "^1.0.1", "is-boolean-object": "^1.1.0", @@ -12139,6 +11968,7 @@ "version": "1.1.8", "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz", "integrity": "sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==", + "dev": true, "requires": { "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", @@ -12173,7 +12003,8 @@ "xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "dev": true }, "yauzl": { "version": "2.10.0", diff --git a/package.json b/package.json index 98ac3febe0..a80fd416ef 100755 --- a/package.json +++ b/package.json @@ -26,8 +26,10 @@ "e2e-browser": "source ./test/e2e.env && spago run --main Test.Ctl.E2E -a 'e2e-test browser'", "e2e-pack-settings": "source ./test/e2e.env && spago run --main Test.Ctl.E2E -a 'e2e-test pack'", "e2e-unpack-settings": "source ./test/e2e.env && spago run --main Test.Ctl.E2E -a 'e2e-test unpack'", - "dev": "make run-dev", - "build": "make run-build" + "esbuild-bundle": "make esbuild-bundle", + "esbuild-serve": "make esbuild-serve", + "webpack-bundle": "make webpack-bundle", + "webpack-serve": "make webpack-serve" }, "author": "", "license": "MIT", @@ -48,7 +50,6 @@ "blakejs": "1.2.1", "bufferutil": "4.0.5", "jssha": "3.2.0", - "node-polyfill-webpack-plugin": "1.1.4", "puppeteer-core": "^15.3.2", "reconnecting-websocket": "4.4.0", "uniqid": "5.4.0", @@ -61,10 +62,11 @@ "esbuild": "0.18.11", "esbuild-plugin-polyfill-node": "^0.3.0", "esbuild-plugin-wasm": "^1.1.0", - "html-webpack-plugin": "5.5.0", - "webpack": "5.67.0", - "webpack-cli": "4.10", - "webpack-dev-server": "4.7.4" + "html-webpack-plugin": "5.5.3", + "node-polyfill-webpack-plugin": "2.0.1", + "webpack": "5.88.1", + "webpack-cli": "5.1.4", + "webpack-dev-server": "4.15.1" }, "prettier": { "arrowParens": "avoid" diff --git a/webpack.config.cjs b/webpack.config.cjs new file mode 100644 index 0000000000..2923bd7619 --- /dev/null +++ b/webpack.config.cjs @@ -0,0 +1,110 @@ +"use strict"; + +const path = require("path"); +const webpack = require("webpack"); +const HtmlWebpackPlugin = require("html-webpack-plugin"); +const NodePolyfillPlugin = require("node-polyfill-webpack-plugin"); + +module.exports = env => { + return { + mode: "development", + + experiments: { + asyncWebAssembly: false, + layers: false, + lazyCompilation: false, + outputModule: true, + syncWebAssembly: true, + topLevelAwait: true, + }, + + devtool: "eval-source-map", + + stats: { errorDetails: true }, + + devServer: { + static: { + directory: path.join(__dirname, "fixtures"), + }, + port: 4008, + proxy: { + "/kupo": { + // `KUPO_HOST` env variable must be set to the base URL of the Kupo + // service, otherwise all requests to Kupo will fail. + target: process.env.KUPO_HOST || "http://localhost:1442", + changeOrigin: true, + pathRewrite: { "^/kupo": "" }, + }, + }, + }, + + entry: env.entry, + + output: { + path: path.resolve(__dirname, "dist/webpack"), + filename: "bundle.js", + library: { + type: "module", + } + }, + + module: { + rules: [ + { + test: /\.(png|jpg|gif)$/i, + type: "asset", + }, + { + test: /\.plutus$/i, + type: "asset/source", + }, + ], + }, + + resolve: { + // We use node_modules provided by Nix shell via an environment variable + modules: [process.env.NODE_PATH], + extensions: [".js"], + fallback: { + buffer: require.resolve("buffer/"), + http: false, + url: false, + stream: false, + crypto: false, + https: false, + net: false, + tls: false, + zlib: false, + os: false, + path: false, + fs: false, + readline: false, + child_process: false, + }, + }, + + plugins: [ + new webpack.DefinePlugin({ + BROWSER_RUNTIME: !!process.env.BROWSER_RUNTIME, + SCRIPTS_DIR: '"scripts"' + }), + new NodePolyfillPlugin(), + new webpack.LoaderOptionsPlugin({ + debug: true, + }), + new HtmlWebpackPlugin({ + title: "cardano-transaction-lib-examples", + template: "./examples/index.html", + inject: false, // See stackoverflow.com/a/38292765/3067181 + }), + new webpack.ProvidePlugin({ + Buffer: ["buffer", "Buffer"], + }), + // ContextReplacementPlugin is used just to suppress a webpack warning: + // "Critical dependency: the request of a dependency is an expression" + // See https://stackoverflow.com/a/59235546/17365145 + new webpack.ContextReplacementPlugin(/cardano-serialization-lib-browser/), + new webpack.ContextReplacementPlugin(/cardano-serialization-lib-nodejs/), + ], + }; +}; diff --git a/webpack.config.js b/webpack.config.js deleted file mode 100644 index c99c50e067..0000000000 --- a/webpack.config.js +++ /dev/null @@ -1,107 +0,0 @@ -"use strict"; - -const path = require("path"); -const webpack = require("webpack"); -const HtmlWebpackPlugin = require("html-webpack-plugin"); -const NodePolyfillPlugin = require("node-polyfill-webpack-plugin"); - -module.exports = { - mode: "development", - - experiments: { - asyncWebAssembly: false, - layers: false, - lazyCompilation: false, - outputModule: true, - syncWebAssembly: true, - topLevelAwait: true, - }, - - devtool: "eval-source-map", - - stats: { errorDetails: true }, - - devServer: { - port: 4008, - proxy: { - "/kupo": { - // `KUPO_HOST` env variable must be set to the base URL of the Kupo - // service, otherwise all requests to Kupo will fail. - target: process.env.KUPO_HOST || "http://localhost:1442", - changeOrigin: true, - pathRewrite: { "^/kupo": "" }, - }, - }, - }, - - // we can add more entrypoints as needed - entry: "./examples/index.js", - - output: { - path: path.resolve(__dirname, "dist"), - filename: "bundle.js", - }, - - module: { - rules: [ - { - test: /\.(png|jpg|gif)$/i, - type: "asset", - }, - { - test: /\.plutus$/i, - type: "asset/source", - }, - ], - }, - - resolve: { - // We use node_modules provided by Nix shell via an environment variable - modules: [process.env.NODE_PATH], - extensions: [".js"], - fallback: { - buffer: require.resolve("buffer/"), - http: false, - url: false, - stream: false, - crypto: false, - https: false, - net: false, - tls: false, - zlib: false, - os: false, - path: false, - fs: false, - readline: false, - child_process: false, - }, - alias: { - // You should update this path to the location of your compiled scripts, - // relative to `webpack.config.js` - Scripts: path.resolve(__dirname, "fixtures/scripts"), - }, - }, - - plugins: [ - new webpack.DefinePlugin({ - BROWSER_RUNTIME: !!process.env.BROWSER_RUNTIME, - }), - new NodePolyfillPlugin(), - new webpack.LoaderOptionsPlugin({ - debug: true, - }), - new HtmlWebpackPlugin({ - title: "cardano-transaction-lib-examples", - template: "./examples/index.html", - inject: false, // See stackoverflow.com/a/38292765/3067181 - }), - new webpack.ProvidePlugin({ - Buffer: ["buffer", "Buffer"], - }), - // ContextReplacementPlugin is used just to suppress a webpack warning: - // "Critical dependency: the request of a dependency is an expression" - // See https://stackoverflow.com/a/59235546/17365145 - new webpack.ContextReplacementPlugin(/cardano-serialization-lib-browser/), - new webpack.ContextReplacementPlugin(/cardano-serialization-lib-nodejs/), - ], -}; From b7a151f3c78ee05a0cb1906219fef8eb2f522ea9 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Tue, 1 Aug 2023 15:53:46 +0400 Subject: [PATCH 32/85] Use CSL version with GC --- package-lock.json | 84 ++++++++++++++----- package.json | 4 +- packages.dhall | 6 +- spago-packages.nix | 24 +++--- spago.dhall | 2 +- src/Internal/ApplyArgs.js | 7 +- src/Internal/BalanceTx/UtxoMinAda.js | 6 +- src/Internal/Deserialization/FromBytes.js | 6 +- src/Internal/Deserialization/Keys.js | 6 +- src/Internal/Deserialization/Language.js | 6 +- src/Internal/Deserialization/NativeScript.js | 6 +- src/Internal/Deserialization/PlutusData.js | 6 +- src/Internal/Deserialization/Transaction.js | 6 +- src/Internal/Deserialization/UnspentOutput.js | 6 +- src/Internal/Hashing.js | 6 +- src/Internal/Serialization.js | 6 +- src/Internal/Serialization/Address.js | 6 +- src/Internal/Serialization/AuxiliaryData.js | 6 +- src/Internal/Serialization/BigInt.js | 6 +- src/Internal/Serialization/Hash.js | 6 +- src/Internal/Serialization/MinFee.js | 6 +- src/Internal/Serialization/NativeScript.js | 6 +- src/Internal/Serialization/PlutusData.js | 6 +- src/Internal/Serialization/PlutusScript.js | 6 +- src/Internal/Serialization/WitnessSet.js | 6 +- src/Internal/Types/BigNum.js | 7 +- src/Internal/Types/Int.js | 6 +- src/Internal/Wallet/Bip32.js | 6 +- 28 files changed, 127 insertions(+), 133 deletions(-) diff --git a/package-lock.json b/package-lock.json index 409a9a8462..6dad1eafdd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,8 +11,8 @@ "dependencies": { "@emurgo/cardano-message-signing-browser": "1.0.1", "@emurgo/cardano-message-signing-nodejs": "1.0.1", - "@emurgo/cardano-serialization-lib-browser": "11.2.1", - "@emurgo/cardano-serialization-lib-nodejs": "11.2.1", + "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.2", + "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.2", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1", "@mlabs-haskell/json-bigint": " 1.0.0", "@noble/secp256k1": "^1.7.0", @@ -63,16 +63,6 @@ "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-nodejs/-/cardano-message-signing-nodejs-1.0.1.tgz", "integrity": "sha512-PoKh1tQnJX18f8iEr8Jk1KXxKCn9eqaSslMI1pyOJvYRJhQVDLCh0+9YReufjp0oFJIY1ShcrR+4/WnECVZUKQ==" }, - "node_modules/@emurgo/cardano-serialization-lib-browser": { - "version": "11.2.1", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-11.2.1.tgz", - "integrity": "sha512-J9Pmeta7y1GYnMCxtb3GnGCRw6zk1wiQ8EdCYQRn/Yqa/ss1zoBjd41euVi02Eb58aLuOJS81nNU+BcMLGXvUg==" - }, - "node_modules/@emurgo/cardano-serialization-lib-nodejs": { - "version": "11.2.1", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-11.2.1.tgz", - "integrity": "sha512-+Rw35NW4Qv/9uFaPxhKtxiIPmoBEIFMAgdqQxZTw6hNT/wvBp2TvwTBPnOW8ODs7GUAA8nrO1rJJAaxF+mAG2w==" - }, "node_modules/@esbuild/android-arm": { "version": "0.18.11", "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.11.tgz", @@ -495,6 +485,34 @@ "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==", "dev": true }, + "node_modules/@mlabs-haskell/cardano-serialization-lib-gc-browser": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.2.tgz", + "integrity": "sha512-hkfXjMy+GD4YMCM3ReXmlaZnWpMufx5NXoyYoyGvEKgQ3kHsArKirBf0YOuhSINyS8emOerXh/0mXPCgz1l3mw==", + "dependencies": { + "@emurgo/cardano-serialization-lib-browser": "^11.2.1", + "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" + } + }, + "node_modules/@mlabs-haskell/cardano-serialization-lib-gc-browser/node_modules/@emurgo/cardano-serialization-lib-browser": { + "version": "11.4.0", + "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-11.4.0.tgz", + "integrity": "sha512-VWMvLRBFo7MAYh42zledURFs5BpMTWvkP4DzsLNbyJxZlwjDS+bPyehJVyGc116d2gq8NHFmANbfdeuK8ffJ7A==" + }, + "node_modules/@mlabs-haskell/cardano-serialization-lib-gc-nodejs": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.2.tgz", + "integrity": "sha512-HD75q8yyhfrrI4zeb2gkoO3wcq0EaVIwiAbyhVQWuniUPgQ6mOr2Lz31vw7YSyY1jksVU69eXngdstgErY6/yw==", + "dependencies": { + "@emurgo/cardano-serialization-lib-nodejs": "^11.4.0", + "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" + } + }, + "node_modules/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/node_modules/@emurgo/cardano-serialization-lib-nodejs": { + "version": "11.4.0", + "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-11.4.0.tgz", + "integrity": "sha512-dMiofDcqv+IrAITCgWBZmsMLqwv2xImDsJDSrKiYYG1zRKaL8XfMOxx6S0WEnKVj5/343Q5FFURYcSu3iBRNMQ==" + }, "node_modules/@mlabs-haskell/csl-gc-wrapper": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@mlabs-haskell/csl-gc-wrapper/-/csl-gc-wrapper-1.0.1.tgz", @@ -6928,16 +6946,6 @@ "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-nodejs/-/cardano-message-signing-nodejs-1.0.1.tgz", "integrity": "sha512-PoKh1tQnJX18f8iEr8Jk1KXxKCn9eqaSslMI1pyOJvYRJhQVDLCh0+9YReufjp0oFJIY1ShcrR+4/WnECVZUKQ==" }, - "@emurgo/cardano-serialization-lib-browser": { - "version": "11.2.1", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-11.2.1.tgz", - "integrity": "sha512-J9Pmeta7y1GYnMCxtb3GnGCRw6zk1wiQ8EdCYQRn/Yqa/ss1zoBjd41euVi02Eb58aLuOJS81nNU+BcMLGXvUg==" - }, - "@emurgo/cardano-serialization-lib-nodejs": { - "version": "11.2.1", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-11.2.1.tgz", - "integrity": "sha512-+Rw35NW4Qv/9uFaPxhKtxiIPmoBEIFMAgdqQxZTw6hNT/wvBp2TvwTBPnOW8ODs7GUAA8nrO1rJJAaxF+mAG2w==" - }, "@esbuild/android-arm": { "version": "0.18.11", "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.11.tgz", @@ -7153,6 +7161,38 @@ "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==", "dev": true }, + "@mlabs-haskell/cardano-serialization-lib-gc-browser": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.2.tgz", + "integrity": "sha512-hkfXjMy+GD4YMCM3ReXmlaZnWpMufx5NXoyYoyGvEKgQ3kHsArKirBf0YOuhSINyS8emOerXh/0mXPCgz1l3mw==", + "requires": { + "@emurgo/cardano-serialization-lib-browser": "^11.2.1", + "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" + }, + "dependencies": { + "@emurgo/cardano-serialization-lib-browser": { + "version": "11.4.0", + "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-11.4.0.tgz", + "integrity": "sha512-VWMvLRBFo7MAYh42zledURFs5BpMTWvkP4DzsLNbyJxZlwjDS+bPyehJVyGc116d2gq8NHFmANbfdeuK8ffJ7A==" + } + } + }, + "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.2.tgz", + "integrity": "sha512-HD75q8yyhfrrI4zeb2gkoO3wcq0EaVIwiAbyhVQWuniUPgQ6mOr2Lz31vw7YSyY1jksVU69eXngdstgErY6/yw==", + "requires": { + "@emurgo/cardano-serialization-lib-nodejs": "^11.4.0", + "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" + }, + "dependencies": { + "@emurgo/cardano-serialization-lib-nodejs": { + "version": "11.4.0", + "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-11.4.0.tgz", + "integrity": "sha512-dMiofDcqv+IrAITCgWBZmsMLqwv2xImDsJDSrKiYYG1zRKaL8XfMOxx6S0WEnKVj5/343Q5FFURYcSu3iBRNMQ==" + } + } + }, "@mlabs-haskell/csl-gc-wrapper": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@mlabs-haskell/csl-gc-wrapper/-/csl-gc-wrapper-1.0.1.tgz", diff --git a/package.json b/package.json index a80fd416ef..2fb7fd7274 100755 --- a/package.json +++ b/package.json @@ -36,8 +36,8 @@ "dependencies": { "@emurgo/cardano-message-signing-browser": "1.0.1", "@emurgo/cardano-message-signing-nodejs": "1.0.1", - "@emurgo/cardano-serialization-lib-browser": "11.2.1", - "@emurgo/cardano-serialization-lib-nodejs": "11.2.1", + "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.2", + "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.2", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1", "@mlabs-haskell/json-bigint": " 1.0.0", "@noble/secp256k1": "^1.7.0", diff --git a/packages.dhall b/packages.dhall index f1adb8dccb..e2e7a9fcd6 100644 --- a/packages.dhall +++ b/packages.dhall @@ -222,7 +222,7 @@ let additions = , repo = "https://github.com/errfrom/medea-ps.git" , version = "00981e4ce7249808413a6db8d88d849bbe85245a" } - , purescript-toppokki = + , toppokki = { dependencies = [ "prelude" , "record" @@ -233,7 +233,7 @@ let additions = , "node-fs-aff" ] , repo = "https://github.com/mlabs-haskell/purescript-toppokki" - , version = "b043e9342463df76972d05981ac4ec25316834bf" + , version = "f90f92f0ddf0eecc73705c1675db37918d18cbcb" } , noble-secp256k1 = { dependencies = @@ -251,4 +251,4 @@ let additions = } } -in (upstream // additions) +in upstream // additions diff --git a/spago-packages.nix b/spago-packages.nix index aab9a94b96..fde48e59dc 100644 --- a/spago-packages.nix +++ b/spago-packages.nix @@ -1169,18 +1169,6 @@ let installPhase = "ln -s $src $out"; }; - "purescript-toppokki" = pkgs.stdenv.mkDerivation { - name = "purescript-toppokki"; - version = "b043e9342463df76972d05981ac4ec25316834bf"; - src = pkgs.fetchgit { - url = "https://github.com/errfrom/purescript-toppokki"; - rev = "b043e9342463df76972d05981ac4ec25316834bf"; - sha256 = "0kkk4xfnkq6fqr30d95i3x4r6z9479bx7v0ama7xf36pr0y26lk1"; - }; - phases = "installPhase"; - installPhase = "ln -s $src $out"; - }; - "quickcheck" = pkgs.stdenv.mkDerivation { name = "quickcheck"; version = "v8.0.1"; @@ -1373,6 +1361,18 @@ let installPhase = "ln -s $src $out"; }; + "toppokki" = pkgs.stdenv.mkDerivation { + name = "toppokki"; + version = "f90f92f0ddf0eecc73705c1675db37918d18cbcb"; + src = pkgs.fetchgit { + url = "https://github.com/mlabs-haskell/purescript-toppokki"; + rev = "f90f92f0ddf0eecc73705c1675db37918d18cbcb"; + sha256 = "1kmqajf7n5l9lk4amyma3rhm60llrgamap5hi21kkqs52xm3fr2q"; + }; + phases = "installPhase"; + installPhase = "ln -s $src $out"; + }; + "transformers" = pkgs.stdenv.mkDerivation { name = "transformers"; version = "v6.0.0"; diff --git a/spago.dhall b/spago.dhall index 3fe7222b57..74edc759b1 100644 --- a/spago.dhall +++ b/spago.dhall @@ -68,7 +68,7 @@ You can edit this file as you like. , "prelude" , "profunctor" , "profunctor-lenses" - , "purescript-toppokki" + , "toppokki" , "quickcheck" , "quickcheck-combinators" , "quickcheck-laws" diff --git a/src/Internal/ApplyArgs.js b/src/Internal/ApplyArgs.js index 5d382749fd..9ff6702981 100644 --- a/src/Internal/ApplyArgs.js +++ b/src/Internal/ApplyArgs.js @@ -3,15 +3,12 @@ let lib; let apply_args; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); apply_args = await import("apply-args-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); apply_args = await import("apply-args-nodejs"); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); -// apply_args = gcWrapper(apply_args); /** * @param {} left diff --git a/src/Internal/BalanceTx/UtxoMinAda.js b/src/Internal/BalanceTx/UtxoMinAda.js index 023f7a2907..5b6910c849 100644 --- a/src/Internal/BalanceTx/UtxoMinAda.js +++ b/src/Internal/BalanceTx/UtxoMinAda.js @@ -2,12 +2,10 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); export function minAdaForOutput(maybe) { return txOutput => dataCost => { diff --git a/src/Internal/Deserialization/FromBytes.js b/src/Internal/Deserialization/FromBytes.js index 62589355c6..f7b57ae04c 100644 --- a/src/Internal/Deserialization/FromBytes.js +++ b/src/Internal/Deserialization/FromBytes.js @@ -2,12 +2,10 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); export function _fromBytes(helper) { return name => bytes => { diff --git a/src/Internal/Deserialization/Keys.js b/src/Internal/Deserialization/Keys.js index c256eff377..4beb728a43 100644 --- a/src/Internal/Deserialization/Keys.js +++ b/src/Internal/Deserialization/Keys.js @@ -2,12 +2,10 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); export function freshPrivateKey() { return lib.PrivateKey.generate_ed25519(); diff --git a/src/Internal/Deserialization/Language.js b/src/Internal/Deserialization/Language.js index 03868dff95..e39c2a5aac 100644 --- a/src/Internal/Deserialization/Language.js +++ b/src/Internal/Deserialization/Language.js @@ -2,12 +2,10 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); export function _convertLanguage(langCtors) { return cslLang => { diff --git a/src/Internal/Deserialization/NativeScript.js b/src/Internal/Deserialization/NativeScript.js index 3e8ff3f628..4ef2dc16ba 100644 --- a/src/Internal/Deserialization/NativeScript.js +++ b/src/Internal/Deserialization/NativeScript.js @@ -2,12 +2,10 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); export function _convertNativeScript(handler) { return ns => { diff --git a/src/Internal/Deserialization/PlutusData.js b/src/Internal/Deserialization/PlutusData.js index 62f5dc7752..3d0c288050 100644 --- a/src/Internal/Deserialization/PlutusData.js +++ b/src/Internal/Deserialization/PlutusData.js @@ -2,12 +2,10 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); export function _convertPlutusData(handle) { return pd => { diff --git a/src/Internal/Deserialization/Transaction.js b/src/Internal/Deserialization/Transaction.js index 0c049c0251..af0a3071ef 100644 --- a/src/Internal/Deserialization/Transaction.js +++ b/src/Internal/Deserialization/Transaction.js @@ -2,12 +2,10 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); const call = property => object => object[property](); const callMaybe = property => maybe => object => { diff --git a/src/Internal/Deserialization/UnspentOutput.js b/src/Internal/Deserialization/UnspentOutput.js index 733f2ca976..61f5ecbee3 100644 --- a/src/Internal/Deserialization/UnspentOutput.js +++ b/src/Internal/Deserialization/UnspentOutput.js @@ -2,12 +2,10 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); const call = property => object => object[property](); const callMaybe = property => maybe => object => { diff --git a/src/Internal/Hashing.js b/src/Internal/Hashing.js index 2d174a493a..db5d6174dc 100644 --- a/src/Internal/Hashing.js +++ b/src/Internal/Hashing.js @@ -7,12 +7,10 @@ import SHA3 from "jssha/dist/sha3"; let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); export function blake2b224Hash(bytesToHash) { return Blake2.blake2b(bytesToHash, null, 28); diff --git a/src/Internal/Serialization.js b/src/Internal/Serialization.js index 59d2f9c15a..ee93d49db9 100644 --- a/src/Internal/Serialization.js +++ b/src/Internal/Serialization.js @@ -2,12 +2,10 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); const setter = prop => obj => value => () => obj["set_" + prop](value); diff --git a/src/Internal/Serialization/Address.js b/src/Internal/Serialization/Address.js index b844a972d1..e62c7882a2 100644 --- a/src/Internal/Serialization/Address.js +++ b/src/Internal/Serialization/Address.js @@ -2,12 +2,10 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); const callClassStaticMaybe = (classname, functionname) => maybe => input => { let ret = null; diff --git a/src/Internal/Serialization/AuxiliaryData.js b/src/Internal/Serialization/AuxiliaryData.js index f1dd931461..33fd344de2 100644 --- a/src/Internal/Serialization/AuxiliaryData.js +++ b/src/Internal/Serialization/AuxiliaryData.js @@ -2,12 +2,10 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); const setter = prop => obj => value => () => obj["set_" + prop](value); diff --git a/src/Internal/Serialization/BigInt.js b/src/Internal/Serialization/BigInt.js index 7128252129..dc61768cc1 100644 --- a/src/Internal/Serialization/BigInt.js +++ b/src/Internal/Serialization/BigInt.js @@ -2,12 +2,10 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); export function _BigInt_from_str(helper) { return str => { diff --git a/src/Internal/Serialization/Hash.js b/src/Internal/Serialization/Hash.js index 783ec38c8e..1ac1b8c796 100644 --- a/src/Internal/Serialization/Hash.js +++ b/src/Internal/Serialization/Hash.js @@ -2,12 +2,10 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); export function hashToBytes(hash) { return hash.to_bytes(); diff --git a/src/Internal/Serialization/MinFee.js b/src/Internal/Serialization/MinFee.js index 3a3d0cd86b..52e0732ada 100644 --- a/src/Internal/Serialization/MinFee.js +++ b/src/Internal/Serialization/MinFee.js @@ -2,12 +2,10 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); export function _minFee(maybe) { return tx => txFeeFixed => txFeePerByte => { diff --git a/src/Internal/Serialization/NativeScript.js b/src/Internal/Serialization/NativeScript.js index cbdb38801f..810331fa7c 100644 --- a/src/Internal/Serialization/NativeScript.js +++ b/src/Internal/Serialization/NativeScript.js @@ -2,12 +2,10 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); const mkScript = prop => arg => lib.NativeScript[prop](arg); diff --git a/src/Internal/Serialization/PlutusData.js b/src/Internal/Serialization/PlutusData.js index 4c1c8681eb..9c642c773e 100644 --- a/src/Internal/Serialization/PlutusData.js +++ b/src/Internal/Serialization/PlutusData.js @@ -2,12 +2,10 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); export function _mkPlutusData_bytes(bytes) { return lib.PlutusData.new_bytes(bytes); diff --git a/src/Internal/Serialization/PlutusScript.js b/src/Internal/Serialization/PlutusScript.js index eec7011813..ab48270fec 100644 --- a/src/Internal/Serialization/PlutusScript.js +++ b/src/Internal/Serialization/PlutusScript.js @@ -2,12 +2,10 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); export function newPlutusV1Script(bytes) { return lib.PlutusScript.new(bytes); diff --git a/src/Internal/Serialization/WitnessSet.js b/src/Internal/Serialization/WitnessSet.js index 28a736895c..96b8fd2cda 100644 --- a/src/Internal/Serialization/WitnessSet.js +++ b/src/Internal/Serialization/WitnessSet.js @@ -2,12 +2,10 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); export function newTransactionWitnessSet() { return lib.TransactionWitnessSet.new(); diff --git a/src/Internal/Types/BigNum.js b/src/Internal/Types/BigNum.js index d0acc28e10..5514c30545 100644 --- a/src/Internal/Types/BigNum.js +++ b/src/Internal/Types/BigNum.js @@ -2,12 +2,11 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); + // lib = (await import("../../../../cardano-serialization-lib-gc/nodejs/index.js")); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); export function bnCompare(lhs) { return rhs => lhs.compare(rhs); diff --git a/src/Internal/Types/Int.js b/src/Internal/Types/Int.js index 0446f9d776..8110b53cb3 100644 --- a/src/Internal/Types/Int.js +++ b/src/Internal/Types/Int.js @@ -2,12 +2,10 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); export const newPositive = lib.Int.new; export const newNegative = lib.Int.new_negative; diff --git a/src/Internal/Wallet/Bip32.js b/src/Internal/Wallet/Bip32.js index 493c3ffba3..9518c96977 100644 --- a/src/Internal/Wallet/Bip32.js +++ b/src/Internal/Wallet/Bip32.js @@ -2,12 +2,10 @@ let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - lib = await import("@emurgo/cardano-serialization-lib-browser"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { - lib = await import("@emurgo/cardano-serialization-lib-nodejs"); + lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); } -// import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; -// lib = gcWrapper(lib); import bip39 from "bip39"; From ebe2c7bfa20a4381d9f81ffaef68e8d19f473368 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Fri, 4 Aug 2023 19:13:26 +0400 Subject: [PATCH 33/85] Update docs --- doc/getting-started.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/getting-started.md b/doc/getting-started.md index dc354275a9..f758fa8472 100644 --- a/doc/getting-started.md +++ b/doc/getting-started.md @@ -38,9 +38,7 @@ Then, add `https://public-plutonomicon.cachix.org` and `public-plutonomicon.cach The easiest way to create a new CTL project is to use our `ctl-scaffold` flake template. This lives in the CTL repo -- you can have a look [here](../templates/ctl-scaffold). It contains a simple, yet complete, flakes-based scaffolding project with example `outputs` for a CTL project, including its runtime. - Alternatively, consider [the-plutus-scaffold](https://github.com/mlabs-haskell/the-plutus-scaffold) flake template. It's a scaffold built on top of the above mentioned `ctl-scaffold`, but includes a react based frontend and a haskell onchain additionaly. It's more of a demo application, than a minimal working example. - A new project can be initialized as follows: From 35debff54dd04982a40d569e12a8d0aa69c81419 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Tue, 8 Aug 2023 23:23:24 +0400 Subject: [PATCH 34/85] Do not store scripts in external files --- examples/AlwaysMints.js | 5 ++++ examples/AlwaysMints.purs | 16 ++++++------ examples/AlwaysSucceeds.js | 5 ++++ examples/AlwaysSucceeds.purs | 4 +-- examples/ECDSA.purs | 22 +++++++++++----- examples/ExUnits.js | 2 ++ examples/ExUnits.purs | 4 +-- examples/IncludeDatum.purs | 12 +++++++-- examples/Lose7Ada.purs | 12 +++++++-- examples/MintsMultipleTokens.js | 17 ++++++++++++ examples/MintsMultipleTokens.purs | 20 +++++++------- examples/MultipleRedeemers.js | 17 ++++++++++++ examples/MultipleRedeemers.purs | 20 +++++++------- examples/OneShotMinting.js | 5 ++++ examples/OneShotMinting.purs | 4 +-- examples/PlutusV2/InlineDatum.js | 5 ++++ examples/PlutusV2/InlineDatum.purs | 4 +-- examples/PlutusV2/OneShotMinting.js | 5 ++++ examples/PlutusV2/OneShotMinting.purs | 3 +-- examples/PlutusV2/Scripts/AlwaysMints.purs | 12 +++++++-- examples/PlutusV2/Scripts/AlwaysSucceeds.purs | 12 +++++++-- examples/Schnorr.purs | 26 ++++++++++++------- test/Wallet/Cip30/SignData.js | 4 +-- 23 files changed, 172 insertions(+), 64 deletions(-) create mode 100644 examples/AlwaysMints.js create mode 100644 examples/AlwaysSucceeds.js create mode 100644 examples/ExUnits.js create mode 100644 examples/MintsMultipleTokens.js create mode 100644 examples/MultipleRedeemers.js create mode 100644 examples/OneShotMinting.js create mode 100644 examples/PlutusV2/InlineDatum.js create mode 100644 examples/PlutusV2/OneShotMinting.js diff --git a/examples/AlwaysMints.js b/examples/AlwaysMints.js new file mode 100644 index 0000000000..e9f4424fde --- /dev/null +++ b/examples/AlwaysMints.js @@ -0,0 +1,5 @@ +export const alwaysMints = `{ + "cborHex": "484701000022120011", + "description": "always-mints", + "type": "PlutusScriptV1" +}`; diff --git a/examples/AlwaysMints.purs b/examples/AlwaysMints.purs index 7322ebf9c7..5b5c8f8e37 100644 --- a/examples/AlwaysMints.purs +++ b/examples/AlwaysMints.purs @@ -13,7 +13,7 @@ import Contract.Prelude import Contract.Config (ContractParams, testnetNamiConfig) import Contract.Log (logInfo') -import Contract.Monad (Contract, launchAff_, liftContractAffM, runContract) +import Contract.Monad (Contract, launchAff_, liftContractM, runContract) import Contract.ScriptLookups as Lookups import Contract.Scripts (MintingPolicy(PlutusMintingPolicy)) import Contract.TextEnvelope (decodeTextEnvelope, plutusScriptV1FromEnvelope) @@ -21,7 +21,6 @@ import Contract.Transaction (awaitTxConfirmed, submitTxFromConstraints) import Contract.TxConstraints as Constraints import Contract.Value as Value import Ctl.Examples.Helpers (mkCurrencySymbol, mkTokenName) as Helpers -import Ctl.Examples.Helpers.LoadScript (loadScript) import Data.BigInt as BigInt main :: Effect Unit @@ -50,12 +49,13 @@ example :: ContractParams -> Effect Unit example cfg = launchAff_ $ do runContract cfg contract -alwaysMintsPolicyMaybe :: Aff (Maybe MintingPolicy) -alwaysMintsPolicyMaybe = - loadScript "always-mints.plutus" <#> \alwaysMints -> do - envelope <- decodeTextEnvelope alwaysMints - PlutusMintingPolicy <$> plutusScriptV1FromEnvelope envelope +foreign import alwaysMints :: String + +alwaysMintsPolicyMaybe :: Maybe MintingPolicy +alwaysMintsPolicyMaybe = do + PlutusMintingPolicy <$> + (plutusScriptV1FromEnvelope =<< decodeTextEnvelope alwaysMints) alwaysMintsPolicy :: Contract MintingPolicy alwaysMintsPolicy = - liftContractAffM "Error decoding alwaysMintsPolicy" alwaysMintsPolicyMaybe + liftContractM "Error decoding alwaysMintsPolicy" alwaysMintsPolicyMaybe diff --git a/examples/AlwaysSucceeds.js b/examples/AlwaysSucceeds.js new file mode 100644 index 0000000000..f6c35572ee --- /dev/null +++ b/examples/AlwaysSucceeds.js @@ -0,0 +1,5 @@ +export const alwaysSucceeds = `{ + "cborHex": "4e4d01000033222220051200120011", + "description": "always-succeeds", + "type": "PlutusScriptV1" +}`; diff --git a/examples/AlwaysSucceeds.purs b/examples/AlwaysSucceeds.purs index c756569c08..94339b70ac 100644 --- a/examples/AlwaysSucceeds.purs +++ b/examples/AlwaysSucceeds.purs @@ -34,7 +34,6 @@ import Contract.Utxos (utxosAt) import Contract.Value as Value import Contract.Wallet (ownStakePubKeyHashes) import Control.Monad.Error.Class (liftMaybe) -import Ctl.Examples.Helpers.LoadScript (loadScript) import Data.Array (head) import Data.BigInt as BigInt import Data.Lens (view) @@ -120,7 +119,8 @@ spendFromAlwaysSucceeds vhash validator txId = do alwaysSucceedsScript :: Contract Validator alwaysSucceedsScript = do - alwaysSucceeds <- liftAff $ loadScript "always-succeeds.plutus" liftMaybe (error "Error decoding alwaysSucceeds") do envelope <- decodeTextEnvelope alwaysSucceeds Validator <$> plutusScriptV1FromEnvelope envelope + +foreign import alwaysSucceeds :: String diff --git a/examples/ECDSA.purs b/examples/ECDSA.purs index a21da1b68c..25a48913fb 100644 --- a/examples/ECDSA.purs +++ b/examples/ECDSA.purs @@ -15,7 +15,7 @@ import Contract.Crypto.Secp256k1.Utils , randomSecp256k1PrivateKey ) import Contract.Log (logInfo') -import Contract.Monad (Contract, liftContractAffM, liftContractM) +import Contract.Monad (Contract, liftContractM) import Contract.Numeric.BigNum as BigNum import Contract.PlutusData ( class ToData @@ -36,7 +36,6 @@ import Contract.Transaction import Contract.TxConstraints as Constraints import Contract.Utxos (utxosAt) import Contract.Value as Value -import Ctl.Examples.Helpers.LoadScript (loadScript) import Data.Map as Map import Data.Set as Set @@ -60,7 +59,7 @@ contract = do -- | Prepare the ECDSA test by locking some funds at the validator address prepTest :: Contract TransactionHash prepTest = do - validator <- liftContractAffM "Caonnot get validator" getValidator + validator <- liftContractM "Caonnot get validator" getValidator let valHash = validatorHash validator @@ -86,7 +85,7 @@ testVerification testVerification txId ecdsaRed = do let red = Redeemer $ toData ecdsaRed - validator <- liftContractAffM "Can't get validator" getValidator + validator <- liftContractM "Can't get validator" getValidator let valHash = validatorHash validator netId <- getNetworkId @@ -129,7 +128,16 @@ testECDSA txId = do , pk: publicKey } -getValidator :: Aff (Maybe Validator) +getValidator :: Maybe Validator getValidator = - loadScript "validate-ecdsa.plutus" <#> \validateECDSA -> - decodeTextEnvelope validateECDSA >>= plutusScriptV2FromEnvelope >>> map wrap + decodeTextEnvelope validateECDSA >>= plutusScriptV2FromEnvelope >>> map wrap + +validateECDSA :: String +validateECDSA = + """ +{ + "type": "PlutusScriptV2", + "description": "", + "cborHex": "59080459080101000032323232332232323232323232323233223232323232223232322323253353232323500222253353335734666ed000400c00808007c40804cd5ce249167369676e617475726520636865636b206661696c65640001f3333573466e1cd55cea80224000466442466002006004646464646464646464646464646666ae68cdc39aab9d500c480008cccccccccccc88888888888848cccccccccccc00403403002c02802402001c01801401000c008cd406806cd5d0a80619a80d00d9aba1500b33501a01c35742a014666aa03ceb94074d5d0a804999aa80f3ae501d35742a01066a03404a6ae85401cccd54078099d69aba150063232323333573466e1cd55cea801240004664424660020060046464646666ae68cdc39aab9d5002480008cc8848cc00400c008cd40c1d69aba150023031357426ae8940088c98c80d4cd5ce01b01a81989aab9e5001137540026ae854008c8c8c8cccd5cd19b8735573aa004900011991091980080180119a8183ad35742a00460626ae84d5d1280111931901a99ab9c036035033135573ca00226ea8004d5d09aba2500223263203133573806406205e26aae7940044dd50009aba1500533501a75c6ae854010ccd540780888004d5d0a801999aa80f3ae200135742a00460486ae84d5d1280111931901699ab9c02e02d02b135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d55cf280089baa00135742a00860286ae84d5d1280211931900f99ab9c02001f01d3333573466e1cd55cea803a40004666444246660020080060046eb8d5d0a8039bae35742a00c6eb8d5d09aba2500623263201e33573803e03c0386666ae68cdc39aab9d37540109000100e91931900e99ab9c01e01d01b101c13263201c3357389201035054350001c135573ca00226ea80044d5d1280089aab9e5001137540022464460046eb0004c8004d5405888cccd55cf80092805119a80498021aba100230033574400402c464646666ae68cdc39aab9d5002480008cc8848cc00400c008c030d5d0a80118029aba135744a004464c6402c66ae7005c0580504d55cf280089baa0012323232323333573466e1cd55cea8022400046666444424666600200a0080060046464646666ae68cdc39aab9d5002480008cc8848cc00400c008c054d5d0a80119a80780a1aba135744a004464c6403666ae7007006c0644d55cf280089baa00135742a008666aa010eb9401cd5d0a8019919191999ab9a3370ea0029002119091118010021aba135573ca00646666ae68cdc3a80124004464244460020086eb8d5d09aab9e500423333573466e1d400d20002122200323263201d33573803c03a03603403226aae7540044dd50009aba1500233500b75c6ae84d5d1280111931900b99ab9c018017015135744a00226ae8940044d55cf280089baa0011335500175ceb44488c88c008dd5800990009aa80991191999aab9f00225008233500733221233001003002300635573aa004600a6aae794008c010d5d100180a09aba100111220021221223300100400312232323333573466e1d4005200023212230020033005357426aae79400c8cccd5cd19b8750024800884880048c98c8048cd5ce00980900800789aab9d500113754002464646666ae68cdc3a800a400c46424444600800a600e6ae84d55cf280191999ab9a3370ea004900211909111180100298049aba135573ca00846666ae68cdc3a801a400446424444600200a600e6ae84d55cf280291999ab9a3370ea00890001190911118018029bae357426aae7940188c98c8048cd5ce00980900800780700689aab9d500113754002464646666ae68cdc39aab9d5002480008cc8848cc00400c008c014d5d0a8011bad357426ae8940088c98c8038cd5ce00780700609aab9e5001137540024646666ae68cdc39aab9d5001480008dd71aba135573ca004464c6401866ae700340300284dd5000919191919191999ab9a3370ea002900610911111100191999ab9a3370ea004900510911111100211999ab9a3370ea00690041199109111111198008048041bae35742a00a6eb4d5d09aba2500523333573466e1d40112006233221222222233002009008375c6ae85401cdd71aba135744a00e46666ae68cdc3a802a400846644244444446600c01201060186ae854024dd71aba135744a01246666ae68cdc3a8032400446424444444600e010601a6ae84d55cf280591999ab9a3370ea00e900011909111111180280418071aba135573ca018464c6402a66ae7005805404c04804404003c0380344d55cea80209aab9e5003135573ca00426aae7940044dd50009191919191999ab9a3370ea002900111999110911998008028020019bad35742a0086eb4d5d0a8019bad357426ae89400c8cccd5cd19b875002480008c8488c00800cc020d5d09aab9e500623263200e33573801e01c01801626aae75400c4d5d1280089aab9e500113754002464646666ae68cdc3a800a400446424460020066eb8d5d09aab9e500323333573466e1d400920002321223002003375c6ae84d55cf280211931900599ab9c00c00b009008135573aa00226ea8004488c8c8cccd5cd19b87500148010848880048cccd5cd19b875002480088c84888c00c010c018d5d09aab9e500423333573466e1d400d20002122200223263200c33573801a01801401201026aae7540044dd50009191999ab9a3370ea0029001100291999ab9a3370ea0049000100291931900419ab9c009008006005135573a6ea800448800848800526120014910350543100112323001001223300330020020011" +} +""" diff --git a/examples/ExUnits.js b/examples/ExUnits.js new file mode 100644 index 0000000000..8a2cbb76f6 --- /dev/null +++ b/examples/ExUnits.js @@ -0,0 +1,2 @@ +export const exUnits = `{"cborHex":"59079f59079c0100003233223232323232323232323232323233223232323232222323253353232301b0023333573466e1cd55cea801a4000466442466002006004646464646464646464646464646666ae68cdc39aab9d500c480008cccccccccccc88888888888848cccccccccccc00403403002c02802402001c01801401000c008cd405805cd5d0a80619a80b00b9aba1500b33501601835742a014666aa034eb94064d5d0a804999aa80d3ae501935742a01066a02c0426ae85401cccd54068089d69aba150063232323333573466e1cd55cea801240004664424660020060046464646666ae68cdc39aab9d5002480008cc8848cc00400c008cd40b1d69aba15002302d357426ae8940088c98c80bccd5ce01801781689aab9e5001137540026ae854008c8c8c8cccd5cd19b8735573aa004900011991091980080180119a8163ad35742a004605a6ae84d5d1280111931901799ab9c03002f02d135573ca00226ea8004d5d09aba2500223263202b33573805805605226aae7940044dd50009aba1500533501675c6ae854010ccd540680788004d5d0a801999aa80d3ae200135742a00460406ae84d5d1280111931901399ab9c028027025135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d55cf280089baa00135742a00660206ae84d5d1280191931900c99ab9c01a019017375a008202e264c6402e66ae712401134661696c656420766572696669636174696f6e00017135573ca00226ea800448c88c008dd6000990009aa80b911999aab9f0012500a233500930043574200460066ae880080508c8c8cccd5cd19b8735573aa004900011991091980080180118061aba150023005357426ae8940088c98c8050cd5ce00a80a00909aab9e5001137540024646464646666ae68cdc39aab9d5004480008cccc888848cccc00401401000c008c8c8c8cccd5cd19b8735573aa0049000119910919800801801180a9aba1500233500f014357426ae8940088c98c8064cd5ce00d00c80b89aab9e5001137540026ae854010ccd54021d728039aba150033232323333573466e1d4005200423212223002004357426aae79400c8cccd5cd19b875002480088c84888c004010dd71aba135573ca00846666ae68cdc3a801a400042444006464c6403666ae7007006c06406005c4d55cea80089baa00135742a00466a016eb8d5d09aba2500223263201533573802c02a02626ae8940044d5d1280089aab9e500113754002266aa002eb9d6889119118011bab00132001355014223233335573e0044a010466a00e66442466002006004600c6aae754008c014d55cf280118021aba200301213574200222440042442446600200800624464646666ae68cdc3a800a40004642446004006600a6ae84d55cf280191999ab9a3370ea0049001109100091931900819ab9c01101000e00d135573aa00226ea80048c8c8cccd5cd19b875001480188c848888c010014c01cd5d09aab9e500323333573466e1d400920042321222230020053009357426aae7940108cccd5cd19b875003480088c848888c004014c01cd5d09aab9e500523333573466e1d40112000232122223003005375c6ae84d55cf280311931900819ab9c01101000e00d00c00b135573aa00226ea80048c8c8cccd5cd19b8735573aa004900011991091980080180118029aba15002375a6ae84d5d1280111931900619ab9c00d00c00a135573ca00226ea80048c8cccd5cd19b8735573aa002900011bae357426aae7940088c98c8028cd5ce00580500409baa001232323232323333573466e1d4005200c21222222200323333573466e1d4009200a21222222200423333573466e1d400d2008233221222222233001009008375c6ae854014dd69aba135744a00a46666ae68cdc3a8022400c4664424444444660040120106eb8d5d0a8039bae357426ae89401c8cccd5cd19b875005480108cc8848888888cc018024020c030d5d0a8049bae357426ae8940248cccd5cd19b875006480088c848888888c01c020c034d5d09aab9e500b23333573466e1d401d2000232122222223005008300e357426aae7940308c98c804ccd5ce00a00980880800780700680600589aab9d5004135573ca00626aae7940084d55cf280089baa0012323232323333573466e1d400520022333222122333001005004003375a6ae854010dd69aba15003375a6ae84d5d1280191999ab9a3370ea0049000119091180100198041aba135573ca00c464c6401866ae700340300280244d55cea80189aba25001135573ca00226ea80048c8c8cccd5cd19b875001480088c8488c00400cdd71aba135573ca00646666ae68cdc3a8012400046424460040066eb8d5d09aab9e500423263200933573801401200e00c26aae7540044dd500089119191999ab9a3370ea00290021091100091999ab9a3370ea00490011190911180180218031aba135573ca00846666ae68cdc3a801a400042444004464c6401466ae7002c02802001c0184d55cea80089baa0012323333573466e1d40052002200923333573466e1d40092000200923263200633573800e00c00800626aae74dd5000a4c24002921035054310032001355003225335333573466e2400520000040031004130023370200290010910010910008891918008009119801980100100081","description":"","type":"PlutusScriptV2"} +`; diff --git a/examples/ExUnits.purs b/examples/ExUnits.purs index bd4e41c293..c728dfdbf8 100644 --- a/examples/ExUnits.purs +++ b/examples/ExUnits.purs @@ -33,7 +33,6 @@ import Contract.Utxos (utxosAt) import Contract.Value as Value import Contract.Wallet (ownStakePubKeyHashes) import Control.Monad.Error.Class (liftMaybe) -import Ctl.Examples.Helpers.LoadScript (loadScript) import Data.Array (head) import Data.BigInt (BigInt) import Data.BigInt as BigInt @@ -123,7 +122,8 @@ spendFromExUnits iters vhash validator txId = do exUnitsScript :: Contract Validator exUnitsScript = do - exUnits <- liftAff $ loadScript "exunits.plutus" liftMaybe (error "Error decoding exUnits") do envelope <- decodeTextEnvelope exUnits Validator <$> plutusScriptV2FromEnvelope envelope + +foreign import exUnits :: String diff --git a/examples/IncludeDatum.purs b/examples/IncludeDatum.purs index 54406ec5bb..438ccd9c55 100644 --- a/examples/IncludeDatum.purs +++ b/examples/IncludeDatum.purs @@ -32,7 +32,6 @@ import Contract.TxConstraints as Constraints import Contract.Utxos (utxosAt) import Contract.Value as Value import Control.Monad.Error.Class (liftMaybe) -import Ctl.Examples.Helpers.LoadScript (loadScript) import Data.Array (head) import Data.BigInt as BigInt import Data.Lens (view) @@ -98,7 +97,16 @@ spendFromIncludeDatum vhash validator txId = do -- | checks if the datum equals 42 only42Script :: Contract Validator only42Script = do - includeDatum <- liftAff $ loadScript "include-datum.plutus" liftMaybe (error "Error decoding includeDatum") do envelope <- decodeTextEnvelope includeDatum Validator <$> plutusScriptV1FromEnvelope envelope + +includeDatum :: String +includeDatum = + """ +{ + "type": "PlutusScriptV1", + "description": "include-datum", + "cborHex": "55540100002225333573466e1cdd6801a40a82930b01" +} +""" diff --git a/examples/Lose7Ada.purs b/examples/Lose7Ada.purs index 1a28a31018..d5eaaa5ceb 100644 --- a/examples/Lose7Ada.purs +++ b/examples/Lose7Ada.purs @@ -36,7 +36,6 @@ import Contract.Utxos (utxosAt) import Contract.Value as Value import Contract.Wallet (getWalletBalance) import Control.Monad.Error.Class (liftMaybe) -import Ctl.Examples.Helpers.LoadScript (loadScript) import Data.BigInt as BigInt import Data.Foldable (fold) import Data.Functor ((<$>)) @@ -118,7 +117,16 @@ spendFromAlwaysFails vhash validator txId = do alwaysFailsScript :: Contract Validator alwaysFailsScript = do - alwaysFails <- liftAff $ loadScript "always-fails.plutus" liftMaybe (error "Error decoding alwaysFails") do envelope <- decodeTextEnvelope alwaysFails Validator <$> plutusScriptV1FromEnvelope envelope + +alwaysFails :: String +alwaysFails = + """ +{ + "type": "PlutusScriptV1", + "description": "", + "cborHex": "581e581c01000033223232222350040071235002353003001498498480048005" +} +""" diff --git a/examples/MintsMultipleTokens.js b/examples/MintsMultipleTokens.js new file mode 100644 index 0000000000..911a34f941 --- /dev/null +++ b/examples/MintsMultipleTokens.js @@ -0,0 +1,17 @@ +export const redeemer1Script = `{ + "cborHex": "59099959099601000032323233223322333222323233322232323232333222333222333333332222222233223333322222333322223322332233223332223322332233223322332232323232323232323232323232323232323232323232323232335001011223304849010e77726f6e672072656465656d657200333504b04a00233504904f4800848888c014cc00cc010008c01800494cd4c12400441484d4060d4c144cd5ce2481025064000524988c8c8c8c8c8c8cccd5cd19b8735573aa00a90001280112803a4c26603ca002a0042600c6ae8540084c050d5d09aba25001135573ca00226ea80084d405d262323232323232323232323232323232323232323232323333573466e1cd55cea80aa40004a0044a02e9309999999999817a800a8012801a8022802a8032803a8042804a805099a81080b1aba15012133502001635742a0202666aa032eb94060d5d0a8070999aa80c3ae501735742a018266a03a0426ae8540284cd4070cd54078085d69aba15008133501675a6ae8540184cd4069d71aba150041335019335501b75c0346ae8540084c080d5d09aba25001135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135573ca00226ea80084d40592623232323232323333573466e1cd55cea802a40004a0044a00e930998102800a8010980b9aba1500213005357426ae8940044d55cf280089baa0021350154988c8c8c8c8c8c8c8c8cccd5cd19b8735573aa00e90001280112804a4c2666046a002a004a006260106ae8540104ccd54029d728049aba15002133500775c6ae84d5d1280089aba25001135573ca00226ea80084d40512623232323232323333573466e1cd55cea802a40004a0044a00e930998112800a8010980a1aba150021335005012357426ae8940044d55cf280089baa002135013498488c8c8c8c8c8c8cccd5cd19b87500448000940089401126135025500113006357426aae79400c4cccd5cd19b875001480089408c9401126135573aa00226ea80084d404d261335500175ceb444888c8c8c004dd58019a80090008918009aa82811191919191919191999aab9f0085505125300212001056350022200135001220023555505712223300321300a357440124266a0a8a00aa600624002266aa0a8a002a004260106aae7540084c018d55cf280089aba10011223232323232323333573466e1cd55cea802a40004a0044a00e93099a8122800a801099a8038031aba150021335007005357426ae8940044d55cf280089baa002135010498488c8c8c8c8c8c8cccd5cd19b8735573aa00a90001280112803a4c266a04ea002a004266a01000c6ae8540084c020d5d09aba25001135573ca00226ea80084d403d261223232323232323333573466e1cd55cea802a40004a0044a00e93099a8122800a801099a8038031aba1500213007357426ae8940044d55cf280089baa00213500e498488c8c8c8c8c8c8c8cccd5cd19b87500548010940a8940092613333573466e1d4011200225002250044984d40a540044c018d5d09aab9e500313333573466e1d4005200025027250044984d55cea80089baa00213500d4988c8c8c8cccd5cd19b875002480088108940092613333573466e1d400520002040250034984d55ce9baa00213500b498488c8c8c004dd60019a80090008918009aa824911999aab9f00125047233504630063574200460066ae88008120800444888c8c8c8c8c8c8cccd5cd19b8735573aa00a90001280112803a4c266aa096a002a0042600e6ae8540084c014d5d09aba25001135573ca00226ea80084d402926232323232323232323232323232323333573466e1d4029200625002250044984c0c140044c038d5d09aab9e500b13333573466e1d401d200425002250044984c0ad40044c030d5d09aab9e500813333573466e1d4011200225002250044984c09d40044c02cd5d09aab9e500513333573466e1d4005200025003250064984d55cea80189812a80089bae357426aae7940044dd500109a803a4c4646464646464646464646464646464646464646464646464646666ae68cdc3a80aa401840844a0049309999ab9a3370ea028900510211280124c26666ae68cdc3a809a40104a0044a00c9309981e2800a80109bae35742a00426eb4d5d09aba25001135573ca02426666ae68cdc3a8072400c4a0044a00c9309981c2800a80109bae35742a00426eb8d5d09aba25001135573ca01a26666ae68cdc3a804a40084a0044a00c9309981ba800a801098069aba150021375c6ae84d5d1280089aab9e500813333573466e1d4011200225002250044984c0cd40044c020d5d09aab9e500513333573466e1d4005200025003250064984d55cea80189816a800898021aba135573ca00226ea80084d40192623232323232323232323232323333573466e1d4021200225002250084984ccc0e140054009400c4dd69aba150041375a6ae8540084dd69aba135744a00226ae8940044d55cf280289999ab9a3370ea0029000128019280324c26aae75400c4c0c540044c010d5d09aab9e50011375400426a00a93119191919191919191999ab9a3370ea0089001128011280224c2606ca00226eb8d5d09aab9e500513333573466e1d4005200025003250064984d55cea80189819a80089bae357426aae7940044dd500109a80224c46464646464646666ae68cdc39aab9d500548000940089401d26133026500150021300635742a00426eb4d5d09aba25001135573ca00226ea80084d400d2623232323333573466e1cd55cea801240004a0044a0089309bae357426aae7940044dd500109a80124c24c4424660020060044002444444444424666666666600201601401201000e00c00a0080060044002442466002006004400244424666002008006004400244246600200600440022424460040062244002240022442466002006004240022442466002006004240022442466002006004240022424446006008224440042244400224002424444600800a424444600600a424444600400a424444600200a40024424660020060044002424444444600e01044244444446600c012010424444444600a010244444440082444444400644244444446600401201044244444446600201201040024244600400644424466600200a00800640024244600400642446002006400244a66a600c0022010266ae7000801c4800488ccd5cd19baf00200100600512001122002122001200123750002224a0082244004244244660020080062400224002400222442466002006004224002224646002002446600660040040022222466a0044246600246a00644600400646a00644600200600224646460020024466006600400400244246a6008246a60080066a0060020021", + "description": "redeemer-1", + "type": "PlutusScriptV1" +}`; + +export const redeemer2Script = `{ + "cborHex": "59099959099601000032323233223322333222323233322232323232333222333222333333332222222233223333322222333322223322332233223332223322332233223322332232323232323232323232323232323232323232323232323232335001011223304849010e77726f6e672072656465656d657200333504b04a00233504904f4801048888c014cc00cc010008c01800494cd4c12400441484d4060d4c144cd5ce2481025064000524988c8c8c8c8c8c8cccd5cd19b8735573aa00a90001280112803a4c26603ca002a0042600c6ae8540084c050d5d09aba25001135573ca00226ea80084d405d262323232323232323232323232323232323232323232323333573466e1cd55cea80aa40004a0044a02e9309999999999817a800a8012801a8022802a8032803a8042804a805099a81080b1aba15012133502001635742a0202666aa032eb94060d5d0a8070999aa80c3ae501735742a018266a03a0426ae8540284cd4070cd54078085d69aba15008133501675a6ae8540184cd4069d71aba150041335019335501b75c0346ae8540084c080d5d09aba25001135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135573ca00226ea80084d40592623232323232323333573466e1cd55cea802a40004a0044a00e930998102800a8010980b9aba1500213005357426ae8940044d55cf280089baa0021350154988c8c8c8c8c8c8c8c8cccd5cd19b8735573aa00e90001280112804a4c2666046a002a004a006260106ae8540104ccd54029d728049aba15002133500775c6ae84d5d1280089aba25001135573ca00226ea80084d40512623232323232323333573466e1cd55cea802a40004a0044a00e930998112800a8010980a1aba150021335005012357426ae8940044d55cf280089baa002135013498488c8c8c8c8c8c8cccd5cd19b87500448000940089401126135025500113006357426aae79400c4cccd5cd19b875001480089408c9401126135573aa00226ea80084d404d261335500175ceb444888c8c8c004dd58019a80090008918009aa82811191919191919191999aab9f0085505125300212001056350022200135001220023555505712223300321300a357440124266a0a8a00aa600624002266aa0a8a002a004260106aae7540084c018d55cf280089aba10011223232323232323333573466e1cd55cea802a40004a0044a00e93099a8122800a801099a8038031aba150021335007005357426ae8940044d55cf280089baa002135010498488c8c8c8c8c8c8cccd5cd19b8735573aa00a90001280112803a4c266a04ea002a004266a01000c6ae8540084c020d5d09aba25001135573ca00226ea80084d403d261223232323232323333573466e1cd55cea802a40004a0044a00e93099a8122800a801099a8038031aba1500213007357426ae8940044d55cf280089baa00213500e498488c8c8c8c8c8c8c8cccd5cd19b87500548010940a8940092613333573466e1d4011200225002250044984d40a540044c018d5d09aab9e500313333573466e1d4005200025027250044984d55cea80089baa00213500d4988c8c8c8cccd5cd19b875002480088108940092613333573466e1d400520002040250034984d55ce9baa00213500b498488c8c8c004dd60019a80090008918009aa824911999aab9f00125047233504630063574200460066ae88008120800444888c8c8c8c8c8c8cccd5cd19b8735573aa00a90001280112803a4c266aa096a002a0042600e6ae8540084c014d5d09aba25001135573ca00226ea80084d402926232323232323232323232323232323333573466e1d4029200625002250044984c0c140044c038d5d09aab9e500b13333573466e1d401d200425002250044984c0ad40044c030d5d09aab9e500813333573466e1d4011200225002250044984c09d40044c02cd5d09aab9e500513333573466e1d4005200025003250064984d55cea80189812a80089bae357426aae7940044dd500109a803a4c4646464646464646464646464646464646464646464646464646666ae68cdc3a80aa401840844a0049309999ab9a3370ea028900510211280124c26666ae68cdc3a809a40104a0044a00c9309981e2800a80109bae35742a00426eb4d5d09aba25001135573ca02426666ae68cdc3a8072400c4a0044a00c9309981c2800a80109bae35742a00426eb8d5d09aba25001135573ca01a26666ae68cdc3a804a40084a0044a00c9309981ba800a801098069aba150021375c6ae84d5d1280089aab9e500813333573466e1d4011200225002250044984c0cd40044c020d5d09aab9e500513333573466e1d4005200025003250064984d55cea80189816a800898021aba135573ca00226ea80084d40192623232323232323232323232323333573466e1d4021200225002250084984ccc0e140054009400c4dd69aba150041375a6ae8540084dd69aba135744a00226ae8940044d55cf280289999ab9a3370ea0029000128019280324c26aae75400c4c0c540044c010d5d09aab9e50011375400426a00a93119191919191919191999ab9a3370ea0089001128011280224c2606ca00226eb8d5d09aab9e500513333573466e1d4005200025003250064984d55cea80189819a80089bae357426aae7940044dd500109a80224c46464646464646666ae68cdc39aab9d500548000940089401d26133026500150021300635742a00426eb4d5d09aba25001135573ca00226ea80084d400d2623232323333573466e1cd55cea801240004a0044a0089309bae357426aae7940044dd500109a80124c24c4424660020060044002444444444424666666666600201601401201000e00c00a0080060044002442466002006004400244424666002008006004400244246600200600440022424460040062244002240022442466002006004240022442466002006004240022442466002006004240022424446006008224440042244400224002424444600800a424444600600a424444600400a424444600200a40024424660020060044002424444444600e01044244444446600c012010424444444600a010244444440082444444400644244444446600401201044244444446600201201040024244600400644424466600200a00800640024244600400642446002006400244a66a600c0022010266ae7000801c4800488ccd5cd19baf00200100600512001122002122001200123750002224a0082244004244244660020080062400224002400222442466002006004224002224646002002446600660040040022222466a0044246600246a00644600400646a00644600200600224646460020024466006600400400244246a6008246a60080066a0060020021", + "description": "redeemer-2", + "type": "PlutusScriptV1" +}`; + +export const redeemer3Script = `{ + "cborHex": "59099959099601000032323233223322333222323233322232323232333222333222333333332222222233223333322222333322223322332233223332223322332233223322332232323232323232323232323232323232323232323232323232335001011223304849010e77726f6e672072656465656d657200333504b04a00233504904f4801848888c014cc00cc010008c01800494cd4c12400441484d4060d4c144cd5ce2481025064000524988c8c8c8c8c8c8cccd5cd19b8735573aa00a90001280112803a4c26603ca002a0042600c6ae8540084c050d5d09aba25001135573ca00226ea80084d405d262323232323232323232323232323232323232323232323333573466e1cd55cea80aa40004a0044a02e9309999999999817a800a8012801a8022802a8032803a8042804a805099a81080b1aba15012133502001635742a0202666aa032eb94060d5d0a8070999aa80c3ae501735742a018266a03a0426ae8540284cd4070cd54078085d69aba15008133501675a6ae8540184cd4069d71aba150041335019335501b75c0346ae8540084c080d5d09aba25001135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135573ca00226ea80084d40592623232323232323333573466e1cd55cea802a40004a0044a00e930998102800a8010980b9aba1500213005357426ae8940044d55cf280089baa0021350154988c8c8c8c8c8c8c8c8cccd5cd19b8735573aa00e90001280112804a4c2666046a002a004a006260106ae8540104ccd54029d728049aba15002133500775c6ae84d5d1280089aba25001135573ca00226ea80084d40512623232323232323333573466e1cd55cea802a40004a0044a00e930998112800a8010980a1aba150021335005012357426ae8940044d55cf280089baa002135013498488c8c8c8c8c8c8cccd5cd19b87500448000940089401126135025500113006357426aae79400c4cccd5cd19b875001480089408c9401126135573aa00226ea80084d404d261335500175ceb444888c8c8c004dd58019a80090008918009aa82811191919191919191999aab9f0085505125300212001056350022200135001220023555505712223300321300a357440124266a0a8a00aa600624002266aa0a8a002a004260106aae7540084c018d55cf280089aba10011223232323232323333573466e1cd55cea802a40004a0044a00e93099a8122800a801099a8038031aba150021335007005357426ae8940044d55cf280089baa002135010498488c8c8c8c8c8c8cccd5cd19b8735573aa00a90001280112803a4c266a04ea002a004266a01000c6ae8540084c020d5d09aba25001135573ca00226ea80084d403d261223232323232323333573466e1cd55cea802a40004a0044a00e93099a8122800a801099a8038031aba1500213007357426ae8940044d55cf280089baa00213500e498488c8c8c8c8c8c8c8cccd5cd19b87500548010940a8940092613333573466e1d4011200225002250044984d40a540044c018d5d09aab9e500313333573466e1d4005200025027250044984d55cea80089baa00213500d4988c8c8c8cccd5cd19b875002480088108940092613333573466e1d400520002040250034984d55ce9baa00213500b498488c8c8c004dd60019a80090008918009aa824911999aab9f00125047233504630063574200460066ae88008120800444888c8c8c8c8c8c8cccd5cd19b8735573aa00a90001280112803a4c266aa096a002a0042600e6ae8540084c014d5d09aba25001135573ca00226ea80084d402926232323232323232323232323232323333573466e1d4029200625002250044984c0c140044c038d5d09aab9e500b13333573466e1d401d200425002250044984c0ad40044c030d5d09aab9e500813333573466e1d4011200225002250044984c09d40044c02cd5d09aab9e500513333573466e1d4005200025003250064984d55cea80189812a80089bae357426aae7940044dd500109a803a4c4646464646464646464646464646464646464646464646464646666ae68cdc3a80aa401840844a0049309999ab9a3370ea028900510211280124c26666ae68cdc3a809a40104a0044a00c9309981e2800a80109bae35742a00426eb4d5d09aba25001135573ca02426666ae68cdc3a8072400c4a0044a00c9309981c2800a80109bae35742a00426eb8d5d09aba25001135573ca01a26666ae68cdc3a804a40084a0044a00c9309981ba800a801098069aba150021375c6ae84d5d1280089aab9e500813333573466e1d4011200225002250044984c0cd40044c020d5d09aab9e500513333573466e1d4005200025003250064984d55cea80189816a800898021aba135573ca00226ea80084d40192623232323232323232323232323333573466e1d4021200225002250084984ccc0e140054009400c4dd69aba150041375a6ae8540084dd69aba135744a00226ae8940044d55cf280289999ab9a3370ea0029000128019280324c26aae75400c4c0c540044c010d5d09aab9e50011375400426a00a93119191919191919191999ab9a3370ea0089001128011280224c2606ca00226eb8d5d09aab9e500513333573466e1d4005200025003250064984d55cea80189819a80089bae357426aae7940044dd500109a80224c46464646464646666ae68cdc39aab9d500548000940089401d26133026500150021300635742a00426eb4d5d09aba25001135573ca00226ea80084d400d2623232323333573466e1cd55cea801240004a0044a0089309bae357426aae7940044dd500109a80124c24c4424660020060044002444444444424666666666600201601401201000e00c00a0080060044002442466002006004400244424666002008006004400244246600200600440022424460040062244002240022442466002006004240022442466002006004240022442466002006004240022424446006008224440042244400224002424444600800a424444600600a424444600400a424444600200a40024424660020060044002424444444600e01044244444446600c012010424444444600a010244444440082444444400644244444446600401201044244444446600201201040024244600400644424466600200a00800640024244600400642446002006400244a66a600c0022010266ae7000801c4800488ccd5cd19baf00200100600512001122002122001200123750002224a0082244004244244660020080062400224002400222442466002006004224002224646002002446600660040040022222466a0044246600246a00644600400646a00644600200600224646460020024466006600400400244246a6008246a60080066a0060020021", + "description": "redeemer-3", + "type": "PlutusScriptV1" +}`; diff --git a/examples/MintsMultipleTokens.purs b/examples/MintsMultipleTokens.purs index bdba95fcf6..4cb4cd0312 100644 --- a/examples/MintsMultipleTokens.purs +++ b/examples/MintsMultipleTokens.purs @@ -30,7 +30,6 @@ import Ctl.Examples.Helpers ( mkCurrencySymbol , mkTokenName ) as Helpers -import Ctl.Examples.Helpers.LoadScript (loadScript) import Data.BigInt (fromInt) as BigInt import Effect.Exception (error) @@ -75,23 +74,24 @@ example :: ContractParams -> Effect Unit example cfg = launchAff_ do runContract cfg contract +foreign import redeemer1Script :: String +foreign import redeemer2Script :: String +foreign import redeemer3Script :: String + mintingPolicyRdmrInt1 :: Contract MintingPolicy mintingPolicyRdmrInt1 = do - redeemerInt1 <- liftAff $ loadScript "redeemer1.plutus" - liftMaybe (error "Error decoding redeemerInt1") do - envelope <- decodeTextEnvelope redeemerInt1 + liftMaybe (error "Error decoding redeemer1Script") do + envelope <- decodeTextEnvelope redeemer1Script PlutusMintingPolicy <$> plutusScriptV1FromEnvelope envelope mintingPolicyRdmrInt2 :: Contract MintingPolicy mintingPolicyRdmrInt2 = do - redeemerInt2 <- liftAff $ loadScript "redeemer2.plutus" - liftMaybe (error "Error decoding redeemerInt2") do - envelope <- decodeTextEnvelope redeemerInt2 + liftMaybe (error "Error decoding redeemer2Script") do + envelope <- decodeTextEnvelope redeemer2Script PlutusMintingPolicy <$> plutusScriptV1FromEnvelope envelope mintingPolicyRdmrInt3 :: Contract MintingPolicy mintingPolicyRdmrInt3 = do - redeemerInt3 <- liftAff $ loadScript "redeemer3.plutus" - liftMaybe (error "Error decoding redeemerInt3") do - envelope <- decodeTextEnvelope redeemerInt3 + liftMaybe (error "Error decoding redeemer3Script") do + envelope <- decodeTextEnvelope redeemer3Script PlutusMintingPolicy <$> plutusScriptV1FromEnvelope envelope diff --git a/examples/MultipleRedeemers.js b/examples/MultipleRedeemers.js new file mode 100644 index 0000000000..0f3fd9df94 --- /dev/null +++ b/examples/MultipleRedeemers.js @@ -0,0 +1,17 @@ +export const redeemerIs1Script = `{ + "description": "validator that checks whether redeemer is 1", + "cborHex": "4e4d0100002223375e0046ea120021", + "type": "PlutusScriptV1" +}`; + +export const redeemerIs2Script = `{ + "description": "validator that checks whether redeemer is 2", + "cborHex": "4e4d0100002223375e0046ea120041", + "type": "PlutusScriptV1" +}`; + +export const redeemerIs3Script = `{ + "description": "validator that checks whether redeemer is 3", + "cborHex": "4e4d0100002223375e0046ea120061", + "type": "PlutusScriptV1" +}`; diff --git a/examples/MultipleRedeemers.purs b/examples/MultipleRedeemers.purs index 5b96c9b6cc..a8811323ee 100644 --- a/examples/MultipleRedeemers.purs +++ b/examples/MultipleRedeemers.purs @@ -30,7 +30,6 @@ import Ctl.Examples.Helpers ( mkCurrencySymbol , mkTokenName ) -import Ctl.Examples.Helpers.LoadScript (loadScript) import Ctl.Examples.MintsMultipleTokens ( mintingPolicyRdmrInt3 ) @@ -119,26 +118,27 @@ spendLockedByIntOutputParams (validator /\ redeemerVal) = do pure $ constraints /\ (Lookups.unspentOutputs utxo <> Lookups.validator validator) +foreign import redeemerIs1Script :: String +foreign import redeemerIs2Script :: String +foreign import redeemerIs3Script :: String + -- | checks whether redeemer is 1 redeemerIs1Validator :: Contract Validator redeemerIs1Validator = do - vredeemerInt1 <- liftAff $ loadScript "redeemer1-validator.plutus" - liftMaybe (error "Error decoding vredeemerInt1") do - envelope <- decodeTextEnvelope vredeemerInt1 + liftMaybe (error "Error decoding redeemerIs1Script") do + envelope <- decodeTextEnvelope redeemerIs1Script Validator <$> plutusScriptV1FromEnvelope envelope -- | checks whether redeemer is 2 redeemerIs2Validator :: Contract Validator redeemerIs2Validator = do - vredeemerInt2 <- liftAff $ loadScript "redeemer2-validator.plutus" - liftMaybe (error "Error decoding vredeemerInt2") do - envelope <- decodeTextEnvelope vredeemerInt2 + liftMaybe (error "Error decoding redeemerIs2Script") do + envelope <- decodeTextEnvelope redeemerIs2Script Validator <$> plutusScriptV1FromEnvelope envelope -- | checks whether redeemer is 3 redeemerIs3Validator :: Contract Validator redeemerIs3Validator = do - vredeemerInt3 <- liftAff $ loadScript "redeemer3-validator.plutus" - liftMaybe (error "Error decoding vredeemerInt3") do - envelope <- decodeTextEnvelope vredeemerInt3 + liftMaybe (error "Error decoding redeemerIs3Script") do + envelope <- decodeTextEnvelope redeemerIs3Script Validator <$> plutusScriptV1FromEnvelope envelope diff --git a/examples/OneShotMinting.js b/examples/OneShotMinting.js new file mode 100644 index 0000000000..532b17cfff --- /dev/null +++ b/examples/OneShotMinting.js @@ -0,0 +1,5 @@ +export const oneShotMinting = `{ + "type": "PlutusScriptV1", + "description": "one-shot-minting", + "cborHex": "5908d75908d401000033232332233223232323232323232323232323232323232323222223232323232325335533533355300b120013232123300122333500522002002001002350012200112330012253350021022100101f2325335333573466e3cd400488008d4014880080840804ccd5cd19b873500122001350052200102102010203500122002355001222222222200a101e101f1326353357389201115574786f206e6f7420636f6e73756d65640001b0191533553355335323301d50220013550012222222222007101e22135002222533500415335333573466e3c00cd401c88cccd40048c98d4cd5ce2481024c680002302120012326353357389201024c68000230212326353357389201024c680002302102402315335333573466e3c00802409008c4ccd5cd19b870014800809008c408c408c8840944078407c4c98d4cd5ce24811357726f6e6720616d6f756e74206d696e7465640001b019101b135001220023333573466e1cd55cea8022400046644246600200600464646464646464646464646666ae68cdc39aab9d500a480008cccccccccc888888888848cccccccccc00402c02802402001c01801401000c008cd40648c8c8cccd5cd19b8735573aa0049000119910919800801801180d9aba15002301e357426ae8940088c98d4cd5ce01481501401389aab9e5001137540026ae854028cd4064068d5d0a804999aa80e3ae501b35742a010666aa038eb9406cd5d0a80399a80c8101aba15006335019335502302175a6ae854014c8c8c8cccd5cd19b8735573aa00490001199109198008018011919191999ab9a3370e6aae754009200023322123300100300233502675a6ae854008c09cd5d09aba2500223263533573805a05c05805626aae7940044dd50009aba150023232323333573466e1cd55cea8012400046644246600200600466a04ceb4d5d0a80118139aba135744a004464c6a66ae700b40b80b00ac4d55cf280089baa001357426ae8940088c98d4cd5ce01481501401389aab9e5001137540026ae854010cd4065d71aba15003335019335502375c40026ae854008c060d5d09aba2500223263533573804a04c04804626ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135744a00226aae7940044dd50009aba150043232323333573466e1d400520062321222230040053018357426aae79400c8cccd5cd19b875002480108c848888c008014c068d5d09aab9e500423333573466e1d400d20022321222230010053011357426aae7940148cccd5cd19b875004480008c848888c00c014dd71aba135573ca00c464c6a66ae7008008407c07807407006c4d55cea80089baa001357426ae8940108c98d4cd5ce00c80d00c00b98048031bae006135573ca00226ea8004c8004d5406088448894cd40044d400c88004884ccd401488008c010008ccd54c01c480040140100048c8c8cccd5cd19b8735573aa004900011991091980080180118029aba15002375a6ae84d5d1280111931a99ab9c012013011010135573ca00226ea80048c8cccd5cd19b8735573aa002900011bae357426aae7940088c98d4cd5ce00800880780709baa0011232230023758002640026aa02c446666aae7c0049405c8cd4058c010d5d080118019aba200201023232323333573466e1cd55cea801a40004666444246660020080060046464646666ae68cdc39aab9d5002480008cc8848cc00400c008c044d5d0a80119a8060081aba135744a004464c6a66ae7005005404c0484d55cf280089baa00135742a006666aa00eeb94018d5d0a80119a8043ae357426ae8940088c98d4cd5ce00800880780709aba25001135573ca00226ea80044cd54005d73ad112232230023756002640026aa02844646666aae7c008940588cd4054cd5405cc018d55cea80118029aab9e500230043574400601e26ae84004488c8c8cccd5cd19b875001480008c8488c00800cc014d5d09aab9e500323333573466e1d40092002212200123263533573801c01e01a01801626aae7540044dd500089119191999ab9a3370ea00290021091100091999ab9a3370ea00490011190911180180218031aba135573ca00846666ae68cdc3a801a400042444004464c6a66ae7003803c03403002c0284d55cea80089baa0012323333573466e1d40052002200e23333573466e1d40092000200e23263533573801401601201000e26aae74dd5000919191919191999ab9a3370ea002900610911111100191999ab9a3370ea004900510911111100211999ab9a3370ea00690041199109111111198008048041bae35742a00a6eb4d5d09aba2500523333573466e1d40112006233221222222233002009008375c6ae85401cdd71aba135744a00e46666ae68cdc3a802a400846644244444446600c01201060186ae854024dd71aba135744a01246666ae68cdc3a8032400446424444444600e010601a6ae84d55cf280591999ab9a3370ea00e900011909111111180280418071aba135573ca018464c6a66ae7004804c04404003c03803403002c0284d55cea80209aab9e5003135573ca00426aae7940044dd50009191919191999ab9a3370ea002900111999110911998008028020019bad35742a0086eb4d5d0a8019bad357426ae89400c8cccd5cd19b875002480008c8488c00800cc020d5d09aab9e500623263533573801601801401201026aae75400c4d5d1280089aab9e500113754002464646666ae68cdc3a800a400446424460020066eb8d5d09aab9e500323333573466e1d400920002321223002003375c6ae84d55cf280211931a99ab9c008009007006005135573aa00226ea800444888c8c8cccd5cd19b8735573aa0049000119aa80818031aba150023005357426ae8940088c98d4cd5ce00400480380309aab9e5001137540029324903505431001200132001355007222533500110022213500222330073330080020060010033200135500622225335001100222135002225335333573466e1c005200000a0091333008007006003133300800733500b1233300100800300200600312200212200111220021221223300100400311221233001003002112323001001223300330020020014c1074643544c4e46540001" +}`; diff --git a/examples/OneShotMinting.purs b/examples/OneShotMinting.purs index a9d82a586e..ed1fb96e53 100644 --- a/examples/OneShotMinting.purs +++ b/examples/OneShotMinting.purs @@ -50,7 +50,6 @@ import Contract.Wallet (getWalletUtxos) import Control.Monad.Error.Class (liftMaybe) import Control.Monad.Trans.Class (lift) import Ctl.Examples.Helpers (mkCurrencySymbol, mkTokenName) as Helpers -import Ctl.Examples.Helpers.LoadScript (loadScript) import Data.Array (head, singleton) as Array import Data.BigInt (BigInt) import Data.Map (toUnfoldable) as Map @@ -119,7 +118,6 @@ oneShotMintingPolicy = oneShotMintingPolicyScript :: TransactionInput -> Contract PlutusScript oneShotMintingPolicyScript txInput = do - oneShotMinting <- liftAff $ loadScript "one-shot-minting.plutus" script <- liftMaybe (error "Error decoding oneShotMinting") do envelope <- decodeTextEnvelope oneShotMinting plutusScriptV1FromEnvelope envelope @@ -135,3 +133,5 @@ mkOneShotMintingPolicy unappliedMintingPolicy oref = mintingPolicyArgs = Array.singleton (toData oref) in applyArgs unappliedMintingPolicy mintingPolicyArgs + +foreign import oneShotMinting :: String diff --git a/examples/PlutusV2/InlineDatum.js b/examples/PlutusV2/InlineDatum.js new file mode 100644 index 0000000000..030fa63eed --- /dev/null +++ b/examples/PlutusV2/InlineDatum.js @@ -0,0 +1,5 @@ +export const checkDatumIsInline = `{ + "type": "PlutusScriptV2", + "description": "", + "cborHex": "59088859088501000032332232323233223232323232323232323322323232323232322223232533532325335001101b13357389211d556e657870656374656420646174756d206174206f776e20696e7075740001a323253335002153335001101c2101c2101c2153335002101c21333573466ebc00800407807484074854ccd400840708407484ccd5cd19b8f00200101e01d323500122220023235001220013553353500222350022222222222223333500d2501e2501e2501e233355302d12001321233001225335002210031001002501e2350012253355335333573466e3cd400888008d4010880080b40b04ccd5cd19b873500222001350042200102d02c102c1350220031502100d21123001002162001300a0053333573466e1cd55cea80124000466442466002006004646464646464646464646464646666ae68cdc39aab9d500c480008cccccccccccc88888888888848cccccccccccc00403403002c02802402001c01801401000c008cd4054058d5d0a80619a80a80b1aba1500b33501501735742a014666aa034eb94064d5d0a804999aa80d3ae501935742a01066a02a0426ae85401cccd54068089d69aba150063232323333573466e1cd55cea801240004664424660020060046464646666ae68cdc39aab9d5002480008cc8848cc00400c008cd40b1d69aba15002302d357426ae8940088c98c80bccd5ce01901881689aab9e5001137540026ae854008c8c8c8cccd5cd19b8735573aa004900011991091980080180119a8163ad35742a004605a6ae84d5d1280111931901799ab9c03203102d135573ca00226ea8004d5d09aba2500223263202b33573805c05a05226aae7940044dd50009aba1500533501575c6ae854010ccd540680788004d5d0a801999aa80d3ae200135742a00460406ae84d5d1280111931901399ab9c02a029025135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d55cf280089baa00135742a00460206ae84d5d1280111931900c99ab9c01c01b017101a132632018335738921035054350001a135573ca00226ea800448c88c008dd6000990009aa80d111999aab9f0012501c233501b30043574200460066ae8800805c8c8c8cccd5cd19b8735573aa004900011991091980080180118069aba150023005357426ae8940088c98c8054cd5ce00c00b80989aab9e5001137540024646464646666ae68cdc39aab9d5004480008cccc888848cccc00401401000c008c8c8c8cccd5cd19b8735573aa0049000119910919800801801180b1aba1500233500e015357426ae8940088c98c8068cd5ce00e80e00c09aab9e5001137540026ae854010ccd54025d728041aba150033232323333573466e1d400520042300b357426aae79400c8cccd5cd19b875002480088c84888c004010dd71aba135573ca00846666ae68cdc3a801a400042444006464c6403866ae7007c0780680640604d55cea80089baa00135742a00466a014eb8d5d09aba2500223263201633573803203002826ae8940044d5d1280089aab9e500113754002424446004008266aa002eb9d6889119118011bab00132001355016223233335573e0044a032466a03066442466002006004600c6aae754008c014d55cf280118021aba200301413574200224464646666ae68cdc3a800a400046a00e600a6ae84d55cf280191999ab9a3370ea00490011280391931900919ab9c01501401000f135573aa00226ea800448488c00800c44880048c8c8cccd5cd19b875001480188c848888c010014c01cd5d09aab9e500323333573466e1d400920042321222230020053009357426aae7940108cccd5cd19b875003480088c848888c004014c01cd5d09aab9e500523333573466e1d40112000232122223003005375c6ae84d55cf280311931900819ab9c01301200e00d00c00b135573aa00226ea80048c8c8cccd5cd19b8735573aa004900011991091980080180118029aba15002375a6ae84d5d1280111931900619ab9c00f00e00a135573ca00226ea80048c8cccd5cd19b8735573aa002900011bae357426aae7940088c98c8028cd5ce00680600409baa001232323232323333573466e1d4005200c21222222200323333573466e1d4009200a21222222200423333573466e1d400d2008233221222222233001009008375c6ae854014dd69aba135744a00a46666ae68cdc3a8022400c4664424444444660040120106eb8d5d0a8039bae357426ae89401c8cccd5cd19b875005480108cc8848888888cc018024020c030d5d0a8049bae357426ae8940248cccd5cd19b875006480088c848888888c01c020c034d5d09aab9e500b23333573466e1d401d2000232122222223005008300e357426aae7940308c98c804ccd5ce00b00a80880800780700680600589aab9d5004135573ca00626aae7940084d55cf280089baa0012323232323333573466e1d400520022333222122333001005004003375a6ae854010dd69aba15003375a6ae84d5d1280191999ab9a3370ea0049000119091180100198041aba135573ca00c464c6401866ae7003c0380280244d55cea80189aba25001135573ca00226ea80048c8c8cccd5cd19b875001480088c8488c00400cdd71aba135573ca00646666ae68cdc3a8012400046424460040066eb8d5d09aab9e500423263200933573801801600e00c26aae7540044dd500089119191999ab9a3370ea00290021091100091999ab9a3370ea00490011190911180180218031aba135573ca00846666ae68cdc3a801a400042444004464c6401466ae7003403002001c0184d55cea80089baa0012323333573466e1d40052002200623333573466e1d40092000200623263200633573801201000800626aae74dd5000a4c24400424400224002920103505431003200135500322112225335001135003220012213335005220023004002333553007120010050040011122002122122330010040031123230010012233003300200200101" +}`; diff --git a/examples/PlutusV2/InlineDatum.purs b/examples/PlutusV2/InlineDatum.purs index 4530608ba2..931dc73ca1 100644 --- a/examples/PlutusV2/InlineDatum.purs +++ b/examples/PlutusV2/InlineDatum.purs @@ -38,7 +38,6 @@ import Contract.TxConstraints as Constraints import Contract.Utxos (utxosAt) import Contract.Value as Value import Control.Monad.Error.Class (liftMaybe) -import Ctl.Examples.Helpers.LoadScript (loadScript) import Data.BigInt as BigInt import Data.Map as Map import Effect.Exception (error) @@ -164,7 +163,8 @@ readFromCheckDatumIsInline vhash txId = do checkDatumIsInlineScript :: Contract Validator checkDatumIsInlineScript = do - checkDatumIsInline <- liftAff $ loadScript "check-datum-is-inline.plutus" liftMaybe (error "Error decoding checkDatumIsInline") do envelope <- decodeTextEnvelope checkDatumIsInline Validator <$> plutusScriptV2FromEnvelope envelope + +foreign import checkDatumIsInline :: String diff --git a/examples/PlutusV2/OneShotMinting.js b/examples/PlutusV2/OneShotMinting.js new file mode 100644 index 0000000000..8a572af4a4 --- /dev/null +++ b/examples/PlutusV2/OneShotMinting.js @@ -0,0 +1,5 @@ +export const oneShotMinting = `{ + "type": "PlutusScriptV2", + "description": "one-shot-minting", + "cborHex": "59092c59092901000033233223322323232323232323232323232323232323232323222223232323232325335533533355300b12001323212330012233350052200200200100235001220011233001225335002102310010202325335333573466e3cd400488008d4014880080880844ccd5cd19b87350012200135005220010220211021350012200235500122222222222200c101f102013263201b335738921115574786f206e6f7420636f6e73756d65640001c1533553355335323301e5023001355001222222222222008101f22135002222533500415335333573466e3c00cd401c88cccd40048c98c808ccd5ce2481024c680002420012326320233357389201024c68000242326320233357389201024c680002402502415335333573466e3c0080240940904ccd5cd19b870014800809409040904090884098407c40804c98c806ccd5ce24811357726f6e6720616d6f756e74206d696e7465640001c101c135001220023333573466e1cd55cea80224000466442466002006004646464646464646464646464646666ae68cdc39aab9d500c480008cccccccccccc88888888888848cccccccccccc00403403002c02802402001c01801401000c008cd4064068d5d0a80619a80c80d1aba1500b33501901b35742a014666aa03aeb94070d5d0a804999aa80ebae501c35742a01066a0320446ae85401cccd5407408dd69aba150063232323333573466e1cd55cea801240004664424660020060046464646666ae68cdc39aab9d5002480008cc8848cc00400c008cd40b5d69aba15002302e357426ae8940088c98c80c0cd5ce01801881709aab9e5001137540026ae854008c8c8c8cccd5cd19b8735573aa004900011991091980080180119a816bad35742a004605c6ae84d5d1280111931901819ab9c03003102e135573ca00226ea8004d5d09aba2500223263202c33573805805a05426aae7940044dd50009aba1500533501975c6ae854010ccd5407407c8004d5d0a801999aa80ebae200135742a00460426ae84d5d1280111931901419ab9c028029026135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d55cf280089baa00135742a00860226ae84d5d1280211931900d19ab9c01a01b0183010006375c00c26aae7940044dd5000990009aa80c1108911299a80089a80191000910999a802910011802001199aa9803890008028020008919118011bac001320013550182233335573e0024a034466a03260086ae84008c00cd5d1001009919191999ab9a3370e6aae7540092000233221233001003002300a35742a004600a6ae84d5d1280111931900919ab9c012013010135573ca00226ea80048c8c8c8c8cccd5cd19b8735573aa00890001199991110919998008028020018011919191999ab9a3370e6aae7540092000233221233001003002301335742a00466a01a0246ae84d5d1280111931900b99ab9c017018015135573ca00226ea8004d5d0a802199aa8043ae500735742a0066464646666ae68cdc3a800a4008464244460040086ae84d55cf280191999ab9a3370ea0049001119091118008021bae357426aae7940108cccd5cd19b875003480008488800c8c98c8064cd5ce00c80d00b80b00a89aab9d5001137540026ae854008cd4025d71aba135744a004464c6402666ae7004c0500444d5d1280089aba25001135573ca00226ea80044cd54005d73ad112232230023756002640026aa02a44646666aae7c008940608cd405ccc8848cc00400c008c018d55cea80118029aab9e500230043574400602226ae84004488c8c8cccd5cd19b875001480008c8488c00800cc014d5d09aab9e500323333573466e1d40092002212200123263201033573802002201c01a26aae7540044dd5000919191999ab9a3370ea002900311909111180200298039aba135573ca00646666ae68cdc3a8012400846424444600400a60126ae84d55cf280211999ab9a3370ea006900111909111180080298039aba135573ca00a46666ae68cdc3a8022400046424444600600a6eb8d5d09aab9e500623263201033573802002201c01a01801626aae7540044dd5000919191999ab9a3370e6aae7540092000233221233001003002300535742a0046eb4d5d09aba2500223263200c33573801801a01426aae7940044dd50009191999ab9a3370e6aae75400520002375c6ae84d55cf280111931900519ab9c00a00b00813754002464646464646666ae68cdc3a800a401842444444400646666ae68cdc3a8012401442444444400846666ae68cdc3a801a40104664424444444660020120106eb8d5d0a8029bad357426ae8940148cccd5cd19b875004480188cc8848888888cc008024020dd71aba15007375c6ae84d5d1280391999ab9a3370ea00a900211991091111111980300480418061aba15009375c6ae84d5d1280491999ab9a3370ea00c900111909111111180380418069aba135573ca01646666ae68cdc3a803a400046424444444600a010601c6ae84d55cf280611931900999ab9c01301401101000f00e00d00c00b135573aa00826aae79400c4d55cf280109aab9e5001137540024646464646666ae68cdc3a800a4004466644424466600200a0080066eb4d5d0a8021bad35742a0066eb4d5d09aba2500323333573466e1d4009200023212230020033008357426aae7940188c98c8030cd5ce00600680500489aab9d5003135744a00226aae7940044dd5000919191999ab9a3370ea002900111909118008019bae357426aae79400c8cccd5cd19b875002480008c8488c00800cdd71aba135573ca008464c6401266ae7002402801c0184d55cea80089baa00112232323333573466e1d400520042122200123333573466e1d40092002232122230030043006357426aae7940108cccd5cd19b87500348000848880088c98c8028cd5ce00500580400380309aab9d5001137540024646666ae68cdc3a800a4004401446666ae68cdc3a801240004014464c6400c66ae7001801c01000c4d55ce9baa001499240103505431001200132001355006222533500110022213500222330073330080020060010033200135500522225335001100222135002225335333573466e1c005200000a0091333008007006003133300800733500b12333001008003002006003122002122001112200212212233001004003112323001001223300330020020014c01074643544c4e46540001" +}`; diff --git a/examples/PlutusV2/OneShotMinting.purs b/examples/PlutusV2/OneShotMinting.purs index c229d6fcd9..83c1d44136 100644 --- a/examples/PlutusV2/OneShotMinting.purs +++ b/examples/PlutusV2/OneShotMinting.purs @@ -22,7 +22,6 @@ import Contract.Scripts (MintingPolicy(PlutusMintingPolicy), PlutusScript) import Contract.TextEnvelope (decodeTextEnvelope, plutusScriptV2FromEnvelope) import Contract.Transaction (TransactionInput) import Control.Monad.Error.Class (liftMaybe) -import Ctl.Examples.Helpers.LoadScript (loadScript) import Ctl.Examples.OneShotMinting ( mkContractWithAssertions , mkOneShotMintingPolicy @@ -47,10 +46,10 @@ oneShotMintingPolicyV2 = oneShotMintingPolicyScriptV2 :: TransactionInput -> Contract PlutusScript oneShotMintingPolicyScriptV2 txInput = do - oneShotMinting <- liftAff $ loadScript "one-shot-minting-v2.plutus" script <- liftMaybe (error "Error decoding oneShotMinting") do envelope <- decodeTextEnvelope oneShotMinting plutusScriptV2FromEnvelope envelope liftContractE $ mkOneShotMintingPolicy script txInput +foreign import oneShotMinting :: String diff --git a/examples/PlutusV2/Scripts/AlwaysMints.purs b/examples/PlutusV2/Scripts/AlwaysMints.purs index 4d72ac89b1..15b9f072e3 100644 --- a/examples/PlutusV2/Scripts/AlwaysMints.purs +++ b/examples/PlutusV2/Scripts/AlwaysMints.purs @@ -9,7 +9,6 @@ import Contract.Monad (Contract) import Contract.Scripts (MintingPolicy(PlutusMintingPolicy), PlutusScript) import Contract.TextEnvelope (decodeTextEnvelope, plutusScriptV2FromEnvelope) import Control.Monad.Error.Class (liftMaybe) -import Ctl.Examples.Helpers.LoadScript (loadScript) import Effect.Exception (error) alwaysMintsPolicyV2 :: Contract MintingPolicy @@ -17,7 +16,16 @@ alwaysMintsPolicyV2 = PlutusMintingPolicy <$> alwaysMintsPolicyScriptV2 alwaysMintsPolicyScriptV2 :: Contract PlutusScript alwaysMintsPolicyScriptV2 = do - alwaysMintsV2 <- liftAff $ loadScript "always-mints-v2.plutus" liftMaybe (error "Error decoding alwaysMintsV2") do envelope <- decodeTextEnvelope alwaysMintsV2 plutusScriptV2FromEnvelope envelope + +alwaysMintsV2 :: String +alwaysMintsV2 = + """ +{ + "cborHex": "484701000022120011", + "description": "always-mints", + "type": "PlutusScriptV2" +} +""" diff --git a/examples/PlutusV2/Scripts/AlwaysSucceeds.purs b/examples/PlutusV2/Scripts/AlwaysSucceeds.purs index fd9a57081d..6fd1387c79 100644 --- a/examples/PlutusV2/Scripts/AlwaysSucceeds.purs +++ b/examples/PlutusV2/Scripts/AlwaysSucceeds.purs @@ -8,12 +8,20 @@ import Contract.Monad (Contract) import Contract.Scripts (Validator(Validator)) import Contract.TextEnvelope (decodeTextEnvelope, plutusScriptV2FromEnvelope) import Control.Monad.Error.Class (liftMaybe) -import Ctl.Examples.Helpers.LoadScript (loadScript) import Effect.Exception (error) alwaysSucceedsScriptV2 :: Contract Validator alwaysSucceedsScriptV2 = do - alwaysSucceedsV2 <- liftAff $ loadScript "always-succeeds-v2.plutus" liftMaybe (error "Error decoding alwaysSucceeds") do envelope <- decodeTextEnvelope alwaysSucceedsV2 Validator <$> plutusScriptV2FromEnvelope envelope + +alwaysSucceedsV2 :: String +alwaysSucceedsV2 = + """ +{ + "cborHex": "4e4d01000033222220051200120011", + "description": "always-succeeds", + "type": "PlutusScriptV2" +} +""" diff --git a/examples/Schnorr.purs b/examples/Schnorr.purs index ec43007c29..e5461d29de 100644 --- a/examples/Schnorr.purs +++ b/examples/Schnorr.purs @@ -11,7 +11,7 @@ import Contract.Crypto.Secp256k1.Schnorr ) import Contract.Crypto.Secp256k1.Utils (randomSecp256k1PrivateKey) import Contract.Log (logInfo') -import Contract.Monad (Contract, liftContractAffM, liftContractM) +import Contract.Monad (Contract, liftContractM) import Contract.Numeric.BigNum as BigNum import Contract.PlutusData ( class ToData @@ -32,7 +32,6 @@ import Contract.Transaction import Contract.TxConstraints as Constraints import Contract.Utxos (utxosAt) import Contract.Value as Value -import Ctl.Examples.Helpers.LoadScript (loadScript) import Data.Map as Map import Data.Set as Set @@ -56,7 +55,7 @@ contract = do -- | Prepare the ECDSA test by locking some funds at the validator address prepTest :: Contract TransactionHash prepTest = do - validator <- liftContractAffM "Caonnot get validator" getValidator + validator <- liftContractM "Caonnot get validator" getValidator let valHash = validatorHash validator val = Value.lovelaceValueOf one @@ -81,7 +80,7 @@ testVerification testVerification txId ecdsaRed = do let red = Redeemer $ toData ecdsaRed - validator <- liftContractAffM "Can't get validator" getValidator + validator <- liftContractM "Can't get validator" getValidator let valHash = validatorHash validator netId <- getNetworkId @@ -123,8 +122,17 @@ testSchnorr txId = do , pk: publicKey } -getValidator :: Aff (Maybe Validator) -getValidator = - loadScript "validate-schnorr.plutus" <#> \validateSchnorr -> do - envelope <- decodeTextEnvelope validateSchnorr - Validator <$> plutusScriptV2FromEnvelope envelope +getValidator :: Maybe Validator +getValidator = do + Validator <$> + (plutusScriptV2FromEnvelope =<< decodeTextEnvelope validateSchnorrScript) + +validateSchnorrScript :: String +validateSchnorrScript = + """ +{ + "type": "PlutusScriptV2", + "description": "", + "cborHex": "59080459080101000032323232332232323232323232323233223232323232223232322323253353232323500222253353335734666ed400400c00808007c40804cd5ce249167369676e617475726520636865636b206661696c65640001f3333573466e1cd55cea80224000466442466002006004646464646464646464646464646666ae68cdc39aab9d500c480008cccccccccccc88888888888848cccccccccccc00403403002c02802402001c01801401000c008cd406806cd5d0a80619a80d00d9aba1500b33501a01c35742a014666aa03ceb94074d5d0a804999aa80f3ae501d35742a01066a03404a6ae85401cccd54078099d69aba150063232323333573466e1cd55cea801240004664424660020060046464646666ae68cdc39aab9d5002480008cc8848cc00400c008cd40c1d69aba150023031357426ae8940088c98c80d4cd5ce01b01a81989aab9e5001137540026ae854008c8c8c8cccd5cd19b8735573aa004900011991091980080180119a8183ad35742a00460626ae84d5d1280111931901a99ab9c036035033135573ca00226ea8004d5d09aba2500223263203133573806406205e26aae7940044dd50009aba1500533501a75c6ae854010ccd540780888004d5d0a801999aa80f3ae200135742a00460486ae84d5d1280111931901699ab9c02e02d02b135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d55cf280089baa00135742a00860286ae84d5d1280211931900f99ab9c02001f01d3333573466e1cd55cea803a40004666444246660020080060046eb8d5d0a8039bae35742a00c6eb8d5d09aba2500623263201e33573803e03c0386666ae68cdc39aab9d37540109000100e91931900e99ab9c01e01d01b101c13263201c3357389201035054350001c135573ca00226ea80044d5d1280089aab9e5001137540022464460046eb0004c8004d5405888cccd55cf80092805119a80498021aba100230033574400402c464646666ae68cdc39aab9d5002480008cc8848cc00400c008c030d5d0a80118029aba135744a004464c6402c66ae7005c0580504d55cf280089baa0012323232323333573466e1cd55cea8022400046666444424666600200a0080060046464646666ae68cdc39aab9d5002480008cc8848cc00400c008c054d5d0a80119a80780a1aba135744a004464c6403666ae7007006c0644d55cf280089baa00135742a008666aa010eb9401cd5d0a8019919191999ab9a3370ea0029002119091118010021aba135573ca00646666ae68cdc3a80124004464244460020086eb8d5d09aab9e500423333573466e1d400d20002122200323263201d33573803c03a03603403226aae7540044dd50009aba1500233500b75c6ae84d5d1280111931900b99ab9c018017015135744a00226ae8940044d55cf280089baa0011335500175ceb44488c88c008dd5800990009aa80991191999aab9f00225008233500733221233001003002300635573aa004600a6aae794008c010d5d100180a09aba100111220021221223300100400312232323333573466e1d4005200023212230020033005357426aae79400c8cccd5cd19b8750024800884880048c98c8048cd5ce00980900800789aab9d500113754002464646666ae68cdc3a800a400c46424444600800a600e6ae84d55cf280191999ab9a3370ea004900211909111180100298049aba135573ca00846666ae68cdc3a801a400446424444600200a600e6ae84d55cf280291999ab9a3370ea00890001190911118018029bae357426aae7940188c98c8048cd5ce00980900800780700689aab9d500113754002464646666ae68cdc39aab9d5002480008cc8848cc00400c008c014d5d0a8011bad357426ae8940088c98c8038cd5ce00780700609aab9e5001137540024646666ae68cdc39aab9d5001480008dd71aba135573ca004464c6401866ae700340300284dd5000919191919191999ab9a3370ea002900610911111100191999ab9a3370ea004900510911111100211999ab9a3370ea00690041199109111111198008048041bae35742a00a6eb4d5d09aba2500523333573466e1d40112006233221222222233002009008375c6ae85401cdd71aba135744a00e46666ae68cdc3a802a400846644244444446600c01201060186ae854024dd71aba135744a01246666ae68cdc3a8032400446424444444600e010601a6ae84d55cf280591999ab9a3370ea00e900011909111111180280418071aba135573ca018464c6402a66ae7005805404c04804404003c0380344d55cea80209aab9e5003135573ca00426aae7940044dd50009191919191999ab9a3370ea002900111999110911998008028020019bad35742a0086eb4d5d0a8019bad357426ae89400c8cccd5cd19b875002480008c8488c00800cc020d5d09aab9e500623263200e33573801e01c01801626aae75400c4d5d1280089aab9e500113754002464646666ae68cdc3a800a400446424460020066eb8d5d09aab9e500323333573466e1d400920002321223002003375c6ae84d55cf280211931900599ab9c00c00b009008135573aa00226ea8004488c8c8cccd5cd19b87500148010848880048cccd5cd19b875002480088c84888c00c010c018d5d09aab9e500423333573466e1d400d20002122200223263200c33573801a01801401201026aae7540044dd50009191999ab9a3370ea0029001100291999ab9a3370ea0049000100291931900419ab9c009008006005135573a6ea800448800848800526120014910350543100112323001001223300330020020011" +} +""" diff --git a/test/Wallet/Cip30/SignData.js b/test/Wallet/Cip30/SignData.js index ebf22760df..7d99800c52 100644 --- a/test/Wallet/Cip30/SignData.js +++ b/test/Wallet/Cip30/SignData.js @@ -3,10 +3,10 @@ let lib, csl; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { lib = await import("@emurgo/cardano-message-signing-browser"); - csl = await import("@emurgo/cardano-serialization-lib-browser"); + csl = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser"); } else { lib = await import("@emurgo/cardano-message-signing-nodejs"); - csl = await import("@emurgo/cardano-serialization-lib-nodejs"); + csl = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs"); } // import gcWrapper from "@mlabs-haskell/csl-gc-wrapper"; // lib = gcWrapper(lib); From 812afecaa8fb420b9507a1125b3c81d9bce33bcf Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Wed, 9 Aug 2023 20:38:56 +0400 Subject: [PATCH 35/85] Fix unit tests --- test/Fixtures.purs | 17 ++++++++--------- test/Transaction.purs | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/test/Fixtures.purs b/test/Fixtures.purs index 097b8a7bcb..bbd8b1e756 100644 --- a/test/Fixtures.purs +++ b/test/Fixtures.purs @@ -838,7 +838,7 @@ txBinaryFixture4 = \02ff941a0006ea7818dc0001011a00010f92192da7000119eabb18201a0002ff941a0006ea78\ \18dc0001011a0002ff941a0006ea7818dc0001011a000c504e197712041a001d6af61a000142\ \5b041a00040c660004001a00014fab18201a0003236119032c010119a0de18201a00033d7618\ - \201979f41820197fb8182019a95d1820197df718201995aa18201a009063b91903fd0a0198af\ + \201979f41820197fb8182019a95d1820197df718201995aa18201a0374f693194a1f0a0198af\ \1a0003236119032c01011903e819023b00011903e8195e7104011903e818201a0001ca761928\ \eb041959d818641959d818641959d818641959d818641959d818641959d81864186418641959\ \d81864194c5118201a0002acfa182019b551041a000363151901ff00011a00015c3518201a00\ @@ -850,14 +850,13 @@ txBinaryFixture4 = \92192da7000119eabb18201a0002ff941a0006ea7818dc0001011a0002ff941a0006ea7818dc\ \0001011a0011b22c1a0005fdde00021a000c504e197712041a001d6af61a0001425b041a0004\ \0c660004001a00014fab18201a0003236119032c010119a0de18201a00033d7618201979f418\ - \20197fb8182019a95d1820197df718201995aa18201b00000004a817c8001b00000004a817c8\ - \001a009063b91903fd0a1b00000004a817c800001b00000004a817c8001382d81e820101d81e\ - \8201011482010115820101160117188c18180a01075820000000000000000000000000000000\ - \000000000000000000000000000000000008187c09a1581c1d6445ddeda578117f393848e685\ - \128f1e78ad0c4e48129c5964dc2ea14a4974657374546f6b656e010e81581c1c12f03c1ef2e9\ - \35acc35ec2e6f96c650fd3bfba3e96550504d533610f01108258390030fb3b8539951e26f034\ - \910a5a37f22cb99d94d1d409f69ddbaea9711c12f03c1ef2e935acc35ec2e6f96c650fd3bfba\ - \3e96550504d5336100111a004c4b40a0f5f6" + \20197fb8182019a95d1820197df718201995aa18201a0223accc0a1a0374f693194a1f0a1a02\ + \515e841980b30a1382d81e820101d81e8201011482010115820101160117188c18180a010758\ + \20000000000000000000000000000000000000000000000000000000000000000008187c09a1\ + \581c1d6445ddeda578117f393848e685128f1e78ad0c4e48129c5964dc2ea14a497465737454\ + \6f6b656e010e81581c1c12f03c1ef2e935acc35ec2e6f96c650fd3bfba3e96550504d533610f\ + \01108258390030fb3b8539951e26f034910a5a37f22cb99d94d1d409f69ddbaea9711c12f03c\ + \1ef2e935acc35ec2e6f96c650fd3bfba3e96550504d5336100111a004c4b40a0f5f6" txBinaryFixture5 :: String txBinaryFixture5 = diff --git a/test/Transaction.purs b/test/Transaction.purs index e5226eb86b..7b0692f7d8 100644 --- a/test/Transaction.purs +++ b/test/Transaction.purs @@ -119,7 +119,7 @@ testSetScriptDataHash = liftEffect $ do -- Verify the hash with some external tool byteArrayToHex sdh `shouldEqual` - "e371f3cfb7be11ad70a88072dabdddef06f656efdaa52da2f68b8df4cac01d3a" + "dde4d4f89151fdbcea51fa4e9edcac89d69febe036a4976b643c713c19b0cad1" where tx :: Transaction tx = mempty From ccc7466364293a6cf0e73cc710ac75b72fdeb189 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Wed, 9 Aug 2023 20:40:37 +0400 Subject: [PATCH 36/85] Update the template --- templates/ctl-scaffold/packages.dhall | 8 ++++---- templates/ctl-scaffold/spago-packages.nix | 24 +++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/templates/ctl-scaffold/packages.dhall b/templates/ctl-scaffold/packages.dhall index 7f72d473da..96b9652f65 100644 --- a/templates/ctl-scaffold/packages.dhall +++ b/templates/ctl-scaffold/packages.dhall @@ -207,7 +207,7 @@ let additions = , repo = "https://github.com/errfrom/medea-ps.git" , version = "00981e4ce7249808413a6db8d88d849bbe85245a" } - , purescript-toppokki = + , toppokki = { dependencies = [ "prelude" , "record" @@ -218,7 +218,7 @@ let additions = , "node-fs-aff" ] , repo = "https://github.com/mlabs-haskell/purescript-toppokki" - , version = "b043e9342463df76972d05981ac4ec25316834bf" + , version = "f90f92f0ddf0eecc73705c1675db37918d18cbcb" } , bignumber = { dependencies = @@ -301,7 +301,7 @@ let additions = , "prelude" , "profunctor" , "profunctor-lenses" - , "purescript-toppokki" + , "toppokki" , "quickcheck" , "quickcheck-combinators" , "quickcheck-laws" @@ -346,4 +346,4 @@ let additions = } } -in (upstream // additions) +in upstream // additions diff --git a/templates/ctl-scaffold/spago-packages.nix b/templates/ctl-scaffold/spago-packages.nix index a357a39643..c3cb64639e 100644 --- a/templates/ctl-scaffold/spago-packages.nix +++ b/templates/ctl-scaffold/spago-packages.nix @@ -1181,18 +1181,6 @@ let installPhase = "ln -s $src $out"; }; - "purescript-toppokki" = pkgs.stdenv.mkDerivation { - name = "purescript-toppokki"; - version = "b043e9342463df76972d05981ac4ec25316834bf"; - src = pkgs.fetchgit { - url = "https://github.com/errfrom/purescript-toppokki"; - rev = "b043e9342463df76972d05981ac4ec25316834bf"; - sha256 = "0kkk4xfnkq6fqr30d95i3x4r6z9479bx7v0ama7xf36pr0y26lk1"; - }; - phases = "installPhase"; - installPhase = "ln -s $src $out"; - }; - "quickcheck" = pkgs.stdenv.mkDerivation { name = "quickcheck"; version = "v8.0.1"; @@ -1385,6 +1373,18 @@ let installPhase = "ln -s $src $out"; }; + "toppokki" = pkgs.stdenv.mkDerivation { + name = "toppokki"; + version = "f90f92f0ddf0eecc73705c1675db37918d18cbcb"; + src = pkgs.fetchgit { + url = "https://github.com/mlabs-haskell/purescript-toppokki"; + rev = "f90f92f0ddf0eecc73705c1675db37918d18cbcb"; + sha256 = "1kmqajf7n5l9lk4amyma3rhm60llrgamap5hi21kkqs52xm3fr2q"; + }; + phases = "installPhase"; + installPhase = "ln -s $src $out"; + }; + "transformers" = pkgs.stdenv.mkDerivation { name = "transformers"; version = "v6.0.0"; From 325665b19859bbf3e48e296e9aa717673f5f3d79 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Wed, 9 Aug 2023 20:50:15 +0400 Subject: [PATCH 37/85] Update NodeJS deps in the template --- templates/ctl-scaffold/package-lock.json | 2136 ++++------------------ templates/ctl-scaffold/package.json | 5 +- 2 files changed, 316 insertions(+), 1825 deletions(-) diff --git a/templates/ctl-scaffold/package-lock.json b/templates/ctl-scaffold/package-lock.json index dc32a5c5a0..d25107c715 100644 --- a/templates/ctl-scaffold/package-lock.json +++ b/templates/ctl-scaffold/package-lock.json @@ -11,8 +11,8 @@ "dependencies": { "@emurgo/cardano-message-signing-browser": "1.0.1", "@emurgo/cardano-message-signing-nodejs": "1.0.1", - "@emurgo/cardano-serialization-lib-browser": "11.2.1", - "@emurgo/cardano-serialization-lib-nodejs": "11.2.1", + "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.2", + "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.2", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1", "@mlabs-haskell/json-bigint": " 1.0.0", "@noble/secp256k1": "^1.7.0", @@ -25,7 +25,6 @@ "blakejs": "1.2.1", "bufferutil": "4.0.5", "jssha": "3.2.0", - "node-polyfill-webpack-plugin": "1.1.4", "puppeteer-core": "^15.3.2", "reconnecting-websocket": "4.4.0", "uniqid": "5.4.0", @@ -68,9 +67,9 @@ "integrity": "sha512-J9Pmeta7y1GYnMCxtb3GnGCRw6zk1wiQ8EdCYQRn/Yqa/ss1zoBjd41euVi02Eb58aLuOJS81nNU+BcMLGXvUg==" }, "node_modules/@emurgo/cardano-serialization-lib-nodejs": { - "version": "11.2.1", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-11.2.1.tgz", - "integrity": "sha512-+Rw35NW4Qv/9uFaPxhKtxiIPmoBEIFMAgdqQxZTw6hNT/wvBp2TvwTBPnOW8ODs7GUAA8nrO1rJJAaxF+mAG2w==" + "version": "11.4.0", + "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-11.4.0.tgz", + "integrity": "sha512-dMiofDcqv+IrAITCgWBZmsMLqwv2xImDsJDSrKiYYG1zRKaL8XfMOxx6S0WEnKVj5/343Q5FFURYcSu3iBRNMQ==" }, "node_modules/@esbuild/android-arm": { "version": "0.18.11", @@ -428,6 +427,7 @@ "version": "0.3.2", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "dev": true, "dependencies": { "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -441,6 +441,7 @@ "version": "3.0.7", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz", "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==", + "dev": true, "engines": { "node": ">=6.0.0" } @@ -449,6 +450,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "dev": true, "engines": { "node": ">=6.0.0" } @@ -457,6 +459,7 @@ "version": "0.3.2", "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "dev": true, "dependencies": { "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" @@ -465,12 +468,14 @@ "node_modules/@jridgewell/sourcemap-codec": { "version": "1.4.13", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz", - "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==" + "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==", + "dev": true }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.13", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz", "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==", + "dev": true, "dependencies": { "@jridgewell/resolve-uri": "^3.0.3", "@jridgewell/sourcemap-codec": "^1.4.10" @@ -482,6 +487,24 @@ "integrity": "sha512-Lg3PnLp0QXpxwLIAuuJboLeRaIhrgJjeuh797QADg3xz8wGLugQOS5DpsE8A6i6Adgzf+bacllkKZG3J0tGfDw==", "dev": true }, + "node_modules/@mlabs-haskell/cardano-serialization-lib-gc-browser": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.2.tgz", + "integrity": "sha512-hkfXjMy+GD4YMCM3ReXmlaZnWpMufx5NXoyYoyGvEKgQ3kHsArKirBf0YOuhSINyS8emOerXh/0mXPCgz1l3mw==", + "dependencies": { + "@emurgo/cardano-serialization-lib-browser": "^11.2.1", + "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" + } + }, + "node_modules/@mlabs-haskell/cardano-serialization-lib-gc-nodejs": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.2.tgz", + "integrity": "sha512-HD75q8yyhfrrI4zeb2gkoO3wcq0EaVIwiAbyhVQWuniUPgQ6mOr2Lz31vw7YSyY1jksVU69eXngdstgErY6/yw==", + "dependencies": { + "@emurgo/cardano-serialization-lib-nodejs": "^11.4.0", + "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" + } + }, "node_modules/@mlabs-haskell/csl-gc-wrapper": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@mlabs-haskell/csl-gc-wrapper/-/csl-gc-wrapper-1.0.1.tgz", @@ -594,6 +617,7 @@ "version": "8.4.3", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.3.tgz", "integrity": "sha512-YP1S7YJRMPs+7KZKDb9G63n8YejIwW9BALq7a5j2+H4yl6iOv9CB29edho+cuFRrvmJbbaH2yiVChKLJVysDGw==", + "dev": true, "dependencies": { "@types/estree": "*", "@types/json-schema": "*" @@ -603,6 +627,7 @@ "version": "3.7.3", "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz", "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==", + "dev": true, "dependencies": { "@types/eslint": "*", "@types/estree": "*" @@ -611,7 +636,8 @@ "node_modules/@types/estree": { "version": "0.0.50", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz", - "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==" + "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==", + "dev": true }, "node_modules/@types/express": { "version": "4.17.13", @@ -654,7 +680,8 @@ "node_modules/@types/json-schema": { "version": "7.0.11", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==" + "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "dev": true }, "node_modules/@types/mime": { "version": "1.3.2", @@ -665,7 +692,8 @@ "node_modules/@types/node": { "version": "17.0.35", "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.35.tgz", - "integrity": "sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==" + "integrity": "sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==", + "devOptional": true }, "node_modules/@types/qs": { "version": "6.9.7", @@ -735,6 +763,7 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", + "dev": true, "dependencies": { "@webassemblyjs/helper-numbers": "1.11.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.1" @@ -743,22 +772,26 @@ "node_modules/@webassemblyjs/floating-point-hex-parser": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", - "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==" + "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==", + "dev": true }, "node_modules/@webassemblyjs/helper-api-error": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", - "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==" + "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==", + "dev": true }, "node_modules/@webassemblyjs/helper-buffer": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", - "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==" + "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==", + "dev": true }, "node_modules/@webassemblyjs/helper-numbers": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", + "dev": true, "dependencies": { "@webassemblyjs/floating-point-hex-parser": "1.11.1", "@webassemblyjs/helper-api-error": "1.11.1", @@ -768,12 +801,14 @@ "node_modules/@webassemblyjs/helper-wasm-bytecode": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", - "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==" + "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==", + "dev": true }, "node_modules/@webassemblyjs/helper-wasm-section": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", + "dev": true, "dependencies": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-buffer": "1.11.1", @@ -785,6 +820,7 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", + "dev": true, "dependencies": { "@xtuc/ieee754": "^1.2.0" } @@ -793,6 +829,7 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", + "dev": true, "dependencies": { "@xtuc/long": "4.2.2" } @@ -800,12 +837,14 @@ "node_modules/@webassemblyjs/utf8": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", - "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==" + "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==", + "dev": true }, "node_modules/@webassemblyjs/wasm-edit": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", + "dev": true, "dependencies": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-buffer": "1.11.1", @@ -821,6 +860,7 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", + "dev": true, "dependencies": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.1", @@ -833,6 +873,7 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", + "dev": true, "dependencies": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-buffer": "1.11.1", @@ -844,6 +885,7 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", + "dev": true, "dependencies": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-api-error": "1.11.1", @@ -857,6 +899,7 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", + "dev": true, "dependencies": { "@webassemblyjs/ast": "1.11.1", "@xtuc/long": "4.2.2" @@ -901,12 +944,14 @@ "node_modules/@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==" + "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", + "dev": true }, "node_modules/@xtuc/long": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" + "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", + "dev": true }, "node_modules/accepts": { "version": "1.3.8", @@ -925,6 +970,7 @@ "version": "8.7.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", + "dev": true, "bin": { "acorn": "bin/acorn" }, @@ -936,6 +982,7 @@ "version": "1.8.0", "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "dev": true, "peerDependencies": { "acorn": "^8" } @@ -989,6 +1036,7 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -1043,6 +1091,7 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "dev": true, "peerDependencies": { "ajv": "^6.9.1" } @@ -1106,33 +1155,6 @@ "node": ">=8" } }, - "node_modules/asn1.js": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", - "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", - "dependencies": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "safer-buffer": "^2.1.0" - } - }, - "node_modules/asn1.js/node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" - }, - "node_modules/assert": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz", - "integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==", - "dependencies": { - "es6-object-assign": "^1.1.0", - "is-nan": "^1.2.1", - "object-is": "^1.0.1", - "util": "^0.12.0" - } - }, "node_modules/async": { "version": "2.6.4", "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", @@ -1142,17 +1164,6 @@ "lodash": "^4.17.14" } }, - "node_modules/available-typed-arrays": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -1254,11 +1265,6 @@ "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.2.1.tgz", "integrity": "sha512-QXUSXI3QVc/gJME0dBpXrag1kbzOqCjCX8/b54ntNyW6sjtoqxqRk3LTmXzaJoh71zMsDCjM+47jS7XiwN/+fQ==" }, - "node_modules/bn.js": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", - "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" - }, "node_modules/body-parser": { "version": "1.20.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz", @@ -1333,82 +1339,11 @@ "node": ">=8" } }, - "node_modules/brorand": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=" - }, - "node_modules/browserify-aes": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", - "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", - "dependencies": { - "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" - } - }, - "node_modules/browserify-cipher": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", - "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", - "dependencies": { - "browserify-aes": "^1.0.4", - "browserify-des": "^1.0.0", - "evp_bytestokey": "^1.0.0" - } - }, - "node_modules/browserify-des": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", - "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", - "dependencies": { - "cipher-base": "^1.0.1", - "des.js": "^1.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, - "node_modules/browserify-rsa": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz", - "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==", - "dependencies": { - "bn.js": "^5.0.0", - "randombytes": "^2.0.1" - } - }, - "node_modules/browserify-sign": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", - "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", - "dependencies": { - "bn.js": "^5.1.1", - "browserify-rsa": "^4.0.1", - "create-hash": "^1.2.0", - "create-hmac": "^1.1.7", - "elliptic": "^6.5.3", - "inherits": "^2.0.4", - "parse-asn1": "^5.1.5", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" - } - }, - "node_modules/browserify-zlib": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", - "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", - "dependencies": { - "pako": "~1.0.5" - } - }, "node_modules/browserslist": { "version": "4.21.0", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.0.tgz", "integrity": "sha512-UQxE0DIhRB5z/zDz9iA03BOfxaN2+GQdBYH/2WrSIWEUrnpzTPJbhqt+umq6r3acaPRTW1FNTkrcp0PXgtFkvA==", + "dev": true, "funding": [ { "type": "opencollective", @@ -1436,6 +1371,7 @@ "version": "6.0.3", "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "dev": true, "funding": [ { "type": "github", @@ -1466,7 +1402,8 @@ "node_modules/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true }, "node_modules/buffer-indexof": { "version": "1.1.1", @@ -1474,11 +1411,6 @@ "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==", "dev": true }, - "node_modules/buffer-xor": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", - "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=" - }, "node_modules/bufferutil": { "version": "4.0.5", "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.5.tgz", @@ -1491,11 +1423,6 @@ "node": ">=6.14.2" } }, - "node_modules/builtin-status-codes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", - "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=" - }, "node_modules/bytes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", @@ -1509,6 +1436,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, "dependencies": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" @@ -1531,6 +1459,7 @@ "version": "1.0.30001358", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001358.tgz", "integrity": "sha512-hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw==", + "dev": true, "funding": [ { "type": "opencollective", @@ -1578,19 +1507,11 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", + "dev": true, "engines": { "node": ">=6.0" } }, - "node_modules/cipher-base": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", - "dependencies": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, "node_modules/clean-css": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.0.tgz", @@ -1691,16 +1612,6 @@ "node": ">=0.8" } }, - "node_modules/console-browserify": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", - "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" - }, - "node_modules/constants-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", - "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=" - }, "node_modules/content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", @@ -1743,45 +1654,6 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", "dev": true }, - "node_modules/create-ecdh": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", - "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", - "dependencies": { - "bn.js": "^4.1.0", - "elliptic": "^6.5.3" - } - }, - "node_modules/create-ecdh/node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" - }, - "node_modules/create-hash": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", - "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", - "dependencies": { - "cipher-base": "^1.0.1", - "inherits": "^2.0.1", - "md5.js": "^1.3.4", - "ripemd160": "^2.0.1", - "sha.js": "^2.4.0" - } - }, - "node_modules/create-hmac": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", - "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", - "dependencies": { - "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" - } - }, "node_modules/cross-fetch": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", @@ -1804,27 +1676,6 @@ "node": ">= 8" } }, - "node_modules/crypto-browserify": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", - "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", - "dependencies": { - "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" - }, - "engines": { - "node": "*" - } - }, "node_modules/css-select": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", @@ -1904,6 +1755,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", + "dev": true, "dependencies": { "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" @@ -1946,15 +1798,6 @@ "node": ">= 0.8" } }, - "node_modules/des.js": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", - "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", - "dependencies": { - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" - } - }, "node_modules/destroy": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", @@ -1976,21 +1819,6 @@ "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1011705.tgz", "integrity": "sha512-OKvTvu9n3swmgYshvsyVHYX0+aPzCoYUnyXUacfQMmFtBtBKewV/gT4I9jkAbpTqtTi2E4S9MXLlvzBDUlqg0Q==" }, - "node_modules/diffie-hellman": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", - "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", - "dependencies": { - "bn.js": "^4.1.0", - "miller-rabin": "^4.0.0", - "randombytes": "^2.0.0" - } - }, - "node_modules/diffie-hellman/node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" - }, "node_modules/dir-glob": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", @@ -2051,17 +1879,6 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, - "node_modules/domain-browser": { - "version": "4.22.0", - "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-4.22.0.tgz", - "integrity": "sha512-IGBwjF7tNk3cwypFNH/7bfzBcgSCbaMOD3GsaY1AU/JRrnHnYgEM0+9kQt52iZxjNsjBtJYtao146V+f8jFZNw==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://bevry.me/fund" - } - }, "node_modules/domelementtype": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", @@ -2122,26 +1939,8 @@ "node_modules/electron-to-chromium": { "version": "1.4.167", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.167.tgz", - "integrity": "sha512-lPHuHXBwpkr4RcfaZBKm6TKOWG/1N9mVggUpP4fY3l1JIUU2x4fkM8928smYdZ5lF+6KCTAxo1aK9JmqT+X71Q==" - }, - "node_modules/elliptic": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", - "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", - "dependencies": { - "bn.js": "^4.11.9", - "brorand": "^1.1.0", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.1", - "inherits": "^2.0.4", - "minimalistic-assert": "^1.0.1", - "minimalistic-crypto-utils": "^1.0.1" - } - }, - "node_modules/elliptic/node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "integrity": "sha512-lPHuHXBwpkr4RcfaZBKm6TKOWG/1N9mVggUpP4fY3l1JIUU2x4fkM8928smYdZ5lF+6KCTAxo1aK9JmqT+X71Q==", + "dev": true }, "node_modules/encodeurl": { "version": "1.0.2", @@ -2164,6 +1963,7 @@ "version": "5.9.3", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz", "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==", + "dev": true, "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -2193,67 +1993,11 @@ "node": ">=4" } }, - "node_modules/es-abstract": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz", - "integrity": "sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==", - "dependencies": { - "call-bind": "^1.0.2", - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.1.1", - "get-symbol-description": "^1.0.0", - "has": "^1.0.3", - "has-property-descriptors": "^1.0.0", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.3", - "is-callable": "^1.2.4", - "is-negative-zero": "^2.0.2", - "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.2", - "is-string": "^1.0.7", - "is-weakref": "^1.0.2", - "object-inspect": "^1.12.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.2", - "regexp.prototype.flags": "^1.4.3", - "string.prototype.trimend": "^1.0.5", - "string.prototype.trimstart": "^1.0.5", - "unbox-primitive": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/es-module-lexer": { "version": "0.9.3", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", - "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==" - }, - "node_modules/es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dependencies": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/es6-object-assign": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz", - "integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==" + "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", + "dev": true }, "node_modules/esbuild": { "version": "0.18.11", @@ -2322,6 +2066,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true, "engines": { "node": ">=6" } @@ -2336,6 +2081,7 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^4.1.1" @@ -2348,6 +2094,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, "dependencies": { "estraverse": "^5.2.0" }, @@ -2359,6 +2106,7 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, "engines": { "node": ">=4.0" } @@ -2367,6 +2115,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, "engines": { "node": ">=4.0" } @@ -2390,19 +2139,11 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", + "dev": true, "engines": { "node": ">=0.8.x" } }, - "node_modules/evp_bytestokey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", - "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", - "dependencies": { - "md5.js": "^1.3.4", - "safe-buffer": "^5.1.1" - } - }, "node_modules/execa": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", @@ -2531,7 +2272,8 @@ "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true }, "node_modules/fast-glob": { "version": "3.2.11", @@ -2552,7 +2294,8 @@ "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true }, "node_modules/fastest-levenshtein": { "version": "1.0.14", @@ -2604,14 +2347,6 @@ "node": ">=8" } }, - "node_modules/filter-obj": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-2.0.2.tgz", - "integrity": "sha512-lO3ttPjHZRfjMcxWKb1j1eDhTFsu4meeR3lnMcnBFhk6RuLhvEiuALu2TlfL310ph4lCYYwgF/ElIjdP739tdg==", - "engines": { - "node": ">=8" - } - }, "node_modules/finalhandler": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", @@ -2662,14 +2397,6 @@ } } }, - "node_modules/for-each": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", - "dependencies": { - "is-callable": "^1.1.3" - } - }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -2721,29 +2448,14 @@ "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" - }, - "node_modules/function.prototype.name": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", - "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true }, "node_modules/functions-have-names": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -2752,6 +2464,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "dev": true, "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -2773,21 +2486,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/get-symbol-description": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", - "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -2822,7 +2520,8 @@ "node_modules/glob-to-regexp": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", + "dev": true }, "node_modules/globby": { "version": "11.1.0", @@ -2847,7 +2546,8 @@ "node_modules/graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "dev": true }, "node_modules/handle-thing": { "version": "2.0.1", @@ -2859,6 +2559,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, "dependencies": { "function-bind": "^1.1.1" }, @@ -2866,18 +2567,11 @@ "node": ">= 0.4.0" } }, - "node_modules/has-bigints": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, "engines": { "node": ">=8" } @@ -2886,6 +2580,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "dev": true, "dependencies": { "get-intrinsic": "^1.1.1" }, @@ -2897,6 +2592,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "dev": true, "engines": { "node": ">= 0.4" }, @@ -2908,6 +2604,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "dev": true, "dependencies": { "has-symbols": "^1.0.2" }, @@ -2918,28 +2615,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/hash-base": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz", - "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", - "dependencies": { - "inherits": "^2.0.4", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/hash.js": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", - "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", - "dependencies": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.1" - } - }, "node_modules/he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -2949,16 +2624,6 @@ "he": "bin/he" } }, - "node_modules/hmac-drbg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", - "dependencies": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" - } - }, "node_modules/hpack.js": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", @@ -3136,11 +2801,6 @@ } } }, - "node_modules/https-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", - "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==" - }, "node_modules/https-proxy-agent": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", @@ -3275,19 +2935,6 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, - "node_modules/internal-slot": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz", - "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==", - "dependencies": { - "get-intrinsic": "^1.1.0", - "has": "^1.0.3", - "side-channel": "^1.0.4" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/interpret": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz", @@ -3316,6 +2963,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -3327,17 +2975,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-bigint": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", - "dependencies": { - "has-bigints": "^1.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -3350,32 +2987,6 @@ "node": ">=8" } }, - "node_modules/is-boolean-object": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-callable": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", - "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-core-module": { "version": "2.9.0", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", @@ -3392,6 +3003,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "dev": true, "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -3426,20 +3038,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-generator-function": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", - "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", @@ -3452,32 +3050,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-nan": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz", - "integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==", - "dependencies": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-negative-zero": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -3487,20 +3059,6 @@ "node": ">=0.12.0" } }, - "node_modules/is-number-object": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", - "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-path-cwd": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", @@ -3547,6 +3105,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -3558,17 +3117,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-shared-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", - "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", - "dependencies": { - "call-bind": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-stream": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", @@ -3581,63 +3129,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/is-string": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-symbol": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", - "dependencies": { - "has-symbols": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-typed-array": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz", - "integrity": "sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==", - "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "es-abstract": "^1.20.0", - "for-each": "^0.3.3", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-weakref": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", - "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", - "dependencies": { - "call-bind": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-wsl": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", @@ -3675,6 +3166,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", + "dev": true, "dependencies": { "@types/node": "*", "merge-stream": "^2.0.0", @@ -3687,12 +3179,14 @@ "node_modules/json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true }, "node_modules/jssha": { "version": "3.2.0", @@ -3715,6 +3209,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", + "dev": true, "engines": { "node": ">=6.11.5" } @@ -3745,16 +3240,6 @@ "tslib": "^2.0.3" } }, - "node_modules/md5.js": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", - "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", - "dependencies": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, "node_modules/media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -3785,7 +3270,8 @@ "node_modules/merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true }, "node_modules/merge2": { "version": "1.4.1", @@ -3818,23 +3304,6 @@ "node": ">=8.6" } }, - "node_modules/miller-rabin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", - "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", - "dependencies": { - "bn.js": "^4.0.0", - "brorand": "^1.0.1" - }, - "bin": { - "miller-rabin": "bin/miller-rabin" - } - }, - "node_modules/miller-rabin/node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" - }, "node_modules/mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", @@ -3851,6 +3320,7 @@ "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true, "engines": { "node": ">= 0.6" } @@ -3859,6 +3329,7 @@ "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, "dependencies": { "mime-db": "1.52.0" }, @@ -3878,12 +3349,8 @@ "node_modules/minimalistic-assert": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" - }, - "node_modules/minimalistic-crypto-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==" + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", + "dev": true }, "node_modules/minimatch": { "version": "3.1.2", @@ -3956,7 +3423,8 @@ "node_modules/neo-async": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true }, "node_modules/no-case": { "version": "3.0.4", @@ -4025,47 +3493,11 @@ "node-gyp-build-test": "build-test.js" } }, - "node_modules/node-polyfill-webpack-plugin": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/node-polyfill-webpack-plugin/-/node-polyfill-webpack-plugin-1.1.4.tgz", - "integrity": "sha512-Z0XTKj1wRWO8o/Vjobsw5iOJCN+Sua3EZEUc2Ziy9CyVvmHKu6o+t4gUH9GOE0czyPR94LI6ZCV/PpcM8b5yow==", - "dependencies": { - "assert": "^2.0.0", - "browserify-zlib": "^0.2.0", - "buffer": "^6.0.3", - "console-browserify": "^1.2.0", - "constants-browserify": "^1.0.0", - "crypto-browserify": "^3.12.0", - "domain-browser": "^4.19.0", - "events": "^3.3.0", - "filter-obj": "^2.0.2", - "https-browserify": "^1.0.0", - "os-browserify": "^0.3.0", - "path-browserify": "^1.0.1", - "process": "^0.11.10", - "punycode": "^2.1.1", - "querystring-es3": "^0.2.1", - "readable-stream": "^3.6.0", - "stream-browserify": "^3.0.0", - "stream-http": "^3.2.0", - "string_decoder": "^1.3.0", - "timers-browserify": "^2.0.12", - "tty-browserify": "^0.0.1", - "url": "^0.11.0", - "util": "^0.12.4", - "vm-browserify": "^1.1.2" - }, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "webpack": ">=5" - } - }, "node_modules/node-releases": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz", - "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==" + "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==", + "dev": true }, "node_modules/normalize-path": { "version": "3.0.0", @@ -4104,6 +3536,7 @@ "version": "1.12.1", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.1.tgz", "integrity": "sha512-Y/jF6vnvEtOPGiKD1+q+X0CiUYRQtEHp89MLLUJ7TUivtH8Ugn2+3A7Rynqk7BRsAoqeOQWnFnjpDrKSxDgIGA==", + "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -4112,6 +3545,7 @@ "version": "1.1.5", "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.3" @@ -4127,27 +3561,11 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true, "engines": { "node": ">= 0.4" } }, - "node_modules/object.assign": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", - "dependencies": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "has-symbols": "^1.0.1", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/obuf": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", @@ -4215,11 +3633,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/os-browserify": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", - "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==" - }, "node_modules/p-limit": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", @@ -4281,11 +3694,6 @@ "node": ">=6" } }, - "node_modules/pako": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", - "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" - }, "node_modules/param-case": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", @@ -4296,18 +3704,6 @@ "tslib": "^2.0.3" } }, - "node_modules/parse-asn1": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", - "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", - "dependencies": { - "asn1.js": "^5.2.0", - "browserify-aes": "^1.0.0", - "evp_bytestokey": "^1.0.0", - "pbkdf2": "^3.0.3", - "safe-buffer": "^5.1.1" - } - }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -4327,11 +3723,6 @@ "tslib": "^2.0.3" } }, - "node_modules/path-browserify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", - "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==" - }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -4378,21 +3769,6 @@ "node": ">=8" } }, - "node_modules/pbkdf2": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", - "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==", - "dependencies": { - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4", - "ripemd160": "^2.0.1", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" - }, - "engines": { - "node": ">=0.12" - } - }, "node_modules/pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", @@ -4401,7 +3777,8 @@ "node_modules/picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true }, "node_modules/picomatch": { "version": "2.3.1", @@ -4465,14 +3842,6 @@ "renderkid": "^3.0.0" } }, - "node_modules/process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", - "engines": { - "node": ">= 0.6.0" - } - }, "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -4514,24 +3883,6 @@ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" }, - "node_modules/public-encrypt": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", - "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", - "dependencies": { - "bn.js": "^4.1.0", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "parse-asn1": "^5.0.0", - "randombytes": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, - "node_modules/public-encrypt/node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" - }, "node_modules/pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", @@ -4545,6 +3896,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true, "engines": { "node": ">=6" } @@ -4627,23 +3979,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==", - "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", - "engines": { - "node": ">=0.4.x" - } - }, - "node_modules/querystring-es3": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", - "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==", - "engines": { - "node": ">=0.4.x" - } - }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -4668,19 +4003,11 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, "dependencies": { "safe-buffer": "^5.1.0" } }, - "node_modules/randomfill": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", - "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", - "dependencies": { - "randombytes": "^2.0.5", - "safe-buffer": "^5.1.0" - } - }, "node_modules/range-parser": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", @@ -4760,6 +4087,7 @@ "version": "1.4.3", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", @@ -4880,15 +4208,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/ripemd160": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", - "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", - "dependencies": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1" - } - }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -4934,12 +4253,14 @@ "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true }, "node_modules/schema-utils": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "dev": true, "dependencies": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", @@ -5005,6 +4326,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "dev": true, "dependencies": { "randombytes": "^2.1.0" } @@ -5087,29 +4409,12 @@ "node": ">= 0.8.0" } }, - "node_modules/setimmediate": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==" - }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", "dev": true }, - "node_modules/sha.js": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", - "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", - "dependencies": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - }, - "bin": { - "sha.js": "bin.js" - } - }, "node_modules/shallow-clone": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", @@ -5147,6 +4452,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "dev": true, "dependencies": { "call-bind": "^1.0.0", "get-intrinsic": "^1.0.2", @@ -5186,6 +4492,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -5194,6 +4501,7 @@ "version": "0.5.21", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, "dependencies": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -5284,58 +4592,12 @@ "node": ">= 0.8" } }, - "node_modules/stream-browserify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz", - "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==", - "dependencies": { - "inherits": "~2.0.4", - "readable-stream": "^3.5.0" - } - }, - "node_modules/stream-http": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz", - "integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==", - "dependencies": { - "builtin-status-codes": "^3.0.0", - "inherits": "^2.0.4", - "readable-stream": "^3.6.0", - "xtend": "^4.0.2" - } - }, "node_modules/string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "dependencies": { - "safe-buffer": "~5.2.0" - } - }, - "node_modules/string.prototype.trimend": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz", - "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==", - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.19.5" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/string.prototype.trimstart": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz", - "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==", - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.19.5" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "safe-buffer": "~5.2.0" } }, "node_modules/strip-ansi": { @@ -5363,6 +4625,7 @@ "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -5389,6 +4652,7 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", + "dev": true, "engines": { "node": ">=6" } @@ -5423,6 +4687,7 @@ "version": "5.15.1", "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz", "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==", + "dev": true, "dependencies": { "@jridgewell/source-map": "^0.3.2", "acorn": "^8.5.0", @@ -5440,6 +4705,7 @@ "version": "5.3.3", "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz", "integrity": "sha512-Fx60G5HNYknNTNQnzQ1VePRuu89ZVYWfjRAeT5rITuCY/1b08s49e5kSQwHDirKZWuoKOBRFS98EUUoZ9kLEwQ==", + "dev": true, "dependencies": { "@jridgewell/trace-mapping": "^0.3.7", "jest-worker": "^27.4.5", @@ -5472,7 +4738,8 @@ "node_modules/terser/node_modules/commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true }, "node_modules/through": { "version": "2.3.8", @@ -5485,17 +4752,6 @@ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", "dev": true }, - "node_modules/timers-browserify": { - "version": "2.0.12", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz", - "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==", - "dependencies": { - "setimmediate": "^1.0.4" - }, - "engines": { - "node": ">=0.6.0" - } - }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -5523,11 +4779,6 @@ "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", "dev": true }, - "node_modules/tty-browserify": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz", - "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==" - }, "node_modules/type-is": { "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", @@ -5541,20 +4792,6 @@ "node": ">= 0.6" } }, - "node_modules/unbox-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", - "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", - "dependencies": { - "call-bind": "^1.0.2", - "has-bigints": "^1.0.2", - "has-symbols": "^1.0.3", - "which-boxed-primitive": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/unbzip2-stream": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", @@ -5605,6 +4842,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.3.tgz", "integrity": "sha512-ufSazemeh9Gty0qiWtoRpJ9F5Q5W3xdIPm1UZQqYQv/q0Nyb9EMHUB2lu+O9x1re9WsorpMAUu4Y6Lxcs5n+XQ==", + "dev": true, "funding": [ { "type": "opencollective", @@ -5630,37 +4868,11 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, "dependencies": { "punycode": "^2.1.0" } }, - "node_modules/url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==", - "dependencies": { - "punycode": "1.3.2", - "querystring": "0.2.0" - } - }, - "node_modules/url/node_modules/punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==" - }, - "node_modules/util": { - "version": "0.12.4", - "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz", - "integrity": "sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==", - "dependencies": { - "inherits": "^2.0.3", - "is-arguments": "^1.0.4", - "is-generator-function": "^1.0.7", - "is-typed-array": "^1.1.3", - "safe-buffer": "^5.1.2", - "which-typed-array": "^1.1.2" - } - }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -5699,15 +4911,11 @@ "node": ">= 0.8" } }, - "node_modules/vm-browserify": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", - "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==" - }, "node_modules/watchpack": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz", "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==", + "dev": true, "dependencies": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" @@ -5729,6 +4937,7 @@ "version": "5.67.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.67.0.tgz", "integrity": "sha512-LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw==", + "dev": true, "dependencies": { "@types/eslint-scope": "^3.7.0", "@types/estree": "^0.0.50", @@ -6073,6 +5282,7 @@ "version": "3.2.3", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", + "dev": true, "engines": { "node": ">=10.13.0" } @@ -6115,40 +5325,6 @@ "node": ">= 8" } }, - "node_modules/which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "dependencies": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/which-typed-array": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz", - "integrity": "sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==", - "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "es-abstract": "^1.20.0", - "for-each": "^0.3.3", - "has-tostringtag": "^1.0.0", - "is-typed-array": "^1.1.9" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/wildcard": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", @@ -6188,14 +5364,6 @@ "node": ">= 6" } }, - "node_modules/xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "engines": { - "node": ">=0.4" - } - }, "node_modules/yauzl": { "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", @@ -6229,9 +5397,9 @@ "integrity": "sha512-J9Pmeta7y1GYnMCxtb3GnGCRw6zk1wiQ8EdCYQRn/Yqa/ss1zoBjd41euVi02Eb58aLuOJS81nNU+BcMLGXvUg==" }, "@emurgo/cardano-serialization-lib-nodejs": { - "version": "11.2.1", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-11.2.1.tgz", - "integrity": "sha512-+Rw35NW4Qv/9uFaPxhKtxiIPmoBEIFMAgdqQxZTw6hNT/wvBp2TvwTBPnOW8ODs7GUAA8nrO1rJJAaxF+mAG2w==" + "version": "11.4.0", + "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-11.4.0.tgz", + "integrity": "sha512-dMiofDcqv+IrAITCgWBZmsMLqwv2xImDsJDSrKiYYG1zRKaL8XfMOxx6S0WEnKVj5/343Q5FFURYcSu3iBRNMQ==" }, "@esbuild/android-arm": { "version": "0.18.11", @@ -6391,6 +5559,7 @@ "version": "0.3.2", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "dev": true, "requires": { "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -6400,17 +5569,20 @@ "@jridgewell/resolve-uri": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz", - "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==" + "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==", + "dev": true }, "@jridgewell/set-array": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==" + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "dev": true }, "@jridgewell/source-map": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "dev": true, "requires": { "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" @@ -6419,12 +5591,14 @@ "@jridgewell/sourcemap-codec": { "version": "1.4.13", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz", - "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==" + "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==", + "dev": true }, "@jridgewell/trace-mapping": { "version": "0.3.13", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz", "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==", + "dev": true, "requires": { "@jridgewell/resolve-uri": "^3.0.3", "@jridgewell/sourcemap-codec": "^1.4.10" @@ -6436,6 +5610,24 @@ "integrity": "sha512-Lg3PnLp0QXpxwLIAuuJboLeRaIhrgJjeuh797QADg3xz8wGLugQOS5DpsE8A6i6Adgzf+bacllkKZG3J0tGfDw==", "dev": true }, + "@mlabs-haskell/cardano-serialization-lib-gc-browser": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.2.tgz", + "integrity": "sha512-hkfXjMy+GD4YMCM3ReXmlaZnWpMufx5NXoyYoyGvEKgQ3kHsArKirBf0YOuhSINyS8emOerXh/0mXPCgz1l3mw==", + "requires": { + "@emurgo/cardano-serialization-lib-browser": "^11.2.1", + "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" + } + }, + "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.2.tgz", + "integrity": "sha512-HD75q8yyhfrrI4zeb2gkoO3wcq0EaVIwiAbyhVQWuniUPgQ6mOr2Lz31vw7YSyY1jksVU69eXngdstgErY6/yw==", + "requires": { + "@emurgo/cardano-serialization-lib-nodejs": "^11.4.0", + "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" + } + }, "@mlabs-haskell/csl-gc-wrapper": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@mlabs-haskell/csl-gc-wrapper/-/csl-gc-wrapper-1.0.1.tgz", @@ -6527,6 +5719,7 @@ "version": "8.4.3", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.3.tgz", "integrity": "sha512-YP1S7YJRMPs+7KZKDb9G63n8YejIwW9BALq7a5j2+H4yl6iOv9CB29edho+cuFRrvmJbbaH2yiVChKLJVysDGw==", + "dev": true, "requires": { "@types/estree": "*", "@types/json-schema": "*" @@ -6536,6 +5729,7 @@ "version": "3.7.3", "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz", "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==", + "dev": true, "requires": { "@types/eslint": "*", "@types/estree": "*" @@ -6544,7 +5738,8 @@ "@types/estree": { "version": "0.0.50", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz", - "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==" + "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==", + "dev": true }, "@types/express": { "version": "4.17.13", @@ -6587,7 +5782,8 @@ "@types/json-schema": { "version": "7.0.11", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==" + "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "dev": true }, "@types/mime": { "version": "1.3.2", @@ -6598,7 +5794,8 @@ "@types/node": { "version": "17.0.35", "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.35.tgz", - "integrity": "sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==" + "integrity": "sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==", + "devOptional": true }, "@types/qs": { "version": "6.9.7", @@ -6668,6 +5865,7 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", + "dev": true, "requires": { "@webassemblyjs/helper-numbers": "1.11.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.1" @@ -6676,22 +5874,26 @@ "@webassemblyjs/floating-point-hex-parser": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", - "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==" + "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==", + "dev": true }, "@webassemblyjs/helper-api-error": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", - "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==" + "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==", + "dev": true }, "@webassemblyjs/helper-buffer": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", - "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==" + "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==", + "dev": true }, "@webassemblyjs/helper-numbers": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", + "dev": true, "requires": { "@webassemblyjs/floating-point-hex-parser": "1.11.1", "@webassemblyjs/helper-api-error": "1.11.1", @@ -6701,12 +5903,14 @@ "@webassemblyjs/helper-wasm-bytecode": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", - "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==" + "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==", + "dev": true }, "@webassemblyjs/helper-wasm-section": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", + "dev": true, "requires": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-buffer": "1.11.1", @@ -6718,6 +5922,7 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", + "dev": true, "requires": { "@xtuc/ieee754": "^1.2.0" } @@ -6726,6 +5931,7 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", + "dev": true, "requires": { "@xtuc/long": "4.2.2" } @@ -6733,12 +5939,14 @@ "@webassemblyjs/utf8": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", - "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==" + "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==", + "dev": true }, "@webassemblyjs/wasm-edit": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", + "dev": true, "requires": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-buffer": "1.11.1", @@ -6754,6 +5962,7 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", + "dev": true, "requires": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.1", @@ -6766,6 +5975,7 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", + "dev": true, "requires": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-buffer": "1.11.1", @@ -6777,6 +5987,7 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", + "dev": true, "requires": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-api-error": "1.11.1", @@ -6790,6 +6001,7 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", + "dev": true, "requires": { "@webassemblyjs/ast": "1.11.1", "@xtuc/long": "4.2.2" @@ -6821,12 +6033,14 @@ "@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==" + "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", + "dev": true }, "@xtuc/long": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" + "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", + "dev": true }, "accepts": { "version": "1.3.8", @@ -6841,12 +6055,14 @@ "acorn": { "version": "8.7.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", - "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==" + "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", + "dev": true }, "acorn-import-assertions": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "dev": true, "requires": {} }, "agent-base": { @@ -6886,6 +6102,7 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -6926,6 +6143,7 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "dev": true, "requires": {} }, "ansi-html-community": { @@ -6972,35 +6190,6 @@ "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", "dev": true }, - "asn1.js": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", - "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", - "requires": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "safer-buffer": "^2.1.0" - }, - "dependencies": { - "bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" - } - } - }, - "assert": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz", - "integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==", - "requires": { - "es6-object-assign": "^1.1.0", - "is-nan": "^1.2.1", - "object-is": "^1.0.1", - "util": "^0.12.0" - } - }, "async": { "version": "2.6.4", "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", @@ -7010,11 +6199,6 @@ "lodash": "^4.17.14" } }, - "available-typed-arrays": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==" - }, "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -7081,11 +6265,6 @@ "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.2.1.tgz", "integrity": "sha512-QXUSXI3QVc/gJME0dBpXrag1kbzOqCjCX8/b54ntNyW6sjtoqxqRk3LTmXzaJoh71zMsDCjM+47jS7XiwN/+fQ==" }, - "bn.js": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", - "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" - }, "body-parser": { "version": "1.20.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz", @@ -7152,82 +6331,11 @@ "fill-range": "^7.0.1" } }, - "brorand": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=" - }, - "browserify-aes": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", - "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", - "requires": { - "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": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", - "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", - "requires": { - "browserify-aes": "^1.0.4", - "browserify-des": "^1.0.0", - "evp_bytestokey": "^1.0.0" - } - }, - "browserify-des": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", - "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", - "requires": { - "cipher-base": "^1.0.1", - "des.js": "^1.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, - "browserify-rsa": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz", - "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==", - "requires": { - "bn.js": "^5.0.0", - "randombytes": "^2.0.1" - } - }, - "browserify-sign": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", - "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", - "requires": { - "bn.js": "^5.1.1", - "browserify-rsa": "^4.0.1", - "create-hash": "^1.2.0", - "create-hmac": "^1.1.7", - "elliptic": "^6.5.3", - "inherits": "^2.0.4", - "parse-asn1": "^5.1.5", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" - } - }, - "browserify-zlib": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", - "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", - "requires": { - "pako": "~1.0.5" - } - }, "browserslist": { "version": "4.21.0", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.0.tgz", "integrity": "sha512-UQxE0DIhRB5z/zDz9iA03BOfxaN2+GQdBYH/2WrSIWEUrnpzTPJbhqt+umq6r3acaPRTW1FNTkrcp0PXgtFkvA==", + "dev": true, "requires": { "caniuse-lite": "^1.0.30001358", "electron-to-chromium": "^1.4.164", @@ -7239,6 +6347,7 @@ "version": "6.0.3", "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "dev": true, "requires": { "base64-js": "^1.3.1", "ieee754": "^1.2.1" @@ -7252,7 +6361,8 @@ "buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true }, "buffer-indexof": { "version": "1.1.1", @@ -7260,11 +6370,6 @@ "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==", "dev": true }, - "buffer-xor": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", - "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=" - }, "bufferutil": { "version": "4.0.5", "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.5.tgz", @@ -7273,11 +6378,6 @@ "node-gyp-build": "^4.3.0" } }, - "builtin-status-codes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", - "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=" - }, "bytes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", @@ -7288,6 +6388,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, "requires": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" @@ -7306,7 +6407,8 @@ "caniuse-lite": { "version": "1.0.30001358", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001358.tgz", - "integrity": "sha512-hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw==" + "integrity": "sha512-hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw==", + "dev": true }, "chokidar": { "version": "3.5.3", @@ -7332,16 +6434,8 @@ "chrome-trace-event": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", - "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==" - }, - "cipher-base": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } + "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", + "dev": true }, "clean-css": { "version": "5.3.0", @@ -7424,16 +6518,6 @@ "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==", "dev": true }, - "console-browserify": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", - "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" - }, - "constants-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", - "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=" - }, "content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", @@ -7467,47 +6551,6 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", "dev": true }, - "create-ecdh": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", - "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", - "requires": { - "bn.js": "^4.1.0", - "elliptic": "^6.5.3" - }, - "dependencies": { - "bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" - } - } - }, - "create-hash": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", - "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", - "requires": { - "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": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", - "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", - "requires": { - "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-fetch": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", @@ -7527,24 +6570,6 @@ "which": "^2.0.1" } }, - "crypto-browserify": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", - "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", - "requires": { - "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" - } - }, "css-select": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", @@ -7606,6 +6631,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", + "dev": true, "requires": { "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" @@ -7633,15 +6659,6 @@ "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "dev": true }, - "des.js": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", - "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", - "requires": { - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" - } - }, "destroy": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", @@ -7659,23 +6676,6 @@ "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1011705.tgz", "integrity": "sha512-OKvTvu9n3swmgYshvsyVHYX0+aPzCoYUnyXUacfQMmFtBtBKewV/gT4I9jkAbpTqtTi2E4S9MXLlvzBDUlqg0Q==" }, - "diffie-hellman": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", - "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", - "requires": { - "bn.js": "^4.1.0", - "miller-rabin": "^4.0.0", - "randombytes": "^2.0.0" - }, - "dependencies": { - "bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" - } - } - }, "dir-glob": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", @@ -7730,11 +6730,6 @@ "entities": "^2.0.0" } }, - "domain-browser": { - "version": "4.22.0", - "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-4.22.0.tgz", - "integrity": "sha512-IGBwjF7tNk3cwypFNH/7bfzBcgSCbaMOD3GsaY1AU/JRrnHnYgEM0+9kQt52iZxjNsjBtJYtao146V+f8jFZNw==" - }, "domelementtype": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", @@ -7780,28 +6775,8 @@ "electron-to-chromium": { "version": "1.4.167", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.167.tgz", - "integrity": "sha512-lPHuHXBwpkr4RcfaZBKm6TKOWG/1N9mVggUpP4fY3l1JIUU2x4fkM8928smYdZ5lF+6KCTAxo1aK9JmqT+X71Q==" - }, - "elliptic": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", - "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", - "requires": { - "bn.js": "^4.11.9", - "brorand": "^1.1.0", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.1", - "inherits": "^2.0.4", - "minimalistic-assert": "^1.0.1", - "minimalistic-crypto-utils": "^1.0.1" - }, - "dependencies": { - "bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" - } - } + "integrity": "sha512-lPHuHXBwpkr4RcfaZBKm6TKOWG/1N9mVggUpP4fY3l1JIUU2x4fkM8928smYdZ5lF+6KCTAxo1aK9JmqT+X71Q==", + "dev": true }, "encodeurl": { "version": "1.0.2", @@ -7821,6 +6796,7 @@ "version": "5.9.3", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz", "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==", + "dev": true, "requires": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -7838,55 +6814,11 @@ "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==", "dev": true }, - "es-abstract": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz", - "integrity": "sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==", - "requires": { - "call-bind": "^1.0.2", - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.1.1", - "get-symbol-description": "^1.0.0", - "has": "^1.0.3", - "has-property-descriptors": "^1.0.0", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.3", - "is-callable": "^1.2.4", - "is-negative-zero": "^2.0.2", - "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.2", - "is-string": "^1.0.7", - "is-weakref": "^1.0.2", - "object-inspect": "^1.12.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.2", - "regexp.prototype.flags": "^1.4.3", - "string.prototype.trimend": "^1.0.5", - "string.prototype.trimstart": "^1.0.5", - "unbox-primitive": "^1.0.2" - } - }, "es-module-lexer": { "version": "0.9.3", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", - "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==" - }, - "es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - } - }, - "es6-object-assign": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz", - "integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==" + "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", + "dev": true }, "esbuild": { "version": "0.18.11", @@ -7937,7 +6869,8 @@ "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true }, "escape-html": { "version": "1.0.3", @@ -7949,6 +6882,7 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, "requires": { "esrecurse": "^4.3.0", "estraverse": "^4.1.1" @@ -7958,6 +6892,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, "requires": { "estraverse": "^5.2.0" }, @@ -7965,14 +6900,16 @@ "estraverse": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true } } }, "estraverse": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true }, "etag": { "version": "1.8.1", @@ -7989,16 +6926,8 @@ "events": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==" - }, - "evp_bytestokey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", - "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", - "requires": { - "md5.js": "^1.3.4", - "safe-buffer": "^5.1.1" - } + "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", + "dev": true }, "execa": { "version": "5.1.1", @@ -8101,7 +7030,8 @@ "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true }, "fast-glob": { "version": "3.2.11", @@ -8119,7 +7049,8 @@ "fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true }, "fastest-levenshtein": { "version": "1.0.14", @@ -8162,11 +7093,6 @@ "to-regex-range": "^5.0.1" } }, - "filter-obj": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-2.0.2.tgz", - "integrity": "sha512-lO3ttPjHZRfjMcxWKb1j1eDhTFsu4meeR3lnMcnBFhk6RuLhvEiuALu2TlfL310ph4lCYYwgF/ElIjdP739tdg==" - }, "finalhandler": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", @@ -8197,14 +7123,6 @@ "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", "dev": true }, - "for-each": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", - "requires": { - "is-callable": "^1.1.3" - } - }, "forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -8242,29 +7160,21 @@ }, "function-bind": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" - }, - "function.prototype.name": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", - "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" - } + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true }, "functions-have-names": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==" + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true }, "get-intrinsic": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "dev": true, "requires": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -8277,15 +7187,6 @@ "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", "dev": true }, - "get-symbol-description": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", - "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", - "requires": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" - } - }, "glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -8311,7 +7212,8 @@ "glob-to-regexp": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", + "dev": true }, "globby": { "version": "11.1.0", @@ -8330,7 +7232,8 @@ "graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "dev": true }, "handle-thing": { "version": "2.0.1", @@ -8342,24 +7245,22 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, "requires": { "function-bind": "^1.1.1" } }, - "has-bigints": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==" - }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true }, "has-property-descriptors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "dev": true, "requires": { "get-intrinsic": "^1.1.1" } @@ -8367,51 +7268,24 @@ "has-symbols": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "dev": true }, "has-tostringtag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "dev": true, "requires": { "has-symbols": "^1.0.2" } }, - "hash-base": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz", - "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", - "requires": { - "inherits": "^2.0.4", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" - } - }, - "hash.js": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", - "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", - "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.1" - } - }, "he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true }, - "hmac-drbg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", - "requires": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" - } - }, "hpack.js": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", @@ -8551,11 +7425,6 @@ "micromatch": "^4.0.2" } }, - "https-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", - "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==" - }, "https-proxy-agent": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", @@ -8642,16 +7511,6 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, - "internal-slot": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz", - "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==", - "requires": { - "get-intrinsic": "^1.1.0", - "has": "^1.0.3", - "side-channel": "^1.0.4" - } - }, "interpret": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz", @@ -8674,19 +7533,12 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", + "dev": true, "requires": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" } }, - "is-bigint": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", - "requires": { - "has-bigints": "^1.0.1" - } - }, "is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -8696,20 +7548,6 @@ "binary-extensions": "^2.0.0" } }, - "is-boolean-object": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", - "requires": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - } - }, - "is-callable": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", - "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==" - }, "is-core-module": { "version": "2.9.0", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", @@ -8723,6 +7561,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "dev": true, "requires": { "has-tostringtag": "^1.0.0" } @@ -8739,14 +7578,6 @@ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "dev": true }, - "is-generator-function": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", - "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", - "requires": { - "has-tostringtag": "^1.0.0" - } - }, "is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", @@ -8756,34 +7587,12 @@ "is-extglob": "^2.1.1" } }, - "is-nan": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz", - "integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==", - "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3" - } - }, - "is-negative-zero": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==" - }, "is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true }, - "is-number-object": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", - "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", - "requires": { - "has-tostringtag": "^1.0.0" - } - }, "is-path-cwd": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", @@ -8815,61 +7624,18 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, "requires": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" } }, - "is-shared-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", - "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", - "requires": { - "call-bind": "^1.0.2" - } - }, "is-stream": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "dev": true }, - "is-string": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", - "requires": { - "has-tostringtag": "^1.0.0" - } - }, - "is-symbol": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", - "requires": { - "has-symbols": "^1.0.2" - } - }, - "is-typed-array": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz", - "integrity": "sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==", - "requires": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "es-abstract": "^1.20.0", - "for-each": "^0.3.3", - "has-tostringtag": "^1.0.0" - } - }, - "is-weakref": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", - "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", - "requires": { - "call-bind": "^1.0.2" - } - }, "is-wsl": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", @@ -8901,6 +7667,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", + "dev": true, "requires": { "@types/node": "*", "merge-stream": "^2.0.0", @@ -8910,12 +7677,14 @@ "json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true }, "jssha": { "version": "3.2.0", @@ -8931,7 +7700,8 @@ "loader-runner": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", - "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==" + "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", + "dev": true }, "locate-path": { "version": "5.0.0", @@ -8956,16 +7726,6 @@ "tslib": "^2.0.3" } }, - "md5.js": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", - "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", - "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -8990,7 +7750,8 @@ "merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true }, "merge2": { "version": "1.4.1", @@ -9014,22 +7775,6 @@ "picomatch": "^2.3.1" } }, - "miller-rabin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", - "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", - "requires": { - "bn.js": "^4.0.0", - "brorand": "^1.0.1" - }, - "dependencies": { - "bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" - } - } - }, "mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", @@ -9039,12 +7784,14 @@ "mime-db": { "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true }, "mime-types": { "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, "requires": { "mime-db": "1.52.0" } @@ -9058,12 +7805,8 @@ "minimalistic-assert": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" - }, - "minimalistic-crypto-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==" + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", + "dev": true }, "minimatch": { "version": "3.1.2", @@ -9124,7 +7867,8 @@ "neo-async": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true }, "no-case": { "version": "3.0.4", @@ -9176,41 +7920,11 @@ "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.4.0.tgz", "integrity": "sha512-amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ==" }, - "node-polyfill-webpack-plugin": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/node-polyfill-webpack-plugin/-/node-polyfill-webpack-plugin-1.1.4.tgz", - "integrity": "sha512-Z0XTKj1wRWO8o/Vjobsw5iOJCN+Sua3EZEUc2Ziy9CyVvmHKu6o+t4gUH9GOE0czyPR94LI6ZCV/PpcM8b5yow==", - "requires": { - "assert": "^2.0.0", - "browserify-zlib": "^0.2.0", - "buffer": "^6.0.3", - "console-browserify": "^1.2.0", - "constants-browserify": "^1.0.0", - "crypto-browserify": "^3.12.0", - "domain-browser": "^4.19.0", - "events": "^3.3.0", - "filter-obj": "^2.0.2", - "https-browserify": "^1.0.0", - "os-browserify": "^0.3.0", - "path-browserify": "^1.0.1", - "process": "^0.11.10", - "punycode": "^2.1.1", - "querystring-es3": "^0.2.1", - "readable-stream": "^3.6.0", - "stream-browserify": "^3.0.0", - "stream-http": "^3.2.0", - "string_decoder": "^1.3.0", - "timers-browserify": "^2.0.12", - "tty-browserify": "^0.0.1", - "url": "^0.11.0", - "util": "^0.12.4", - "vm-browserify": "^1.1.2" - } - }, "node-releases": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz", - "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==" + "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==", + "dev": true }, "normalize-path": { "version": "3.0.0", @@ -9239,12 +7953,14 @@ "object-inspect": { "version": "1.12.1", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.1.tgz", - "integrity": "sha512-Y/jF6vnvEtOPGiKD1+q+X0CiUYRQtEHp89MLLUJ7TUivtH8Ugn2+3A7Rynqk7BRsAoqeOQWnFnjpDrKSxDgIGA==" + "integrity": "sha512-Y/jF6vnvEtOPGiKD1+q+X0CiUYRQtEHp89MLLUJ7TUivtH8Ugn2+3A7Rynqk7BRsAoqeOQWnFnjpDrKSxDgIGA==", + "dev": true }, "object-is": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", + "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3" @@ -9253,18 +7969,8 @@ "object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" - }, - "object.assign": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", - "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "has-symbols": "^1.0.1", - "object-keys": "^1.1.1" - } + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true }, "obuf": { "version": "1.1.2", @@ -9315,11 +8021,6 @@ "is-wsl": "^2.2.0" } }, - "os-browserify": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", - "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==" - }, "p-limit": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", @@ -9360,11 +8061,6 @@ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" }, - "pako": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", - "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" - }, "param-case": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", @@ -9375,18 +8071,6 @@ "tslib": "^2.0.3" } }, - "parse-asn1": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", - "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", - "requires": { - "asn1.js": "^5.2.0", - "browserify-aes": "^1.0.0", - "evp_bytestokey": "^1.0.0", - "pbkdf2": "^3.0.3", - "safe-buffer": "^5.1.1" - } - }, "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -9403,11 +8087,6 @@ "tslib": "^2.0.3" } }, - "path-browserify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", - "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==" - }, "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -9442,18 +8121,6 @@ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "dev": true }, - "pbkdf2": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", - "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==", - "requires": { - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4", - "ripemd160": "^2.0.1", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" - } - }, "pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", @@ -9462,7 +8129,8 @@ "picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true }, "picomatch": { "version": "2.3.1", @@ -9516,11 +8184,6 @@ "renderkid": "^3.0.0" } }, - "process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==" - }, "process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -9555,26 +8218,6 @@ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" }, - "public-encrypt": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", - "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", - "requires": { - "bn.js": "^4.1.0", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "parse-asn1": "^5.0.0", - "randombytes": "^2.0.1", - "safe-buffer": "^5.1.2" - }, - "dependencies": { - "bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" - } - } - }, "pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", @@ -9587,7 +8230,8 @@ "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true }, "puppeteer-core": { "version": "15.3.2", @@ -9638,16 +8282,6 @@ "side-channel": "^1.0.4" } }, - "querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==" - }, - "querystring-es3": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", - "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==" - }, "queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -9658,19 +8292,11 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, "requires": { "safe-buffer": "^5.1.0" } }, - "randomfill": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", - "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", - "requires": { - "randombytes": "^2.0.5", - "safe-buffer": "^5.1.0" - } - }, "range-parser": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", @@ -9734,6 +8360,7 @@ "version": "1.4.3", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", + "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", @@ -9817,15 +8444,6 @@ "glob": "^7.1.3" } }, - "ripemd160": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", - "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", - "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1" - } - }, "run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -9843,12 +8461,14 @@ "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true }, "schema-utils": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "dev": true, "requires": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", @@ -9903,6 +8523,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "dev": true, "requires": { "randombytes": "^2.1.0" } @@ -9972,26 +8593,12 @@ "send": "0.18.0" } }, - "setimmediate": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==" - }, "setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", "dev": true }, - "sha.js": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", - "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, "shallow-clone": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", @@ -10020,6 +8627,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "dev": true, "requires": { "call-bind": "^1.0.0", "get-intrinsic": "^1.0.2", @@ -10052,12 +8660,14 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true }, "source-map-support": { "version": "0.5.21", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -10130,26 +8740,6 @@ "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", "dev": true }, - "stream-browserify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz", - "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==", - "requires": { - "inherits": "~2.0.4", - "readable-stream": "^3.5.0" - } - }, - "stream-http": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz", - "integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==", - "requires": { - "builtin-status-codes": "^3.0.0", - "inherits": "^2.0.4", - "readable-stream": "^3.6.0", - "xtend": "^4.0.2" - } - }, "string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", @@ -10158,26 +8748,6 @@ "safe-buffer": "~5.2.0" } }, - "string.prototype.trimend": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz", - "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==", - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.19.5" - } - }, - "string.prototype.trimstart": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz", - "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==", - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.19.5" - } - }, "strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -10197,6 +8767,7 @@ "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -10210,7 +8781,8 @@ "tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", - "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", + "dev": true }, "tar-fs": { "version": "2.1.1", @@ -10239,6 +8811,7 @@ "version": "5.15.1", "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz", "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==", + "dev": true, "requires": { "@jridgewell/source-map": "^0.3.2", "acorn": "^8.5.0", @@ -10249,7 +8822,8 @@ "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true } } }, @@ -10257,6 +8831,7 @@ "version": "5.3.3", "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz", "integrity": "sha512-Fx60G5HNYknNTNQnzQ1VePRuu89ZVYWfjRAeT5rITuCY/1b08s49e5kSQwHDirKZWuoKOBRFS98EUUoZ9kLEwQ==", + "dev": true, "requires": { "@jridgewell/trace-mapping": "^0.3.7", "jest-worker": "^27.4.5", @@ -10276,14 +8851,6 @@ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", "dev": true }, - "timers-browserify": { - "version": "2.0.12", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz", - "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==", - "requires": { - "setimmediate": "^1.0.4" - } - }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -10305,11 +8872,6 @@ "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", "dev": true }, - "tty-browserify": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz", - "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==" - }, "type-is": { "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", @@ -10320,17 +8882,6 @@ "mime-types": "~2.1.24" } }, - "unbox-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", - "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", - "requires": { - "call-bind": "^1.0.2", - "has-bigints": "^1.0.2", - "has-symbols": "^1.0.3", - "which-boxed-primitive": "^1.0.2" - } - }, "unbzip2-stream": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", @@ -10366,6 +8917,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.3.tgz", "integrity": "sha512-ufSazemeh9Gty0qiWtoRpJ9F5Q5W3xdIPm1UZQqYQv/q0Nyb9EMHUB2lu+O9x1re9WsorpMAUu4Y6Lxcs5n+XQ==", + "dev": true, "requires": { "escalade": "^3.1.1", "picocolors": "^1.0.0" @@ -10375,39 +8927,11 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, "requires": { "punycode": "^2.1.0" } }, - "url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==", - "requires": { - "punycode": "1.3.2", - "querystring": "0.2.0" - }, - "dependencies": { - "punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==" - } - } - }, - "util": { - "version": "0.12.4", - "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz", - "integrity": "sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==", - "requires": { - "inherits": "^2.0.3", - "is-arguments": "^1.0.4", - "is-generator-function": "^1.0.7", - "is-typed-array": "^1.1.3", - "safe-buffer": "^5.1.2", - "which-typed-array": "^1.1.2" - } - }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -10437,15 +8961,11 @@ "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", "dev": true }, - "vm-browserify": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", - "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==" - }, "watchpack": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz", "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==", + "dev": true, "requires": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" @@ -10464,6 +8984,7 @@ "version": "5.67.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.67.0.tgz", "integrity": "sha512-LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw==", + "dev": true, "requires": { "@types/eslint-scope": "^3.7.0", "@types/estree": "^0.0.50", @@ -10687,7 +9208,8 @@ "webpack-sources": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==" + "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", + "dev": true }, "websocket-driver": { "version": "0.7.4", @@ -10715,31 +9237,6 @@ "isexe": "^2.0.0" } }, - "which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "requires": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" - } - }, - "which-typed-array": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz", - "integrity": "sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==", - "requires": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "es-abstract": "^1.20.0", - "for-each": "^0.3.3", - "has-tostringtag": "^1.0.0", - "is-typed-array": "^1.1.9" - } - }, "wildcard": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", @@ -10762,11 +9259,6 @@ "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.2.1.tgz", "integrity": "sha512-sID0rrVCqkVNUn8t6xuv9+6FViXjUVXq8H5rWOH2rz9fDNQEd4g0EA2XlcEdJXRz5BMEn4O1pJFdT+z4YHhoWw==" }, - "xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" - }, "yauzl": { "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", diff --git a/templates/ctl-scaffold/package.json b/templates/ctl-scaffold/package.json index de6c65827a..ee21a7b721 100644 --- a/templates/ctl-scaffold/package.json +++ b/templates/ctl-scaffold/package.json @@ -27,8 +27,8 @@ "dependencies": { "@emurgo/cardano-message-signing-browser": "1.0.1", "@emurgo/cardano-message-signing-nodejs": "1.0.1", - "@emurgo/cardano-serialization-lib-browser": "11.2.1", - "@emurgo/cardano-serialization-lib-nodejs": "11.2.1", + "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.2", + "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.2", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1", "@mlabs-haskell/json-bigint": " 1.0.0", "@noble/secp256k1": "^1.7.0", @@ -41,7 +41,6 @@ "blakejs": "1.2.1", "bufferutil": "4.0.5", "jssha": "3.2.0", - "node-polyfill-webpack-plugin": "1.1.4", "puppeteer-core": "^15.3.2", "reconnecting-websocket": "4.4.0", "uniqid": "5.4.0", From b462b658ac7b5bd3ea3e07fbb733cc9dcff1a249 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Wed, 9 Aug 2023 20:54:17 +0400 Subject: [PATCH 38/85] Update CTL revision in the CTL template --- templates/ctl-scaffold/flake.lock | 8 ++++---- templates/ctl-scaffold/flake.nix | 2 +- templates/ctl-scaffold/packages.dhall | 2 +- templates/ctl-scaffold/spago-packages.nix | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/templates/ctl-scaffold/flake.lock b/templates/ctl-scaffold/flake.lock index a3421472f5..4d3c688e68 100644 --- a/templates/ctl-scaffold/flake.lock +++ b/templates/ctl-scaffold/flake.lock @@ -2757,17 +2757,17 @@ ] }, "locked": { - "lastModified": 1688727102, - "narHash": "sha256-qeYJOsLWEI3byvvcUqm9Z6LwCs4NB7JFHRHTwib2ET4=", + "lastModified": 1691599815, + "narHash": "sha256-i7t+KgDAMCaYqqF+BdBAsV1B4/9gFr11Yd9RpxF10JQ=", "owner": "Plutonomicon", "repo": "cardano-transaction-lib", - "rev": "ef1441b9a401586c8ecfb3d8cdbbb42d4bcda3ea", + "rev": "325665b19859bbf3e48e296e9aa717673f5f3d79", "type": "github" }, "original": { "owner": "Plutonomicon", "repo": "cardano-transaction-lib", - "rev": "ef1441b9a401586c8ecfb3d8cdbbb42d4bcda3ea", + "rev": "325665b19859bbf3e48e296e9aa717673f5f3d79", "type": "github" } }, diff --git a/templates/ctl-scaffold/flake.nix b/templates/ctl-scaffold/flake.nix index 023907d1a0..cf1d5cfb0a 100644 --- a/templates/ctl-scaffold/flake.nix +++ b/templates/ctl-scaffold/flake.nix @@ -10,7 +10,7 @@ type = "github"; owner = "Plutonomicon"; repo = "cardano-transaction-lib"; - rev = "ef1441b9a401586c8ecfb3d8cdbbb42d4bcda3ea"; + rev = "325665b19859bbf3e48e296e9aa717673f5f3d79"; }; # To use the same version of `nixpkgs` as we do nixpkgs.follows = "ctl/nixpkgs"; diff --git a/templates/ctl-scaffold/packages.dhall b/templates/ctl-scaffold/packages.dhall index 96b9652f65..7b8dccb2fe 100644 --- a/templates/ctl-scaffold/packages.dhall +++ b/templates/ctl-scaffold/packages.dhall @@ -328,7 +328,7 @@ let additions = , "web-storage" ] , repo = "https://github.com/Plutonomicon/cardano-transaction-lib.git" - , version = "ef1441b9a401586c8ecfb3d8cdbbb42d4bcda3ea" + , version = "325665b19859bbf3e48e296e9aa717673f5f3d79" } , noble-secp256k1 = { dependencies = diff --git a/templates/ctl-scaffold/spago-packages.nix b/templates/ctl-scaffold/spago-packages.nix index c3cb64639e..ae7055f703 100644 --- a/templates/ctl-scaffold/spago-packages.nix +++ b/templates/ctl-scaffold/spago-packages.nix @@ -211,11 +211,11 @@ let "cardano-transaction-lib" = pkgs.stdenv.mkDerivation { name = "cardano-transaction-lib"; - version = "ef1441b9a401586c8ecfb3d8cdbbb42d4bcda3ea"; + version = "325665b19859bbf3e48e296e9aa717673f5f3d79"; src = pkgs.fetchgit { url = "https://github.com/Plutonomicon/cardano-transaction-lib.git"; - rev = "ef1441b9a401586c8ecfb3d8cdbbb42d4bcda3ea"; - sha256 = "0ghiyqkc5lqi3m2v41qdrq5g18k7pnlm5p7vrbdqs46nq8x0krm9"; + rev = "325665b19859bbf3e48e296e9aa717673f5f3d79"; + sha256 = "156hfl8sflfzc5svs5k0zzil2pdi8380azm1mac2cc6000m7xfwb"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; From fd65ad4741e202ade226f0f0dacd07c3f31cd0c6 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Thu, 10 Aug 2023 21:55:28 +0400 Subject: [PATCH 39/85] Update the template and docs --- Makefile | 1 - doc/e2e-testing.md | 2 +- doc/images/e2e.png | Bin 113042 -> 107703 bytes doc/importing-scripts.md | 29 + esbuild/config.js | 1 - examples/Helpers/LoadScript.js | 12 - examples/Helpers/LoadScript.purs | 14 - examples/index.html | 60 + examples/index.js | 59 - package-lock.json | 2881 ++++------ package.json | 16 +- packages.dhall | 2 +- spago-packages.nix | 6 +- templates/ctl-scaffold/esbuild/config.js | 1 - templates/ctl-scaffold/index.html | 61 + templates/ctl-scaffold/package-lock.json | 6222 ++++++++++++++------- templates/ctl-scaffold/package.json | 14 +- templates/ctl-scaffold/packages.dhall | 2 +- templates/ctl-scaffold/spago-packages.nix | 6 +- templates/ctl-scaffold/webpack.config.js | 3 + test/ApplyArgs.purs | 6 +- test/Deserialization.purs | 13 +- webpack.config.cjs | 5 +- 23 files changed, 5721 insertions(+), 3695 deletions(-) delete mode 100644 examples/Helpers/LoadScript.js delete mode 100644 examples/Helpers/LoadScript.purs diff --git a/Makefile b/Makefile index e7c7db1d65..e985f148dc 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,6 @@ run-ci-actions: nix build -L .#checks.x86_64-linux.ctl-staking-test nix build -L .#checks.x86_64-linux.examples-imports-check - clean: @ rm -r .psc-ide-port || true @ rm -rf .psci_modules || true diff --git a/doc/e2e-testing.md b/doc/e2e-testing.md index 242bff4df9..402388558c 100644 --- a/doc/e2e-testing.md +++ b/doc/e2e-testing.md @@ -214,7 +214,7 @@ Note that the test closes successfully after the first successful `Contract` exe CTL offers a function to serve the `Contract`s to be tested with a router, that dispatches contracts and configuration parameters based on query part of the URL. -It also builds a page with a table consisting of links to all possible examples with all possible environments, that looks like this: +It also builds a page with drop-downs, allowing to select an example and an environments, that looks like this: ![Headless browser test suite - served examples](./images/e2e.png) diff --git a/doc/images/e2e.png b/doc/images/e2e.png index 7af557e9d33eaf6ad222910d39c40564763850d7..178768b5f9c90732c388c6d8d16a0f74dd0be58a 100644 GIT binary patch literal 107703 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

deWMSr!slC-am=NJv&Lw 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 ShpnMGxeRpS*UNQm!~O^H7tKBZ literal 113042 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 + +## Exporting scripts from Plutus + +Usually projects use a Haskell binary called *exporter* that outputs a pre-compiler UPLC bundle into a file, for example see [our Plutarch exporter from the-plutus-scaffold](https://github.com/mlabs-haskell/the-plutus-scaffold/tree/main/onchain). + +A simpler exporter for Plutus can be found [here](https://github.com/Mr-Andersen/ctl-multisign-mre/blob/main/onchain/exporter/Main.hs). + +The output file should be a Cardano envelope: + +```json +{ + "cborHex": "4e4d01000033222220051200120011", + "description": "always-succeeds", + "type": "PlutusScriptV2" +} +``` + +### Using Plutonomy + +When using Plutus, it makes sense to use [Plutonomy](https://github.com/well-typed/plutonomy) in the exporter: + +```haskell +import Plutonomy (aggressiveOptimizerOptions, optimizeUPLCWith) + +script :: Script +script = fromCompiledCode $ + optimizeUPLCWith aggressiveOptimizerOptions $$(PlutusTx.compile [||policy||]) +``` + ## Importing serialized scripts To use your own scripts, compile them to any subdirectory in the root of your project (where `webpack.config.js` is located) and add a relative path to `webpack.config.js` under the `resolve.alias` section. In CTL, we have the `Scripts` alias for this purpose. Note the capitalization of `Scripts`: it is necessary to disambiguate it from local folders. diff --git a/esbuild/config.js b/esbuild/config.js index 0b32adc2ab..a53bdb2c1e 100644 --- a/esbuild/config.js +++ b/esbuild/config.js @@ -6,7 +6,6 @@ export const buildOptions = { outdir: "dist/esbuild", define: { BROWSER_RUNTIME: process.env.BROWSER_RUNTIME, - SCRIPTS_DIR: '"fixtures/scripts"', }, plugins: [ polyfillNode({ diff --git a/examples/Helpers/LoadScript.js b/examples/Helpers/LoadScript.js deleted file mode 100644 index 464abe2896..0000000000 --- a/examples/Helpers/LoadScript.js +++ /dev/null @@ -1,12 +0,0 @@ -/* global BROWSER_RUNTIME SCRIPTS_DIR */ - -export const _loadScript = path => async () => { - if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { - const response = await fetch(`${SCRIPTS_DIR}/${path}`); - return await response.text(); - } else { - const fs = await import("fs"); - const url = new URL(`../../fixtures/scripts/${path}`, import.meta.url); - return fs.readFileSync(url, "utf8"); - } -}; diff --git a/examples/Helpers/LoadScript.purs b/examples/Helpers/LoadScript.purs deleted file mode 100644 index 7ecec45f79..0000000000 --- a/examples/Helpers/LoadScript.purs +++ /dev/null @@ -1,14 +0,0 @@ -module Ctl.Examples.Helpers.LoadScript - ( loadScript - ) where - -import Prelude - -import Control.Promise (Promise, toAffE) -import Effect (Effect) -import Effect.Aff (Aff) - -foreign import _loadScript :: String -> Effect (Promise String) - -loadScript :: String -> Aff String -loadScript filepath = toAffE $ _loadScript filepath diff --git a/examples/index.html b/examples/index.html index 3247c9a066..556bfcde5a 100644 --- a/examples/index.html +++ b/examples/index.html @@ -5,6 +5,66 @@ + diff --git a/examples/index.js b/examples/index.js index dcda6a63b5..2ea8c88a30 100644 --- a/examples/index.js +++ b/examples/index.js @@ -6,62 +6,3 @@ // imported here. From the repository root, run: // spago bundle-module -m

--to output.js import("../output.js").then(m => m.main()); - -// Set up Blockfrost API key prompt and UI around it. -// This code is only needed for CTL itself. -const oldBlockfrostKey = localStorage.getItem("BLOCKFROST_API_KEY"); - -const addSpacer = () => { - const spacer = document.createElement("span"); - spacer.textContent = " "; - document.body.appendChild(spacer); -}; - -const addHtml = html => { - const div = document.createElement("div"); - div.innerHTML = html; - document.body.appendChild(div); -}; - -addHtml(`

Blockfrost setup

`); - -if (oldBlockfrostKey !== null) { - const keyIsSetEl = document.createElement("span"); - keyIsSetEl.innerHTML = - '✅ Blockfrost key is set.'; - document.body.appendChild(keyIsSetEl); - - addSpacer(); - - const setBFKeyButton = document.createElement("button"); - setBFKeyButton.textContent = "Unset"; - setBFKeyButton.onclick = () => { - localStorage.removeItem("BLOCKFROST_API_KEY"); - window.location = "/"; - }; - document.body.appendChild(setBFKeyButton); -} else { - const keyIsNotSetEl = document.createElement("span"); - keyIsNotSetEl.innerHTML = - '❌ Blockfrost key is not set.'; - document.body.appendChild(keyIsNotSetEl); - - addSpacer(); - - const setBFKeyButton = document.createElement("button"); - setBFKeyButton.textContent = "Set Blockfrost API key"; - setBFKeyButton.onclick = () => { - const key = prompt("Enter your Blockfrost API key"); - if (key !== null) { - localStorage.setItem("BLOCKFROST_API_KEY", key); - window.location = "/"; - } - }; - document.body.appendChild(setBFKeyButton); -} - -addHtml(`
To set the Blockfrost API key permanently, close the browser and run: - 
-    npm run e2e-pack-settings
-
- The key will be saved to your settings archive. Sharing the archive file after that implies that the key can be leaked.
`); diff --git a/package-lock.json b/package-lock.json index 6dad1eafdd..eb4c6d8c15 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,8 +11,8 @@ "dependencies": { "@emurgo/cardano-message-signing-browser": "1.0.1", "@emurgo/cardano-message-signing-nodejs": "1.0.1", - "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.2", - "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.2", + "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.3", + "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.3", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1", "@mlabs-haskell/json-bigint": " 1.0.0", "@noble/secp256k1": "^1.7.0", @@ -63,6 +63,16 @@ "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-nodejs/-/cardano-message-signing-nodejs-1.0.1.tgz", "integrity": "sha512-PoKh1tQnJX18f8iEr8Jk1KXxKCn9eqaSslMI1pyOJvYRJhQVDLCh0+9YReufjp0oFJIY1ShcrR+4/WnECVZUKQ==" }, + "node_modules/@emurgo/cardano-serialization-lib-browser": { + "version": "11.4.0", + "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-11.4.0.tgz", + "integrity": "sha512-VWMvLRBFo7MAYh42zledURFs5BpMTWvkP4DzsLNbyJxZlwjDS+bPyehJVyGc116d2gq8NHFmANbfdeuK8ffJ7A==" + }, + "node_modules/@emurgo/cardano-serialization-lib-nodejs": { + "version": "11.4.0", + "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-11.4.0.tgz", + "integrity": "sha512-dMiofDcqv+IrAITCgWBZmsMLqwv2xImDsJDSrKiYYG1zRKaL8XfMOxx6S0WEnKVj5/343Q5FFURYcSu3iBRNMQ==" + }, "node_modules/@esbuild/android-arm": { "version": "0.18.11", "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.11.tgz", @@ -430,9 +440,9 @@ } }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", "dev": true, "engines": { "node": ">=6.0.0" @@ -458,19 +468,19 @@ } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.18", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz", - "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==", + "version": "0.3.19", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz", + "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==", "dev": true, "dependencies": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "node_modules/@jspm/core": { @@ -486,33 +496,23 @@ "dev": true }, "node_modules/@mlabs-haskell/cardano-serialization-lib-gc-browser": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.2.tgz", - "integrity": "sha512-hkfXjMy+GD4YMCM3ReXmlaZnWpMufx5NXoyYoyGvEKgQ3kHsArKirBf0YOuhSINyS8emOerXh/0mXPCgz1l3mw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.3.tgz", + "integrity": "sha512-TXzaD8lWqpA5U5KRiW2iDIQzSyddcgd5tn08GE0KpecuBFOQievtnetUIV6+ERFxWUG7R8x9qWWu8syVfP4WRQ==", "dependencies": { "@emurgo/cardano-serialization-lib-browser": "^11.2.1", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" } }, - "node_modules/@mlabs-haskell/cardano-serialization-lib-gc-browser/node_modules/@emurgo/cardano-serialization-lib-browser": { - "version": "11.4.0", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-11.4.0.tgz", - "integrity": "sha512-VWMvLRBFo7MAYh42zledURFs5BpMTWvkP4DzsLNbyJxZlwjDS+bPyehJVyGc116d2gq8NHFmANbfdeuK8ffJ7A==" - }, "node_modules/@mlabs-haskell/cardano-serialization-lib-gc-nodejs": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.2.tgz", - "integrity": "sha512-HD75q8yyhfrrI4zeb2gkoO3wcq0EaVIwiAbyhVQWuniUPgQ6mOr2Lz31vw7YSyY1jksVU69eXngdstgErY6/yw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.3.tgz", + "integrity": "sha512-wjNZH4hwEYYQbjI/vHWmbDRu8Pec40+/ywXWRBUr7mOcE99Zo9u911qeQgdULPp7R4TOhK5alOz+Arp06yCKiQ==", "dependencies": { "@emurgo/cardano-serialization-lib-nodejs": "^11.4.0", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" } }, - "node_modules/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/node_modules/@emurgo/cardano-serialization-lib-nodejs": { - "version": "11.4.0", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-11.4.0.tgz", - "integrity": "sha512-dMiofDcqv+IrAITCgWBZmsMLqwv2xImDsJDSrKiYYG1zRKaL8XfMOxx6S0WEnKVj5/343Q5FFURYcSu3iBRNMQ==" - }, "node_modules/@mlabs-haskell/csl-gc-wrapper": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@mlabs-haskell/csl-gc-wrapper/-/csl-gc-wrapper-1.0.1.tgz", @@ -527,20 +527,20 @@ } }, "node_modules/@noble/hashes": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.0.tgz", - "integrity": "sha512-ilHEACi9DwqJB0pw7kv+Apvh50jiiSyR/cQ3y4W7lOR5mhvn/50FLUfsnfJz0BDZtl/RR16kXvptiv6q1msYZg==", - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ] + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.1.tgz", + "integrity": "sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==", + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } }, "node_modules/@noble/secp256k1": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.0.tgz", - "integrity": "sha512-kbacwGSsH/CTout0ZnZWxnW1B+jH/7r/WAAKLBtrRJ/+CUH7lgmQzl3GTrQua3SGKWNSDsS6lmjnDpIJ5Dxyaw==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz", + "integrity": "sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw==", "funding": [ { "type": "individual", @@ -549,18 +549,18 @@ ] }, "node_modules/@textlint/ast-node-types": { - "version": "12.2.2", - "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.2.2.tgz", - "integrity": "sha512-VQAXUSGdmEajHXrMxeM9ZTS8UBJSVB0ghJFHpFfqYKlcDsjIqClSmTprY6521HoCoSLoUIGBxTC3jQyUMJFIWw==", + "version": "12.6.1", + "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.6.1.tgz", + "integrity": "sha512-uzlJ+ZsCAyJm+lBi7j0UeBbj+Oy6w/VWoGJ3iHRHE5eZ8Z4iK66mq+PG/spupmbllLtz77OJbY89BYqgFyjXmA==", "dev": true }, "node_modules/@textlint/markdown-to-ast": { - "version": "12.2.3", - "resolved": "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.2.3.tgz", - "integrity": "sha512-omZqcZV1Q8t9K0IKvlHNIdTV3SKNaS2P5qkbTjzDj7PuTuvG20JFqL9Naiwwi9ty3NzTzq+W8lLG3H2HgX0WvA==", + "version": "12.6.1", + "resolved": "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.6.1.tgz", + "integrity": "sha512-T0HO+VrU9VbLRiEx/kH4+gwGMHNMIGkp0Pok+p0I33saOOLyhfGvwOKQgvt2qkxzQEV2L5MtGB8EnW4r5d3CqQ==", "dev": true, "dependencies": { - "@textlint/ast-node-types": "^12.2.2", + "@textlint/ast-node-types": "^12.6.1", "debug": "^4.3.4", "mdast-util-gfm-autolink-literal": "^0.1.3", "remark-footnotes": "^3.0.0", @@ -571,29 +571,6 @@ "unified": "^9.2.2" } }, - "node_modules/@textlint/markdown-to-ast/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/@textlint/markdown-to-ast/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, "node_modules/@types/body-parser": { "version": "1.19.2", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz", @@ -623,9 +600,9 @@ } }, "node_modules/@types/connect-history-api-fallback": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz", - "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz", + "integrity": "sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==", "dev": true, "dependencies": { "@types/express-serve-static-core": "*", @@ -633,9 +610,9 @@ } }, "node_modules/@types/eslint": { - "version": "8.4.3", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.3.tgz", - "integrity": "sha512-YP1S7YJRMPs+7KZKDb9G63n8YejIwW9BALq7a5j2+H4yl6iOv9CB29edho+cuFRrvmJbbaH2yiVChKLJVysDGw==", + "version": "8.44.2", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.2.tgz", + "integrity": "sha512-sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg==", "dev": true, "dependencies": { "@types/estree": "*", @@ -643,9 +620,9 @@ } }, "node_modules/@types/eslint-scope": { - "version": "3.7.3", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz", - "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==", + "version": "3.7.4", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz", + "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==", "dev": true, "dependencies": { "@types/eslint": "*", @@ -659,26 +636,27 @@ "dev": true }, "node_modules/@types/express": { - "version": "4.17.13", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz", - "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==", + "version": "4.17.17", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz", + "integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==", "dev": true, "dependencies": { "@types/body-parser": "*", - "@types/express-serve-static-core": "^4.17.18", + "@types/express-serve-static-core": "^4.17.33", "@types/qs": "*", "@types/serve-static": "*" } }, "node_modules/@types/express-serve-static-core": { - "version": "4.17.29", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.29.tgz", - "integrity": "sha512-uMd++6dMKS32EOuw1Uli3e3BPgdLIXmezcfHv7N4c1s3gkhikBplORPpMq3fuWkxncZN1reb16d5n8yhQ80x7Q==", + "version": "4.17.35", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz", + "integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==", "dev": true, "dependencies": { "@types/node": "*", "@types/qs": "*", - "@types/range-parser": "*" + "@types/range-parser": "*", + "@types/send": "*" } }, "node_modules/@types/html-minifier-terser": { @@ -687,28 +665,34 @@ "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==", "dev": true }, + "node_modules/@types/http-errors": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz", + "integrity": "sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==", + "dev": true + }, "node_modules/@types/http-proxy": { - "version": "1.17.9", - "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz", - "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==", + "version": "1.17.11", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.11.tgz", + "integrity": "sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/json-schema": { - "version": "7.0.11", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "version": "7.0.12", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz", + "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==", "dev": true }, "node_modules/@types/mdast": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz", - "integrity": "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==", + "version": "3.0.12", + "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.12.tgz", + "integrity": "sha512-DT+iNIRNX884cx0/Q1ja7NyUPpZuv0KPyL5rGNxm1WC1OtHstl7n4Jb7nk+xacNShQMbczJjt8uFzznpp6kYBg==", "dev": true, "dependencies": { - "@types/unist": "*" + "@types/unist": "^2" } }, "node_modules/@types/mime": { @@ -718,9 +702,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "17.0.35", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.35.tgz", - "integrity": "sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==", + "version": "20.4.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.9.tgz", + "integrity": "sha512-8e2HYcg7ohnTUbHk8focoklEQYvemQmu9M/f43DZVx43kHn0tE3BY/6gSDxS7k0SprtS0NHvj+L80cGLnoOUcQ==", "devOptional": true }, "node_modules/@types/qs": { @@ -741,6 +725,16 @@ "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==", "dev": true }, + "node_modules/@types/send": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz", + "integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==", + "dev": true, + "dependencies": { + "@types/mime": "^1", + "@types/node": "*" + } + }, "node_modules/@types/serve-index": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz", @@ -751,12 +745,13 @@ } }, "node_modules/@types/serve-static": { - "version": "1.13.10", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz", - "integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.2.tgz", + "integrity": "sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==", "dev": true, "dependencies": { - "@types/mime": "^1", + "@types/http-errors": "*", + "@types/mime": "*", "@types/node": "*" } }, @@ -770,9 +765,9 @@ } }, "node_modules/@types/unist": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz", - "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.7.tgz", + "integrity": "sha512-cputDpIbFgLUaGQn6Vqg3/YsJwxUwHLO13v3i5ouxT4lat0khip9AEWxtERujXV9wxIB1EyF97BSJFt6vpdI8g==", "dev": true }, "node_modules/@types/ws": { @@ -1052,27 +1047,6 @@ "node": ">= 6.0.0" } }, - "node_modules/agent-base/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/agent-base/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, "node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -1107,9 +1081,9 @@ } }, "node_modules/ajv-formats/node_modules/ajv": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", "dev": true, "dependencies": { "fast-deep-equal": "^3.1.1", @@ -1168,9 +1142,9 @@ } }, "node_modules/anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, "dependencies": { "normalize-path": "^3.0.0", @@ -1344,6 +1318,19 @@ "ieee754": "^1.1.13" } }, + "node_modules/bl/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/blakejs": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.2.1.tgz", @@ -1356,9 +1343,9 @@ "dev": true }, "node_modules/body-parser": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz", - "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==", + "version": "1.20.1", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", + "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", "dev": true, "dependencies": { "bytes": "3.1.2", @@ -1369,7 +1356,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.10.3", + "qs": "6.11.0", "raw-body": "2.5.1", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -1388,6 +1375,36 @@ "node": ">= 0.8" } }, + "node_modules/body-parser/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/body-parser/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, + "node_modules/body-parser/node_modules/qs": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "dev": true, + "dependencies": { + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/bonjour-service": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz", @@ -1497,6 +1514,20 @@ "safe-buffer": "^5.2.0" } }, + "node_modules/browserify-sign/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/browserify-zlib": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", @@ -1507,9 +1538,9 @@ } }, "node_modules/browserslist": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.0.tgz", - "integrity": "sha512-UQxE0DIhRB5z/zDz9iA03BOfxaN2+GQdBYH/2WrSIWEUrnpzTPJbhqt+umq6r3acaPRTW1FNTkrcp0PXgtFkvA==", + "version": "4.21.10", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz", + "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==", "dev": true, "funding": [ { @@ -1519,13 +1550,17 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "caniuse-lite": "^1.0.30001358", - "electron-to-chromium": "^1.4.164", - "node-releases": "^2.0.5", - "update-browserslist-db": "^1.0.0" + "caniuse-lite": "^1.0.30001517", + "electron-to-chromium": "^1.4.477", + "node-releases": "^2.0.13", + "update-browserslist-db": "^1.0.11" }, "bin": { "browserslist": "cli.js" @@ -1629,9 +1664,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001358", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001358.tgz", - "integrity": "sha512-hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw==", + "version": "1.0.30001519", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz", + "integrity": "sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==", "dev": true, "funding": [ { @@ -1641,6 +1676,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ] }, @@ -1736,9 +1775,9 @@ } }, "node_modules/clean-css": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.0.tgz", - "integrity": "sha512-YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz", + "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==", "dev": true, "dependencies": { "source-map": "~0.6.0" @@ -1762,9 +1801,9 @@ } }, "node_modules/colorette": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz", - "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", "dev": true }, "node_modules/commander": { @@ -1806,6 +1845,21 @@ "node": ">= 0.8.0" } }, + "node_modules/compression/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/compression/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, "node_modules/compression/node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -1851,9 +1905,9 @@ } }, "node_modules/content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", "dev": true, "engines": { "node": ">= 0.6" @@ -1996,12 +2050,19 @@ } }, "node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dependencies": { - "ms": "2.0.0" + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, "node_modules/default-gateway": { @@ -2026,9 +2087,9 @@ } }, "node_modules/define-properties": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", - "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", + "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", "dev": true, "dependencies": { "has-property-descriptors": "^1.0.0", @@ -2051,9 +2112,9 @@ } }, "node_modules/des.js": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", - "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz", + "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==", "dev": true, "dependencies": { "inherits": "^2.0.1", @@ -2077,9 +2138,9 @@ "dev": true }, "node_modules/devtools-protocol": { - "version": "0.0.1011705", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1011705.tgz", - "integrity": "sha512-OKvTvu9n3swmgYshvsyVHYX0+aPzCoYUnyXUacfQMmFtBtBKewV/gT4I9jkAbpTqtTi2E4S9MXLlvzBDUlqg0Q==" + "version": "0.0.1019158", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1019158.tgz", + "integrity": "sha512-wvq+KscQ7/6spEV7czhnZc9RM/woz1AY+/Vpd8/h2HFMwJSdTliu7f/yr1A6vDdJfKICZsShqsYpEQbdhg8AFQ==" }, "node_modules/diffie-hellman": { "version": "5.0.3", @@ -2133,37 +2194,6 @@ "doctoc": "doctoc.js" } }, - "node_modules/doctoc/node_modules/entities": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz", - "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==", - "dev": true, - "engines": { - "node": ">=0.12" - }, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, - "node_modules/doctoc/node_modules/htmlparser2": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz", - "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==", - "dev": true, - "funding": [ - "https://github.com/fb55/htmlparser2?sponsor=1", - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ], - "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.2", - "domutils": "^2.8.0", - "entities": "^3.0.1" - } - }, "node_modules/dom-converter": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz", @@ -2187,6 +2217,15 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom-serializer/node_modules/entities": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "dev": true, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, "node_modules/domain-browser": { "version": "4.22.0", "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-4.22.0.tgz", @@ -2257,9 +2296,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.167", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.167.tgz", - "integrity": "sha512-lPHuHXBwpkr4RcfaZBKm6TKOWG/1N9mVggUpP4fY3l1JIUU2x4fkM8928smYdZ5lF+6KCTAxo1aK9JmqT+X71Q==", + "version": "1.4.490", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.490.tgz", + "integrity": "sha512-6s7NVJz+sATdYnIwhdshx/N/9O6rvMxmhVoDSDFdj6iA45gHR8EQje70+RYsF4GeB+k0IeNSBnP7yG9ZXJFr7A==", "dev": true }, "node_modules/elliptic": { @@ -2320,10 +2359,13 @@ } }, "node_modules/entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz", + "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==", "dev": true, + "engines": { + "node": ">=0.12" + }, "funding": { "url": "https://github.com/fb55/entities?sponsor=1" } @@ -2340,66 +2382,12 @@ "node": ">=4" } }, - "node_modules/es-abstract": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz", - "integrity": "sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.1.1", - "get-symbol-description": "^1.0.0", - "has": "^1.0.3", - "has-property-descriptors": "^1.0.0", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.3", - "is-callable": "^1.2.4", - "is-negative-zero": "^2.0.2", - "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.2", - "is-string": "^1.0.7", - "is-weakref": "^1.0.2", - "object-inspect": "^1.12.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.2", - "regexp.prototype.flags": "^1.4.3", - "string.prototype.trimend": "^1.0.5", - "string.prototype.trimstart": "^1.0.5", - "unbox-primitive": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/es-module-lexer": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz", "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==", "dev": true }, - "node_modules/es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, - "dependencies": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/es6-object-assign": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz", @@ -2605,16 +2593,28 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, - "node_modules/express": { - "version": "4.18.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz", - "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==", + "node_modules/execa/node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", "dev": true, - "dependencies": { - "accepts": "~1.3.8", - "array-flatten": "1.1.1", - "body-parser": "1.20.0", - "content-disposition": "0.5.4", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/express": { + "version": "4.18.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", + "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", + "dev": true, + "dependencies": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "1.20.1", + "content-disposition": "0.5.4", "content-type": "~1.0.4", "cookie": "0.5.0", "cookie-signature": "1.0.6", @@ -2632,7 +2632,7 @@ "parseurl": "~1.3.3", "path-to-regexp": "0.1.7", "proxy-addr": "~2.0.7", - "qs": "6.10.3", + "qs": "6.11.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", "send": "0.18.0", @@ -2653,6 +2653,36 @@ "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", "dev": true }, + "node_modules/express/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/express/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, + "node_modules/express/node_modules/qs": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "dev": true, + "dependencies": { + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -2678,41 +2708,6 @@ "@types/yauzl": "^2.9.1" } }, - "node_modules/extract-zip/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/extract-zip/node_modules/get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dependencies": { - "pump": "^3.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/extract-zip/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -2726,9 +2721,9 @@ "dev": true }, "node_modules/fastest-levenshtein": { - "version": "1.0.14", - "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.14.tgz", - "integrity": "sha512-tFfWHjnuUfKE186Tfgr+jtaFc0mZTApEgKDOeyN+FwOqRkO/zK/3h1AiRd8u8CY53owL3CUmGr/oI9p/RdyLTA==", + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", + "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", "dev": true, "engines": { "node": ">= 4.9.1" @@ -2806,6 +2801,21 @@ "node": ">= 0.8" } }, + "node_modules/finalhandler/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/finalhandler/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, "node_modules/find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", @@ -2819,9 +2829,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", - "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", "dev": true, "funding": [ { @@ -2880,9 +2890,9 @@ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" }, "node_modules/fs-monkey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz", - "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.4.tgz", + "integrity": "sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==", "dev": true }, "node_modules/fs.realpath": { @@ -2910,73 +2920,33 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, - "node_modules/function.prototype.name": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", - "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/functions-have-names": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/get-intrinsic": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", + "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", "dev": true, "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", - "has-symbols": "^1.0.1" + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/get-symbol-description": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", - "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", - "dev": true, + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" + "pump": "^3.0.0" }, "engines": { - "node": ">= 0.4" + "node": ">=8" }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/glob": { @@ -3016,10 +2986,22 @@ "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", "dev": true }, + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true }, "node_modules/handle-thing": { @@ -3040,15 +3022,6 @@ "node": ">= 0.4.0" } }, - "node_modules/has-bigints": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -3070,6 +3043,18 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/has-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/has-symbols": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", @@ -3111,6 +3096,20 @@ "node": ">=4" } }, + "node_modules/hash-base/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/hash.js": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", @@ -3154,9 +3153,9 @@ } }, "node_modules/hpack.js/node_modules/readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, "dependencies": { "core-util-is": "~1.0.0", @@ -3184,10 +3183,20 @@ } }, "node_modules/html-entities": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz", - "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==", - "dev": true + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz", + "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/mdevils" + }, + { + "type": "patreon", + "url": "https://patreon.com/mdevils" + } + ] }, "node_modules/html-minifier-terser": { "version": "6.1.0", @@ -3234,9 +3243,9 @@ } }, "node_modules/htmlparser2": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", - "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz", + "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==", "dev": true, "funding": [ "https://github.com/fb55/htmlparser2?sponsor=1", @@ -3247,9 +3256,9 @@ ], "dependencies": { "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", - "domutils": "^2.5.2", - "entities": "^2.0.0" + "domhandler": "^4.2.2", + "domutils": "^2.8.0", + "entities": "^3.0.1" } }, "node_modules/http-deceiver": { @@ -3275,9 +3284,9 @@ } }, "node_modules/http-parser-js": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz", - "integrity": "sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA==", + "version": "0.5.8", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz", + "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==", "dev": true }, "node_modules/http-proxy": { @@ -3318,6 +3327,18 @@ } } }, + "node_modules/http-proxy-middleware/node_modules/is-plain-obj": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", + "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/https-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", @@ -3336,27 +3357,6 @@ "node": ">= 6" } }, - "node_modules/https-proxy-agent/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/https-proxy-agent/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, "node_modules/human-signals": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", @@ -3440,20 +3440,6 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, - "node_modules/internal-slot": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz", - "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==", - "dev": true, - "dependencies": { - "get-intrinsic": "^1.1.0", - "has": "^1.0.3", - "side-channel": "^1.0.4" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/interpret": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz", @@ -3464,9 +3450,9 @@ } }, "node_modules/ipaddr.js": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz", - "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz", + "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==", "dev": true, "engines": { "node": ">= 10" @@ -3512,18 +3498,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-bigint": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", - "dev": true, - "dependencies": { - "has-bigints": "^1.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -3536,22 +3510,6 @@ "node": ">=8" } }, - "node_modules/is-boolean-object": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-buffer": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", @@ -3576,9 +3534,9 @@ } }, "node_modules/is-callable": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", - "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", "dev": true, "engines": { "node": ">= 0.4" @@ -3588,9 +3546,9 @@ } }, "node_modules/is-core-module": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz", - "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==", + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", + "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", "dev": true, "dependencies": { "has": "^1.0.3" @@ -3599,21 +3557,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-date-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-decimal": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz", @@ -3701,18 +3644,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-negative-zero": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -3722,31 +3653,13 @@ "node": ">=0.12.0" } }, - "node_modules/is-number-object": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", - "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-plain-obj": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", - "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", "dev": true, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=8" } }, "node_modules/is-plain-object": { @@ -3761,34 +3674,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-shared-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", - "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-stream": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", @@ -3801,47 +3686,13 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/is-string": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-symbol": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", - "dev": true, - "dependencies": { - "has-symbols": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-typed-array": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz", - "integrity": "sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", + "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "es-abstract": "^1.20.0", - "for-each": "^0.3.3", - "has-tostringtag": "^1.0.0" + "which-typed-array": "^1.1.11" }, "engines": { "node": ">= 0.4" @@ -3850,18 +3701,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-weakref": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", - "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-wsl": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", @@ -4186,12 +4025,12 @@ } }, "node_modules/memfs": { - "version": "3.4.6", - "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.6.tgz", - "integrity": "sha512-rH9mjopto6Wkr7RFuH9l9dk3qb2XGOcYKr7xMhaYqfzuJqOqhRrcFvfD7JMuPj6SLmPreh5+6eAuv36NFAU+Mw==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz", + "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==", "dev": true, "dependencies": { - "fs-monkey": "^1.0.3" + "fs-monkey": "^1.0.4" }, "engines": { "node": ">= 4.0.0" @@ -4344,29 +4183,6 @@ "url": "https://opencollective.com/unified" } }, - "node_modules/micromark/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/micromark/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, "node_modules/micromatch": { "version": "4.0.5", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", @@ -4465,10 +4281,13 @@ } }, "node_modules/minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", - "dev": true + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/mkdirp-classic": { "version": "0.5.3", @@ -4476,10 +4295,9 @@ "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" }, "node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/multicast-dns": { "version": "7.2.5", @@ -4538,25 +4356,6 @@ } } }, - "node_modules/node-fetch/node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, - "node_modules/node-fetch/node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "node_modules/node-fetch/node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "node_modules/node-forge": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", @@ -4567,9 +4366,9 @@ } }, "node_modules/node-gyp-build": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.4.0.tgz", - "integrity": "sha512-amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz", + "integrity": "sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==", "bin": { "node-gyp-build": "bin.js", "node-gyp-build-optional": "optional.js", @@ -4615,26 +4414,10 @@ "webpack": ">=5" } }, - "node_modules/node-polyfill-webpack-plugin/node_modules/readable-stream": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.2.tgz", - "integrity": "sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==", - "dev": true, - "dependencies": { - "abort-controller": "^3.0.0", - "buffer": "^6.0.3", - "events": "^3.3.0", - "process": "^0.11.10", - "string_decoder": "^1.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, "node_modules/node-releases": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz", - "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==", + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", + "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", "dev": true }, "node_modules/normalize-path": { @@ -4671,9 +4454,9 @@ } }, "node_modules/object-inspect": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.1.tgz", - "integrity": "sha512-Y/jF6vnvEtOPGiKD1+q+X0CiUYRQtEHp89MLLUJ7TUivtH8Ugn2+3A7Rynqk7BRsAoqeOQWnFnjpDrKSxDgIGA==", + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -4699,27 +4482,9 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object.assign": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "has-symbols": "^1.0.1", - "object-keys": "^1.1.1" - }, + "dev": true, "engines": { "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" } }, "node_modules/obuf": { @@ -4773,9 +4538,9 @@ } }, "node_modules/open": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz", - "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", + "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", "dev": true, "dependencies": { "define-lazy-prop": "^2.0.0", @@ -5090,22 +4855,22 @@ } }, "node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", "dev": true, "engines": { "node": ">=6" } }, "node_modules/puppeteer-core": { - "version": "15.3.2", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-15.3.2.tgz", - "integrity": "sha512-Fmca9UzXmJkRrvGBgUmrffGD2BlulUTfsVefV1+vqfNm4PnlZ/U1bfD6X8XQ0nftyyg520tmSKd81yH3Z2tszg==", + "version": "15.5.0", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-15.5.0.tgz", + "integrity": "sha512-5Q8EmF++MARczJD1JcRehVePlctxGG2TFHSxdCV8NqPOk44/cMySmZw2nETn+lwUOyp0L9afosMFTnT4KgmWgw==", "dependencies": { "cross-fetch": "3.1.5", "debug": "4.3.4", - "devtools-protocol": "0.0.1011705", + "devtools-protocol": "0.0.1019158", "extract-zip": "2.0.1", "https-proxy-agent": "5.0.1", "pkg-dir": "4.2.0", @@ -5120,27 +4885,6 @@ "node": ">=14.1.0" } }, - "node_modules/puppeteer-core/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/puppeteer-core/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, "node_modules/puppeteer-core/node_modules/ws": { "version": "8.8.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz", @@ -5162,9 +4906,9 @@ } }, "node_modules/qs": { - "version": "6.10.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz", - "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==", + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", + "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==", "dev": true, "dependencies": { "side-channel": "^1.0.4" @@ -5176,16 +4920,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==", - "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", - "dev": true, - "engines": { - "node": ">=0.4.x" - } - }, "node_modules/querystring-es3": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", @@ -5248,16 +4982,19 @@ } }, "node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.2.tgz", + "integrity": "sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==", + "dev": true, "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "abort-controller": "^3.0.0", + "buffer": "^6.0.3", + "events": "^3.3.0", + "process": "^0.11.10", + "string_decoder": "^1.3.0" }, "engines": { - "node": ">= 6" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/readdirp": { @@ -5289,23 +5026,6 @@ "resolved": "https://registry.npmjs.org/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz", "integrity": "sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng==" }, - "node_modules/regexp.prototype.flags": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", - "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "functions-have-names": "^1.2.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/relateurl": { "version": "0.2.7", "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", @@ -5383,6 +5103,34 @@ "strip-ansi": "^6.0.1" } }, + "node_modules/renderkid/node_modules/entities": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "dev": true, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/renderkid/node_modules/htmlparser2": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", + "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", + "dev": true, + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "dependencies": { + "domelementtype": "^2.0.1", + "domhandler": "^4.0.0", + "domutils": "^2.5.2", + "entities": "^2.0.0" + } + }, "node_modules/repeat-string": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", @@ -5408,12 +5156,12 @@ "dev": true }, "node_modules/resolve": { - "version": "1.22.2", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz", - "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==", + "version": "1.22.4", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz", + "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==", "dev": true, "dependencies": { - "is-core-module": "^2.11.0", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -5563,6 +5311,21 @@ "node": ">= 0.8.0" } }, + "node_modules/send/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/send/node_modules/debug/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -5596,6 +5359,15 @@ "node": ">= 0.8.0" } }, + "node_modules/serve-index/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, "node_modules/serve-index/node_modules/depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -5626,6 +5398,12 @@ "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", "dev": true }, + "node_modules/serve-index/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, "node_modules/serve-index/node_modules/setprototypeof": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", @@ -5803,52 +5581,20 @@ "wbuf": "^1.7.3" } }, - "node_modules/spdy-transport/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/spdy-transport/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "node_modules/spdy/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "node_modules/spdy-transport/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, "dependencies": { - "ms": "2.1.2" + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" }, "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } + "node": ">= 6" } }, - "node_modules/spdy/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, "node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", @@ -5868,6 +5614,20 @@ "readable-stream": "^3.5.0" } }, + "node_modules/stream-browserify/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/stream-http": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz", @@ -5880,40 +5640,26 @@ "xtend": "^4.0.2" } }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, - "node_modules/string.prototype.trimend": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz", - "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==", + "node_modules/stream-http/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.19.5" + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "engines": { + "node": ">= 6" } }, - "node_modules/string.prototype.trimstart": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz", - "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==", - "dev": true, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.19.5" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "safe-buffer": "~5.2.0" } }, "node_modules/strip-ansi": { @@ -5999,10 +5745,23 @@ "node": ">=6" } }, + "node_modules/tar-stream/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/terser": { - "version": "5.18.2", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.18.2.tgz", - "integrity": "sha512-Ah19JS86ypbJzTzvUCX7KOsEIhDaRONungA4aYBjEP3JZRf4ocuDzTg4QWZnPn9DEMiMYGJPiSOy7aykoCc70w==", + "version": "5.19.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz", + "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==", "dev": true, "dependencies": { "@jridgewell/source-map": "^0.3.3", @@ -6101,6 +5860,11 @@ "node": ">=0.6" } }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, "node_modules/traverse": { "version": "0.6.7", "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.7.tgz", @@ -6121,9 +5885,9 @@ } }, "node_modules/tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", + "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", "dev": true }, "node_modules/tty-browserify": { @@ -6157,21 +5921,6 @@ "node": ">= 0.6" } }, - "node_modules/unbox-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", - "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-bigints": "^1.0.2", - "has-symbols": "^1.0.3", - "which-boxed-primitive": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/unbzip2-stream": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", @@ -6228,15 +5977,6 @@ "url": "https://opencollective.com/unified" } }, - "node_modules/unified/node_modules/is-plain-obj": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", - "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/uniqid": { "version": "5.4.0", "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-5.4.0.tgz", @@ -6289,9 +6029,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.3.tgz", - "integrity": "sha512-ufSazemeh9Gty0qiWtoRpJ9F5Q5W3xdIPm1UZQqYQv/q0Nyb9EMHUB2lu+O9x1re9WsorpMAUu4Y6Lxcs5n+XQ==", + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", + "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", "dev": true, "funding": [ { @@ -6301,6 +6041,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { @@ -6308,7 +6052,7 @@ "picocolors": "^1.0.0" }, "bin": { - "browserslist-lint": "cli.js" + "update-browserslist-db": "cli.js" }, "peerDependencies": { "browserslist": ">= 4.21.0" @@ -6330,32 +6074,31 @@ } }, "node_modules/url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==", + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.1.tgz", + "integrity": "sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==", "dev": true, "dependencies": { - "punycode": "1.3.2", - "querystring": "0.2.0" + "punycode": "^1.4.1", + "qs": "^6.11.0" } }, "node_modules/url/node_modules/punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", "dev": true }, "node_modules/util": { - "version": "0.12.4", - "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz", - "integrity": "sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==", + "version": "0.12.5", + "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", + "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==", "dev": true, "dependencies": { "inherits": "^2.0.3", "is-arguments": "^1.0.4", "is-generator-function": "^1.0.7", "is-typed-array": "^1.1.3", - "safe-buffer": "^5.1.2", "which-typed-array": "^1.1.2" } }, @@ -6455,6 +6198,11 @@ "minimalistic-assert": "^1.0.0" } }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, "node_modules/webpack": { "version": "5.88.1", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.1.tgz", @@ -6580,9 +6328,9 @@ } }, "node_modules/webpack-dev-middleware/node_modules/ajv": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", "dev": true, "dependencies": { "fast-deep-equal": "^3.1.1", @@ -6614,15 +6362,15 @@ "dev": true }, "node_modules/webpack-dev-middleware/node_modules/schema-utils": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", - "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", + "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.9", - "ajv": "^8.8.0", + "ajv": "^8.9.0", "ajv-formats": "^2.1.1", - "ajv-keywords": "^5.0.0" + "ajv-keywords": "^5.1.0" }, "engines": { "node": ">= 12.13.0" @@ -6692,9 +6440,9 @@ } }, "node_modules/webpack-dev-server/node_modules/ajv": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", "dev": true, "dependencies": { "fast-deep-equal": "^3.1.1", @@ -6726,15 +6474,15 @@ "dev": true }, "node_modules/webpack-dev-server/node_modules/schema-utils": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", - "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", + "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.9", - "ajv": "^8.8.0", + "ajv": "^8.9.0", "ajv-formats": "^2.1.1", - "ajv-keywords": "^5.0.0" + "ajv-keywords": "^5.1.0" }, "engines": { "node": ">= 12.13.0" @@ -6766,9 +6514,9 @@ } }, "node_modules/webpack-merge": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", - "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.9.0.tgz", + "integrity": "sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==", "dev": true, "dependencies": { "clone-deep": "^4.0.1", @@ -6810,6 +6558,15 @@ "node": ">=0.8.0" } }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -6825,34 +6582,17 @@ "node": ">= 8" } }, - "node_modules/which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "dev": true, - "dependencies": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/which-typed-array": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz", - "integrity": "sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", + "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==", "dev": true, "dependencies": { "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", - "es-abstract": "^1.20.0", "for-each": "^0.3.3", - "has-tostringtag": "^1.0.0", - "is-typed-array": "^1.1.9" + "gopd": "^1.0.1", + "has-tostringtag": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -6862,9 +6602,9 @@ } }, "node_modules/wildcard": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", - "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz", + "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==", "dev": true }, "node_modules/wrappy": { @@ -6946,6 +6686,16 @@ "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-nodejs/-/cardano-message-signing-nodejs-1.0.1.tgz", "integrity": "sha512-PoKh1tQnJX18f8iEr8Jk1KXxKCn9eqaSslMI1pyOJvYRJhQVDLCh0+9YReufjp0oFJIY1ShcrR+4/WnECVZUKQ==" }, + "@emurgo/cardano-serialization-lib-browser": { + "version": "11.4.0", + "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-11.4.0.tgz", + "integrity": "sha512-VWMvLRBFo7MAYh42zledURFs5BpMTWvkP4DzsLNbyJxZlwjDS+bPyehJVyGc116d2gq8NHFmANbfdeuK8ffJ7A==" + }, + "@emurgo/cardano-serialization-lib-nodejs": { + "version": "11.4.0", + "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-11.4.0.tgz", + "integrity": "sha512-dMiofDcqv+IrAITCgWBZmsMLqwv2xImDsJDSrKiYYG1zRKaL8XfMOxx6S0WEnKVj5/343Q5FFURYcSu3iBRNMQ==" + }, "@esbuild/android-arm": { "version": "0.18.11", "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.11.tgz", @@ -7112,9 +6862,9 @@ } }, "@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", "dev": true }, "@jridgewell/set-array": { @@ -7134,19 +6884,19 @@ } }, "@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", "dev": true }, "@jridgewell/trace-mapping": { - "version": "0.3.18", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz", - "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==", + "version": "0.3.19", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz", + "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==", "dev": true, "requires": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "@jspm/core": { @@ -7162,35 +6912,21 @@ "dev": true }, "@mlabs-haskell/cardano-serialization-lib-gc-browser": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.2.tgz", - "integrity": "sha512-hkfXjMy+GD4YMCM3ReXmlaZnWpMufx5NXoyYoyGvEKgQ3kHsArKirBf0YOuhSINyS8emOerXh/0mXPCgz1l3mw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.3.tgz", + "integrity": "sha512-TXzaD8lWqpA5U5KRiW2iDIQzSyddcgd5tn08GE0KpecuBFOQievtnetUIV6+ERFxWUG7R8x9qWWu8syVfP4WRQ==", "requires": { "@emurgo/cardano-serialization-lib-browser": "^11.2.1", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" - }, - "dependencies": { - "@emurgo/cardano-serialization-lib-browser": { - "version": "11.4.0", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-11.4.0.tgz", - "integrity": "sha512-VWMvLRBFo7MAYh42zledURFs5BpMTWvkP4DzsLNbyJxZlwjDS+bPyehJVyGc116d2gq8NHFmANbfdeuK8ffJ7A==" - } } }, "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.2.tgz", - "integrity": "sha512-HD75q8yyhfrrI4zeb2gkoO3wcq0EaVIwiAbyhVQWuniUPgQ6mOr2Lz31vw7YSyY1jksVU69eXngdstgErY6/yw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.3.tgz", + "integrity": "sha512-wjNZH4hwEYYQbjI/vHWmbDRu8Pec40+/ywXWRBUr7mOcE99Zo9u911qeQgdULPp7R4TOhK5alOz+Arp06yCKiQ==", "requires": { "@emurgo/cardano-serialization-lib-nodejs": "^11.4.0", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" - }, - "dependencies": { - "@emurgo/cardano-serialization-lib-nodejs": { - "version": "11.4.0", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-11.4.0.tgz", - "integrity": "sha512-dMiofDcqv+IrAITCgWBZmsMLqwv2xImDsJDSrKiYYG1zRKaL8XfMOxx6S0WEnKVj5/343Q5FFURYcSu3iBRNMQ==" - } } }, "@mlabs-haskell/csl-gc-wrapper": { @@ -7207,28 +6943,28 @@ } }, "@noble/hashes": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.0.tgz", - "integrity": "sha512-ilHEACi9DwqJB0pw7kv+Apvh50jiiSyR/cQ3y4W7lOR5mhvn/50FLUfsnfJz0BDZtl/RR16kXvptiv6q1msYZg==" + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.1.tgz", + "integrity": "sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==" }, "@noble/secp256k1": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.0.tgz", - "integrity": "sha512-kbacwGSsH/CTout0ZnZWxnW1B+jH/7r/WAAKLBtrRJ/+CUH7lgmQzl3GTrQua3SGKWNSDsS6lmjnDpIJ5Dxyaw==" + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz", + "integrity": "sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw==" }, "@textlint/ast-node-types": { - "version": "12.2.2", - "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.2.2.tgz", - "integrity": "sha512-VQAXUSGdmEajHXrMxeM9ZTS8UBJSVB0ghJFHpFfqYKlcDsjIqClSmTprY6521HoCoSLoUIGBxTC3jQyUMJFIWw==", + "version": "12.6.1", + "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.6.1.tgz", + "integrity": "sha512-uzlJ+ZsCAyJm+lBi7j0UeBbj+Oy6w/VWoGJ3iHRHE5eZ8Z4iK66mq+PG/spupmbllLtz77OJbY89BYqgFyjXmA==", "dev": true }, "@textlint/markdown-to-ast": { - "version": "12.2.3", - "resolved": "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.2.3.tgz", - "integrity": "sha512-omZqcZV1Q8t9K0IKvlHNIdTV3SKNaS2P5qkbTjzDj7PuTuvG20JFqL9Naiwwi9ty3NzTzq+W8lLG3H2HgX0WvA==", + "version": "12.6.1", + "resolved": "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.6.1.tgz", + "integrity": "sha512-T0HO+VrU9VbLRiEx/kH4+gwGMHNMIGkp0Pok+p0I33saOOLyhfGvwOKQgvt2qkxzQEV2L5MtGB8EnW4r5d3CqQ==", "dev": true, "requires": { - "@textlint/ast-node-types": "^12.2.2", + "@textlint/ast-node-types": "^12.6.1", "debug": "^4.3.4", "mdast-util-gfm-autolink-literal": "^0.1.3", "remark-footnotes": "^3.0.0", @@ -7237,23 +6973,6 @@ "remark-parse": "^9.0.0", "traverse": "^0.6.7", "unified": "^9.2.2" - }, - "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } } }, "@types/body-parser": { @@ -7285,9 +7004,9 @@ } }, "@types/connect-history-api-fallback": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz", - "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz", + "integrity": "sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==", "dev": true, "requires": { "@types/express-serve-static-core": "*", @@ -7295,9 +7014,9 @@ } }, "@types/eslint": { - "version": "8.4.3", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.3.tgz", - "integrity": "sha512-YP1S7YJRMPs+7KZKDb9G63n8YejIwW9BALq7a5j2+H4yl6iOv9CB29edho+cuFRrvmJbbaH2yiVChKLJVysDGw==", + "version": "8.44.2", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.2.tgz", + "integrity": "sha512-sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg==", "dev": true, "requires": { "@types/estree": "*", @@ -7305,9 +7024,9 @@ } }, "@types/eslint-scope": { - "version": "3.7.3", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz", - "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==", + "version": "3.7.4", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz", + "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==", "dev": true, "requires": { "@types/eslint": "*", @@ -7321,26 +7040,27 @@ "dev": true }, "@types/express": { - "version": "4.17.13", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz", - "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==", + "version": "4.17.17", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz", + "integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==", "dev": true, "requires": { "@types/body-parser": "*", - "@types/express-serve-static-core": "^4.17.18", + "@types/express-serve-static-core": "^4.17.33", "@types/qs": "*", "@types/serve-static": "*" } }, "@types/express-serve-static-core": { - "version": "4.17.29", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.29.tgz", - "integrity": "sha512-uMd++6dMKS32EOuw1Uli3e3BPgdLIXmezcfHv7N4c1s3gkhikBplORPpMq3fuWkxncZN1reb16d5n8yhQ80x7Q==", + "version": "4.17.35", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz", + "integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==", "dev": true, "requires": { "@types/node": "*", "@types/qs": "*", - "@types/range-parser": "*" + "@types/range-parser": "*", + "@types/send": "*" } }, "@types/html-minifier-terser": { @@ -7349,28 +7069,34 @@ "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==", "dev": true }, + "@types/http-errors": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz", + "integrity": "sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==", + "dev": true + }, "@types/http-proxy": { - "version": "1.17.9", - "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz", - "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==", + "version": "1.17.11", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.11.tgz", + "integrity": "sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==", "dev": true, "requires": { "@types/node": "*" } }, "@types/json-schema": { - "version": "7.0.11", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "version": "7.0.12", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz", + "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==", "dev": true }, "@types/mdast": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz", - "integrity": "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==", + "version": "3.0.12", + "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.12.tgz", + "integrity": "sha512-DT+iNIRNX884cx0/Q1ja7NyUPpZuv0KPyL5rGNxm1WC1OtHstl7n4Jb7nk+xacNShQMbczJjt8uFzznpp6kYBg==", "dev": true, "requires": { - "@types/unist": "*" + "@types/unist": "^2" } }, "@types/mime": { @@ -7380,9 +7106,9 @@ "dev": true }, "@types/node": { - "version": "17.0.35", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.35.tgz", - "integrity": "sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==", + "version": "20.4.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.9.tgz", + "integrity": "sha512-8e2HYcg7ohnTUbHk8focoklEQYvemQmu9M/f43DZVx43kHn0tE3BY/6gSDxS7k0SprtS0NHvj+L80cGLnoOUcQ==", "devOptional": true }, "@types/qs": { @@ -7403,6 +7129,16 @@ "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==", "dev": true }, + "@types/send": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz", + "integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==", + "dev": true, + "requires": { + "@types/mime": "^1", + "@types/node": "*" + } + }, "@types/serve-index": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz", @@ -7413,12 +7149,13 @@ } }, "@types/serve-static": { - "version": "1.13.10", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz", - "integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.2.tgz", + "integrity": "sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==", "dev": true, "requires": { - "@types/mime": "^1", + "@types/http-errors": "*", + "@types/mime": "*", "@types/node": "*" } }, @@ -7432,9 +7169,9 @@ } }, "@types/unist": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz", - "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.7.tgz", + "integrity": "sha512-cputDpIbFgLUaGQn6Vqg3/YsJwxUwHLO13v3i5ouxT4lat0khip9AEWxtERujXV9wxIB1EyF97BSJFt6vpdI8g==", "dev": true }, "@types/ws": { @@ -7672,21 +7409,6 @@ "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", "requires": { "debug": "4" - }, - "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - } } }, "ajv": { @@ -7711,9 +7433,9 @@ }, "dependencies": { "ajv": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -7759,9 +7481,9 @@ "dev": true }, "anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, "requires": { "normalize-path": "^3.0.0", @@ -7886,6 +7608,16 @@ "base64-js": "^1.3.1", "ieee754": "^1.1.13" } + }, + "readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } } } }, @@ -7901,9 +7633,9 @@ "dev": true }, "body-parser": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz", - "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==", + "version": "1.20.1", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", + "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", "dev": true, "requires": { "bytes": "3.1.2", @@ -7914,7 +7646,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.10.3", + "qs": "6.11.0", "raw-body": "2.5.1", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -7925,6 +7657,30 @@ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "dev": true + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, + "qs": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "dev": true, + "requires": { + "side-channel": "^1.0.4" + } } } }, @@ -8032,6 +7788,19 @@ "parse-asn1": "^5.1.5", "readable-stream": "^3.6.0", "safe-buffer": "^5.2.0" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } } }, "browserify-zlib": { @@ -8044,15 +7813,15 @@ } }, "browserslist": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.0.tgz", - "integrity": "sha512-UQxE0DIhRB5z/zDz9iA03BOfxaN2+GQdBYH/2WrSIWEUrnpzTPJbhqt+umq6r3acaPRTW1FNTkrcp0PXgtFkvA==", + "version": "4.21.10", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz", + "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001358", - "electron-to-chromium": "^1.4.164", - "node-releases": "^2.0.5", - "update-browserslist-db": "^1.0.0" + "caniuse-lite": "^1.0.30001517", + "electron-to-chromium": "^1.4.477", + "node-releases": "^2.0.13", + "update-browserslist-db": "^1.0.11" } }, "buffer": { @@ -8123,9 +7892,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001358", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001358.tgz", - "integrity": "sha512-hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw==", + "version": "1.0.30001519", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz", + "integrity": "sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==", "dev": true }, "ccount": { @@ -8190,9 +7959,9 @@ } }, "clean-css": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.0.tgz", - "integrity": "sha512-YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz", + "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==", "dev": true, "requires": { "source-map": "~0.6.0" @@ -8210,9 +7979,9 @@ } }, "colorette": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz", - "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", "dev": true }, "commander": { @@ -8245,6 +8014,21 @@ "vary": "~1.1.2" }, "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -8286,9 +8070,9 @@ } }, "content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", "dev": true }, "cookie": { @@ -8412,12 +8196,11 @@ "dev": true }, "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "requires": { - "ms": "2.0.0" + "ms": "2.1.2" } }, "default-gateway": { @@ -8436,9 +8219,9 @@ "dev": true }, "define-properties": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", - "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", + "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", "dev": true, "requires": { "has-property-descriptors": "^1.0.0", @@ -8452,9 +8235,9 @@ "dev": true }, "des.js": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", - "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz", + "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==", "dev": true, "requires": { "inherits": "^2.0.1", @@ -8474,9 +8257,9 @@ "dev": true }, "devtools-protocol": { - "version": "0.0.1011705", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1011705.tgz", - "integrity": "sha512-OKvTvu9n3swmgYshvsyVHYX0+aPzCoYUnyXUacfQMmFtBtBKewV/gT4I9jkAbpTqtTi2E4S9MXLlvzBDUlqg0Q==" + "version": "0.0.1019158", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1019158.tgz", + "integrity": "sha512-wvq+KscQ7/6spEV7czhnZc9RM/woz1AY+/Vpd8/h2HFMwJSdTliu7f/yr1A6vDdJfKICZsShqsYpEQbdhg8AFQ==" }, "diffie-hellman": { "version": "5.0.3", @@ -8524,26 +8307,6 @@ "minimist": "^1.2.6", "underscore": "^1.13.2", "update-section": "^0.3.3" - }, - "dependencies": { - "entities": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz", - "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==", - "dev": true - }, - "htmlparser2": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz", - "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==", - "dev": true, - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.2", - "domutils": "^2.8.0", - "entities": "^3.0.1" - } - } } }, "dom-converter": { @@ -8564,6 +8327,14 @@ "domelementtype": "^2.0.1", "domhandler": "^4.2.0", "entities": "^2.0.0" + }, + "dependencies": { + "entities": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "dev": true + } } }, "domain-browser": { @@ -8615,9 +8386,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.4.167", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.167.tgz", - "integrity": "sha512-lPHuHXBwpkr4RcfaZBKm6TKOWG/1N9mVggUpP4fY3l1JIUU2x4fkM8928smYdZ5lF+6KCTAxo1aK9JmqT+X71Q==", + "version": "1.4.490", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.490.tgz", + "integrity": "sha512-6s7NVJz+sATdYnIwhdshx/N/9O6rvMxmhVoDSDFdj6iA45gHR8EQje70+RYsF4GeB+k0IeNSBnP7yG9ZXJFr7A==", "dev": true }, "elliptic": { @@ -8674,9 +8445,9 @@ } }, "entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz", + "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==", "dev": true }, "envinfo": { @@ -8685,54 +8456,12 @@ "integrity": "sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==", "dev": true }, - "es-abstract": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz", - "integrity": "sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.1.1", - "get-symbol-description": "^1.0.0", - "has": "^1.0.3", - "has-property-descriptors": "^1.0.0", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.3", - "is-callable": "^1.2.4", - "is-negative-zero": "^2.0.2", - "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.2", - "is-string": "^1.0.7", - "is-weakref": "^1.0.2", - "object-inspect": "^1.12.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.2", - "regexp.prototype.flags": "^1.4.3", - "string.prototype.trimend": "^1.0.5", - "string.prototype.trimstart": "^1.0.5", - "unbox-primitive": "^1.0.2" - } - }, "es-module-lexer": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz", "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==", "dev": true }, - "es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, - "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - } - }, "es6-object-assign": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz", @@ -8885,17 +8614,25 @@ "onetime": "^5.1.2", "signal-exit": "^3.0.3", "strip-final-newline": "^2.0.0" + }, + "dependencies": { + "get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true + } } }, "express": { - "version": "4.18.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz", - "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==", + "version": "4.18.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", + "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", "dev": true, "requires": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.0", + "body-parser": "1.20.1", "content-disposition": "0.5.4", "content-type": "~1.0.4", "cookie": "0.5.0", @@ -8914,7 +8651,7 @@ "parseurl": "~1.3.3", "path-to-regexp": "0.1.7", "proxy-addr": "~2.0.7", - "qs": "6.10.3", + "qs": "6.11.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", "send": "0.18.0", @@ -8931,6 +8668,30 @@ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", "dev": true + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, + "qs": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "dev": true, + "requires": { + "side-channel": "^1.0.4" + } } } }, @@ -8949,29 +8710,6 @@ "debug": "^4.1.1", "get-stream": "^5.1.0", "yauzl": "^2.10.0" - }, - "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "requires": { - "ms": "2.1.2" - } - }, - "get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "requires": { - "pump": "^3.0.0" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - } } }, "fast-deep-equal": { @@ -8987,9 +8725,9 @@ "dev": true }, "fastest-levenshtein": { - "version": "1.0.14", - "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.14.tgz", - "integrity": "sha512-tFfWHjnuUfKE186Tfgr+jtaFc0mZTApEgKDOeyN+FwOqRkO/zK/3h1AiRd8u8CY53owL3CUmGr/oI9p/RdyLTA==", + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", + "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", "dev": true }, "fault": { @@ -9046,6 +8784,23 @@ "parseurl": "~1.3.3", "statuses": "2.0.1", "unpipe": "~1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + } } }, "find-up": { @@ -9058,9 +8813,9 @@ } }, "follow-redirects": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", - "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", "dev": true }, "for-each": { @@ -9096,9 +8851,9 @@ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" }, "fs-monkey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz", - "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.4.tgz", + "integrity": "sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==", "dev": true }, "fs.realpath": { @@ -9119,49 +8874,24 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, - "function.prototype.name": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", - "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" - } - }, - "functions-have-names": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", - "dev": true - }, "get-intrinsic": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", + "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", "dev": true, "requires": { "function-bind": "^1.1.1", "has": "^1.0.3", - "has-symbols": "^1.0.1" + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3" } }, "get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true - }, - "get-symbol-description": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", - "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", - "dev": true, + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "requires": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" + "pump": "^3.0.0" } }, "glob": { @@ -9192,10 +8922,19 @@ "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", "dev": true }, + "gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dev": true, + "requires": { + "get-intrinsic": "^1.1.3" + } + }, "graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true }, "handle-thing": { @@ -9213,12 +8952,6 @@ "function-bind": "^1.1.1" } }, - "has-bigints": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", - "dev": true - }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -9234,6 +8967,12 @@ "get-intrinsic": "^1.1.1" } }, + "has-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "dev": true + }, "has-symbols": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", @@ -9258,6 +8997,19 @@ "inherits": "^2.0.4", "readable-stream": "^3.6.0", "safe-buffer": "^5.2.0" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } } }, "hash.js": { @@ -9300,9 +9052,9 @@ }, "dependencies": { "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, "requires": { "core-util-is": "~1.0.0", @@ -9332,9 +9084,9 @@ } }, "html-entities": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz", - "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz", + "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==", "dev": true }, "html-minifier-terser": { @@ -9366,15 +9118,15 @@ } }, "htmlparser2": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", - "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz", + "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==", "dev": true, "requires": { "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", - "domutils": "^2.5.2", - "entities": "^2.0.0" + "domhandler": "^4.2.2", + "domutils": "^2.8.0", + "entities": "^3.0.1" } }, "http-deceiver": { @@ -9397,9 +9149,9 @@ } }, "http-parser-js": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz", - "integrity": "sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA==", + "version": "0.5.8", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz", + "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==", "dev": true }, "http-proxy": { @@ -9424,6 +9176,14 @@ "is-glob": "^4.0.1", "is-plain-obj": "^3.0.0", "micromatch": "^4.0.2" + }, + "dependencies": { + "is-plain-obj": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", + "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", + "dev": true + } } }, "https-browserify": { @@ -9439,21 +9199,6 @@ "requires": { "agent-base": "6", "debug": "4" - }, - "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - } } }, "human-signals": { @@ -9501,21 +9246,10 @@ "wrappy": "1" } }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "internal-slot": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz", - "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==", - "dev": true, - "requires": { - "get-intrinsic": "^1.1.0", - "has": "^1.0.3", - "side-channel": "^1.0.4" - } + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "interpret": { "version": "3.1.1", @@ -9524,9 +9258,9 @@ "dev": true }, "ipaddr.js": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz", - "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz", + "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==", "dev": true }, "is-alphabetical": { @@ -9555,15 +9289,6 @@ "has-tostringtag": "^1.0.0" } }, - "is-bigint": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", - "dev": true, - "requires": { - "has-bigints": "^1.0.1" - } - }, "is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -9573,16 +9298,6 @@ "binary-extensions": "^2.0.0" } }, - "is-boolean-object": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - } - }, "is-buffer": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", @@ -9590,29 +9305,20 @@ "dev": true }, "is-callable": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", - "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", "dev": true }, "is-core-module": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz", - "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==", + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", + "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", "dev": true, "requires": { "has": "^1.0.3" } }, - "is-date-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", - "dev": true, - "requires": { - "has-tostringtag": "^1.0.0" - } - }, "is-decimal": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz", @@ -9665,31 +9371,16 @@ "define-properties": "^1.1.3" } }, - "is-negative-zero": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", - "dev": true - }, "is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true }, - "is-number-object": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", - "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", - "dev": true, - "requires": { - "has-tostringtag": "^1.0.0" - } - }, "is-plain-obj": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", - "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", "dev": true }, "is-plain-object": { @@ -9701,69 +9392,19 @@ "isobject": "^3.0.1" } }, - "is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - } - }, - "is-shared-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", - "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2" - } - }, "is-stream": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "dev": true }, - "is-string": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", - "dev": true, - "requires": { - "has-tostringtag": "^1.0.0" - } - }, - "is-symbol": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", - "dev": true, - "requires": { - "has-symbols": "^1.0.2" - } - }, "is-typed-array": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz", - "integrity": "sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==", - "dev": true, - "requires": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "es-abstract": "^1.20.0", - "for-each": "^0.3.3", - "has-tostringtag": "^1.0.0" - } - }, - "is-weakref": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", - "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", + "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", "dev": true, "requires": { - "call-bind": "^1.0.2" + "which-typed-array": "^1.1.11" } }, "is-wsl": { @@ -10014,12 +9655,12 @@ "dev": true }, "memfs": { - "version": "3.4.6", - "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.6.tgz", - "integrity": "sha512-rH9mjopto6Wkr7RFuH9l9dk3qb2XGOcYKr7xMhaYqfzuJqOqhRrcFvfD7JMuPj6SLmPreh5+6eAuv36NFAU+Mw==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz", + "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==", "dev": true, "requires": { - "fs-monkey": "^1.0.3" + "fs-monkey": "^1.0.4" } }, "merge-descriptors": { @@ -10048,23 +9689,6 @@ "requires": { "debug": "^4.0.0", "parse-entities": "^2.0.0" - }, - "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } } }, "micromark-extension-footnote": { @@ -10217,9 +9841,9 @@ } }, "minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", "dev": true }, "mkdirp-classic": { @@ -10228,10 +9852,9 @@ "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" }, "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "multicast-dns": { "version": "7.2.5", @@ -10271,27 +9894,6 @@ "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", "requires": { "whatwg-url": "^5.0.0" - }, - "dependencies": { - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - } } }, "node-forge": { @@ -10301,9 +9903,9 @@ "dev": true }, "node-gyp-build": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.4.0.tgz", - "integrity": "sha512-amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ==" + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz", + "integrity": "sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==" }, "node-polyfill-webpack-plugin": { "version": "2.0.1", @@ -10336,27 +9938,12 @@ "url": "^0.11.0", "util": "^0.12.4", "vm-browserify": "^1.1.2" - }, - "dependencies": { - "readable-stream": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.2.tgz", - "integrity": "sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==", - "dev": true, - "requires": { - "abort-controller": "^3.0.0", - "buffer": "^6.0.3", - "events": "^3.3.0", - "process": "^0.11.10", - "string_decoder": "^1.3.0" - } - } } }, "node-releases": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz", - "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==", + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", + "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", "dev": true }, "normalize-path": { @@ -10384,9 +9971,9 @@ } }, "object-inspect": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.1.tgz", - "integrity": "sha512-Y/jF6vnvEtOPGiKD1+q+X0CiUYRQtEHp89MLLUJ7TUivtH8Ugn2+3A7Rynqk7BRsAoqeOQWnFnjpDrKSxDgIGA==", + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", "dev": true }, "object-is": { @@ -10405,18 +9992,6 @@ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "dev": true }, - "object.assign": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "has-symbols": "^1.0.1", - "object-keys": "^1.1.1" - } - }, "obuf": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", @@ -10456,9 +10031,9 @@ } }, "open": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz", - "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", + "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", "dev": true, "requires": { "define-lazy-prop": "^2.0.0", @@ -10716,19 +10291,19 @@ } }, "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", "dev": true }, "puppeteer-core": { - "version": "15.3.2", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-15.3.2.tgz", - "integrity": "sha512-Fmca9UzXmJkRrvGBgUmrffGD2BlulUTfsVefV1+vqfNm4PnlZ/U1bfD6X8XQ0nftyyg520tmSKd81yH3Z2tszg==", + "version": "15.5.0", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-15.5.0.tgz", + "integrity": "sha512-5Q8EmF++MARczJD1JcRehVePlctxGG2TFHSxdCV8NqPOk44/cMySmZw2nETn+lwUOyp0L9afosMFTnT4KgmWgw==", "requires": { "cross-fetch": "3.1.5", "debug": "4.3.4", - "devtools-protocol": "0.0.1011705", + "devtools-protocol": "0.0.1019158", "extract-zip": "2.0.1", "https-proxy-agent": "5.0.1", "pkg-dir": "4.2.0", @@ -10740,19 +10315,6 @@ "ws": "8.8.0" }, "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, "ws": { "version": "8.8.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz", @@ -10762,20 +10324,14 @@ } }, "qs": { - "version": "6.10.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz", - "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==", + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", + "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==", "dev": true, "requires": { "side-channel": "^1.0.4" } }, - "querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==", - "dev": true - }, "querystring-es3": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", @@ -10828,13 +10384,16 @@ } }, "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.2.tgz", + "integrity": "sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==", + "dev": true, "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "abort-controller": "^3.0.0", + "buffer": "^6.0.3", + "events": "^3.3.0", + "process": "^0.11.10", + "string_decoder": "^1.3.0" } }, "readdirp": { @@ -10860,17 +10419,6 @@ "resolved": "https://registry.npmjs.org/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz", "integrity": "sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng==" }, - "regexp.prototype.flags": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", - "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "functions-have-names": "^1.2.2" - } - }, "relateurl": { "version": "0.2.7", "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", @@ -10927,6 +10475,26 @@ "htmlparser2": "^6.1.0", "lodash": "^4.17.21", "strip-ansi": "^6.0.1" + }, + "dependencies": { + "entities": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "dev": true + }, + "htmlparser2": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", + "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", + "dev": true, + "requires": { + "domelementtype": "^2.0.1", + "domhandler": "^4.0.0", + "domutils": "^2.5.2", + "entities": "^2.0.0" + } + } } }, "repeat-string": { @@ -10948,12 +10516,12 @@ "dev": true }, "resolve": { - "version": "1.22.2", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz", - "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==", + "version": "1.22.4", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz", + "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==", "dev": true, "requires": { - "is-core-module": "^2.11.0", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" } @@ -11055,6 +10623,23 @@ "statuses": "2.0.1" }, "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + } + } + }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -11087,6 +10672,15 @@ "parseurl": "~1.3.2" }, "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -11111,6 +10705,12 @@ "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", "dev": true }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, "setprototypeof": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", @@ -11244,23 +10844,6 @@ "http-deceiver": "^1.2.7", "select-hose": "^2.0.0", "spdy-transport": "^3.0.0" - }, - "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } } }, "spdy-transport": { @@ -11277,20 +10860,16 @@ "wbuf": "^1.7.3" }, "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, "requires": { - "ms": "2.1.2" + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true } } }, @@ -11308,6 +10887,19 @@ "requires": { "inherits": "~2.0.4", "readable-stream": "^3.5.0" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } } }, "stream-http": { @@ -11320,6 +10912,19 @@ "inherits": "^2.0.4", "readable-stream": "^3.6.0", "xtend": "^4.0.2" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } } }, "string_decoder": { @@ -11330,28 +10935,6 @@ "safe-buffer": "~5.2.0" } }, - "string.prototype.trimend": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz", - "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.19.5" - } - }, - "string.prototype.trimstart": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz", - "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.19.5" - } - }, "strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -11409,12 +10992,24 @@ "fs-constants": "^1.0.0", "inherits": "^2.0.3", "readable-stream": "^3.1.1" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } } }, "terser": { - "version": "5.18.2", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.18.2.tgz", - "integrity": "sha512-Ah19JS86ypbJzTzvUCX7KOsEIhDaRONungA4aYBjEP3JZRf4ocuDzTg4QWZnPn9DEMiMYGJPiSOy7aykoCc70w==", + "version": "5.19.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz", + "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==", "dev": true, "requires": { "@jridgewell/source-map": "^0.3.3", @@ -11479,6 +11074,11 @@ "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "dev": true }, + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, "traverse": { "version": "0.6.7", "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.7.tgz", @@ -11492,9 +11092,9 @@ "dev": true }, "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", + "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", "dev": true }, "tty-browserify": { @@ -11519,18 +11119,6 @@ "mime-types": "~2.1.24" } }, - "unbox-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", - "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "has-bigints": "^1.0.2", - "has-symbols": "^1.0.3", - "which-boxed-primitive": "^1.0.2" - } - }, "unbzip2-stream": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", @@ -11569,14 +11157,6 @@ "is-plain-obj": "^2.0.0", "trough": "^1.0.0", "vfile": "^4.0.0" - }, - "dependencies": { - "is-plain-obj": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", - "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", - "dev": true - } } }, "uniqid": { @@ -11616,9 +11196,9 @@ "dev": true }, "update-browserslist-db": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.3.tgz", - "integrity": "sha512-ufSazemeh9Gty0qiWtoRpJ9F5Q5W3xdIPm1UZQqYQv/q0Nyb9EMHUB2lu+O9x1re9WsorpMAUu4Y6Lxcs5n+XQ==", + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", + "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", "dev": true, "requires": { "escalade": "^3.1.1", @@ -11641,34 +11221,33 @@ } }, "url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==", + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.1.tgz", + "integrity": "sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==", "dev": true, "requires": { - "punycode": "1.3.2", - "querystring": "0.2.0" + "punycode": "^1.4.1", + "qs": "^6.11.0" }, "dependencies": { "punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", "dev": true } } }, "util": { - "version": "0.12.4", - "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz", - "integrity": "sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==", + "version": "0.12.5", + "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", + "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==", "dev": true, "requires": { "inherits": "^2.0.3", "is-arguments": "^1.0.4", "is-generator-function": "^1.0.7", "is-typed-array": "^1.1.3", - "safe-buffer": "^5.1.2", "which-typed-array": "^1.1.2" } }, @@ -11748,6 +11327,11 @@ "minimalistic-assert": "^1.0.0" } }, + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, "webpack": { "version": "5.88.1", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.1.tgz", @@ -11823,9 +11407,9 @@ }, "dependencies": { "ajv": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -11850,15 +11434,15 @@ "dev": true }, "schema-utils": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", - "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", + "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", "dev": true, "requires": { "@types/json-schema": "^7.0.9", - "ajv": "^8.8.0", + "ajv": "^8.9.0", "ajv-formats": "^2.1.1", - "ajv-keywords": "^5.0.0" + "ajv-keywords": "^5.1.0" } } } @@ -11902,9 +11486,9 @@ }, "dependencies": { "ajv": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -11929,15 +11513,15 @@ "dev": true }, "schema-utils": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", - "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", + "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", "dev": true, "requires": { "@types/json-schema": "^7.0.9", - "ajv": "^8.8.0", + "ajv": "^8.9.0", "ajv-formats": "^2.1.1", - "ajv-keywords": "^5.0.0" + "ajv-keywords": "^5.1.0" } }, "ws": { @@ -11950,9 +11534,9 @@ } }, "webpack-merge": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", - "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.9.0.tgz", + "integrity": "sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==", "dev": true, "requires": { "clone-deep": "^4.0.1", @@ -11982,6 +11566,15 @@ "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", "dev": true }, + "whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "requires": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -11991,37 +11584,23 @@ "isexe": "^2.0.0" } }, - "which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "dev": true, - "requires": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" - } - }, "which-typed-array": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz", - "integrity": "sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", + "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==", "dev": true, "requires": { "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", - "es-abstract": "^1.20.0", "for-each": "^0.3.3", - "has-tostringtag": "^1.0.0", - "is-typed-array": "^1.1.9" + "gopd": "^1.0.1", + "has-tostringtag": "^1.0.0" } }, "wildcard": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", - "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz", + "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==", "dev": true }, "wrappy": { diff --git a/package.json b/package.json index 2fb7fd7274..aa6ebcf260 100755 --- a/package.json +++ b/package.json @@ -20,12 +20,12 @@ "unit-test": "spago run --main Test.Ctl.Unit", "plutip-test": "spago run --main Test.Ctl.Plutip", "staking-test": "spago run --main Test.Ctl.Plutip.Staking", - "e2e-serve": "spago bundle-module -m Ctl.Examples.ByUrl --to output.js && BROWSER_RUNTIME=1 webpack-dev-server --progress", - "e2e-test": "source ./test/e2e.env && spago test --main Test.Ctl.E2E -a 'e2e-test run'", - "e2e-test-debug": "source ./test/e2e.env && spago test --main Test.Ctl.E2E -a 'e2e-test run --no-headless'", - "e2e-browser": "source ./test/e2e.env && spago run --main Test.Ctl.E2E -a 'e2e-test browser'", - "e2e-pack-settings": "source ./test/e2e.env && spago run --main Test.Ctl.E2E -a 'e2e-test pack'", - "e2e-unpack-settings": "source ./test/e2e.env && spago run --main Test.Ctl.E2E -a 'e2e-test unpack'", + "e2e-serve": "spago bundle-module -m Ctl.Examples.ByUrl --to output.js && make webpack-serve", + "e2e-test": "source ./test/e2e.env && spago test --main Test.Ctl.E2E -a 'run'", + "e2e-test-debug": "source ./test/e2e.env && spago test --main Test.Ctl.E2E -a 'run --no-headless'", + "e2e-browser": "source ./test/e2e.env && spago run --main Test.Ctl.E2E -a 'browser'", + "e2e-pack-settings": "source ./test/e2e.env && spago run --main Test.Ctl.E2E -a 'pack'", + "e2e-unpack-settings": "source ./test/e2e.env && spago run --main Test.Ctl.E2E -a 'unpack'", "esbuild-bundle": "make esbuild-bundle", "esbuild-serve": "make esbuild-serve", "webpack-bundle": "make webpack-bundle", @@ -36,8 +36,8 @@ "dependencies": { "@emurgo/cardano-message-signing-browser": "1.0.1", "@emurgo/cardano-message-signing-nodejs": "1.0.1", - "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.2", - "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.2", + "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.3", + "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.3", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1", "@mlabs-haskell/json-bigint": " 1.0.0", "@noble/secp256k1": "^1.7.0", diff --git a/packages.dhall b/packages.dhall index e2e7a9fcd6..e6d85cbe5a 100644 --- a/packages.dhall +++ b/packages.dhall @@ -233,7 +233,7 @@ let additions = , "node-fs-aff" ] , repo = "https://github.com/mlabs-haskell/purescript-toppokki" - , version = "f90f92f0ddf0eecc73705c1675db37918d18cbcb" + , version = "db0d3c12348da576b28a18782df4ae5d7cc44408" } , noble-secp256k1 = { dependencies = diff --git a/spago-packages.nix b/spago-packages.nix index fde48e59dc..e7d589dab4 100644 --- a/spago-packages.nix +++ b/spago-packages.nix @@ -1363,11 +1363,11 @@ let "toppokki" = pkgs.stdenv.mkDerivation { name = "toppokki"; - version = "f90f92f0ddf0eecc73705c1675db37918d18cbcb"; + version = "db0d3c12348da576b28a18782df4ae5d7cc44408"; src = pkgs.fetchgit { url = "https://github.com/mlabs-haskell/purescript-toppokki"; - rev = "f90f92f0ddf0eecc73705c1675db37918d18cbcb"; - sha256 = "1kmqajf7n5l9lk4amyma3rhm60llrgamap5hi21kkqs52xm3fr2q"; + rev = "db0d3c12348da576b28a18782df4ae5d7cc44408"; + sha256 = "1ck1g9mrm8kclmzkrg9hbm97gbvjbk0dcqnzby0c38pc2dqa7xwf"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; diff --git a/templates/ctl-scaffold/esbuild/config.js b/templates/ctl-scaffold/esbuild/config.js index 077500fe57..ca6f2e5420 100755 --- a/templates/ctl-scaffold/esbuild/config.js +++ b/templates/ctl-scaffold/esbuild/config.js @@ -6,7 +6,6 @@ export const buildOptions = { outdir: "dist/esbuild", define: { BROWSER_RUNTIME: process.env.BROWSER_RUNTIME, - SCRIPTS_DIR: '"scripts"', }, plugins: [ polyfillNode({ diff --git a/templates/ctl-scaffold/index.html b/templates/ctl-scaffold/index.html index 443f25804f..b8c10982c0 100644 --- a/templates/ctl-scaffold/index.html +++ b/templates/ctl-scaffold/index.html @@ -5,6 +5,67 @@ + + diff --git a/templates/ctl-scaffold/package-lock.json b/templates/ctl-scaffold/package-lock.json index d25107c715..a3ce0e63a9 100644 --- a/templates/ctl-scaffold/package-lock.json +++ b/templates/ctl-scaffold/package-lock.json @@ -11,8 +11,8 @@ "dependencies": { "@emurgo/cardano-message-signing-browser": "1.0.1", "@emurgo/cardano-message-signing-nodejs": "1.0.1", - "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.2", - "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.2", + "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.3", + "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.3", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1", "@mlabs-haskell/json-bigint": " 1.0.0", "@noble/secp256k1": "^1.7.0", @@ -33,13 +33,15 @@ }, "devDependencies": { "buffer": "6.0.3", + "doctoc": "^2.2.1", "esbuild": "0.18.11", "esbuild-plugin-polyfill-node": "^0.3.0", "esbuild-plugin-wasm": "^1.1.0", - "html-webpack-plugin": "5.5.0", - "webpack": "5.67.0", - "webpack-cli": "4.10", - "webpack-dev-server": "4.7.4" + "html-webpack-plugin": "5.5.3", + "node-polyfill-webpack-plugin": "2.0.1", + "webpack": "5.88.1", + "webpack-cli": "5.1.4", + "webpack-dev-server": "4.15.1" } }, "node_modules/@discoveryjs/json-ext": { @@ -62,9 +64,9 @@ "integrity": "sha512-PoKh1tQnJX18f8iEr8Jk1KXxKCn9eqaSslMI1pyOJvYRJhQVDLCh0+9YReufjp0oFJIY1ShcrR+4/WnECVZUKQ==" }, "node_modules/@emurgo/cardano-serialization-lib-browser": { - "version": "11.2.1", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-11.2.1.tgz", - "integrity": "sha512-J9Pmeta7y1GYnMCxtb3GnGCRw6zk1wiQ8EdCYQRn/Yqa/ss1zoBjd41euVi02Eb58aLuOJS81nNU+BcMLGXvUg==" + "version": "11.4.0", + "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-11.4.0.tgz", + "integrity": "sha512-VWMvLRBFo7MAYh42zledURFs5BpMTWvkP4DzsLNbyJxZlwjDS+bPyehJVyGc116d2gq8NHFmANbfdeuK8ffJ7A==" }, "node_modules/@emurgo/cardano-serialization-lib-nodejs": { "version": "11.4.0", @@ -424,9 +426,9 @@ } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", "dev": true, "dependencies": { "@jridgewell/set-array": "^1.0.1", @@ -438,9 +440,9 @@ } }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz", - "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", "dev": true, "engines": { "node": ">=6.0.0" @@ -456,9 +458,9 @@ } }, "node_modules/@jridgewell/source-map": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", - "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz", + "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==", "dev": true, "dependencies": { "@jridgewell/gen-mapping": "^0.3.0", @@ -466,19 +468,19 @@ } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.13", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz", - "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==", + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.13", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz", - "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==", + "version": "0.3.19", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz", + "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==", "dev": true, "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "node_modules/@jspm/core": { @@ -487,19 +489,25 @@ "integrity": "sha512-Lg3PnLp0QXpxwLIAuuJboLeRaIhrgJjeuh797QADg3xz8wGLugQOS5DpsE8A6i6Adgzf+bacllkKZG3J0tGfDw==", "dev": true }, + "node_modules/@leichtgewicht/ip-codec": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz", + "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==", + "dev": true + }, "node_modules/@mlabs-haskell/cardano-serialization-lib-gc-browser": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.2.tgz", - "integrity": "sha512-hkfXjMy+GD4YMCM3ReXmlaZnWpMufx5NXoyYoyGvEKgQ3kHsArKirBf0YOuhSINyS8emOerXh/0mXPCgz1l3mw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.3.tgz", + "integrity": "sha512-TXzaD8lWqpA5U5KRiW2iDIQzSyddcgd5tn08GE0KpecuBFOQievtnetUIV6+ERFxWUG7R8x9qWWu8syVfP4WRQ==", "dependencies": { "@emurgo/cardano-serialization-lib-browser": "^11.2.1", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" } }, "node_modules/@mlabs-haskell/cardano-serialization-lib-gc-nodejs": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.2.tgz", - "integrity": "sha512-HD75q8yyhfrrI4zeb2gkoO3wcq0EaVIwiAbyhVQWuniUPgQ6mOr2Lz31vw7YSyY1jksVU69eXngdstgErY6/yw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.3.tgz", + "integrity": "sha512-wjNZH4hwEYYQbjI/vHWmbDRu8Pec40+/ywXWRBUr7mOcE99Zo9u911qeQgdULPp7R4TOhK5alOz+Arp06yCKiQ==", "dependencies": { "@emurgo/cardano-serialization-lib-nodejs": "^11.4.0", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" @@ -519,20 +527,20 @@ } }, "node_modules/@noble/hashes": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.0.tgz", - "integrity": "sha512-ilHEACi9DwqJB0pw7kv+Apvh50jiiSyR/cQ3y4W7lOR5mhvn/50FLUfsnfJz0BDZtl/RR16kXvptiv6q1msYZg==", - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ] + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.1.tgz", + "integrity": "sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==", + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } }, "node_modules/@noble/secp256k1": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.0.tgz", - "integrity": "sha512-kbacwGSsH/CTout0ZnZWxnW1B+jH/7r/WAAKLBtrRJ/+CUH7lgmQzl3GTrQua3SGKWNSDsS6lmjnDpIJ5Dxyaw==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz", + "integrity": "sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw==", "funding": [ { "type": "individual", @@ -540,39 +548,27 @@ } ] }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, - "engines": { - "node": ">= 8" - } + "node_modules/@textlint/ast-node-types": { + "version": "12.6.1", + "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.6.1.tgz", + "integrity": "sha512-uzlJ+ZsCAyJm+lBi7j0UeBbj+Oy6w/VWoGJ3iHRHE5eZ8Z4iK66mq+PG/spupmbllLtz77OJbY89BYqgFyjXmA==", + "dev": true }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "node_modules/@textlint/markdown-to-ast": { + "version": "12.6.1", + "resolved": "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.6.1.tgz", + "integrity": "sha512-T0HO+VrU9VbLRiEx/kH4+gwGMHNMIGkp0Pok+p0I33saOOLyhfGvwOKQgvt2qkxzQEV2L5MtGB8EnW4r5d3CqQ==", "dev": true, "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" + "@textlint/ast-node-types": "^12.6.1", + "debug": "^4.3.4", + "mdast-util-gfm-autolink-literal": "^0.1.3", + "remark-footnotes": "^3.0.0", + "remark-frontmatter": "^3.0.0", + "remark-gfm": "^1.0.0", + "remark-parse": "^9.0.0", + "traverse": "^0.6.7", + "unified": "^9.2.2" } }, "node_modules/@types/body-parser": { @@ -604,9 +600,9 @@ } }, "node_modules/@types/connect-history-api-fallback": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz", - "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz", + "integrity": "sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==", "dev": true, "dependencies": { "@types/express-serve-static-core": "*", @@ -614,9 +610,9 @@ } }, "node_modules/@types/eslint": { - "version": "8.4.3", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.3.tgz", - "integrity": "sha512-YP1S7YJRMPs+7KZKDb9G63n8YejIwW9BALq7a5j2+H4yl6iOv9CB29edho+cuFRrvmJbbaH2yiVChKLJVysDGw==", + "version": "8.44.2", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.2.tgz", + "integrity": "sha512-sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg==", "dev": true, "dependencies": { "@types/estree": "*", @@ -624,9 +620,9 @@ } }, "node_modules/@types/eslint-scope": { - "version": "3.7.3", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz", - "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==", + "version": "3.7.4", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz", + "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==", "dev": true, "dependencies": { "@types/eslint": "*", @@ -634,32 +630,33 @@ } }, "node_modules/@types/estree": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz", - "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz", + "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==", "dev": true }, "node_modules/@types/express": { - "version": "4.17.13", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz", - "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==", + "version": "4.17.17", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz", + "integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==", "dev": true, "dependencies": { "@types/body-parser": "*", - "@types/express-serve-static-core": "^4.17.18", + "@types/express-serve-static-core": "^4.17.33", "@types/qs": "*", "@types/serve-static": "*" } }, "node_modules/@types/express-serve-static-core": { - "version": "4.17.29", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.29.tgz", - "integrity": "sha512-uMd++6dMKS32EOuw1Uli3e3BPgdLIXmezcfHv7N4c1s3gkhikBplORPpMq3fuWkxncZN1reb16d5n8yhQ80x7Q==", + "version": "4.17.35", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz", + "integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==", "dev": true, "dependencies": { "@types/node": "*", "@types/qs": "*", - "@types/range-parser": "*" + "@types/range-parser": "*", + "@types/send": "*" } }, "node_modules/@types/html-minifier-terser": { @@ -668,21 +665,36 @@ "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==", "dev": true }, + "node_modules/@types/http-errors": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz", + "integrity": "sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==", + "dev": true + }, "node_modules/@types/http-proxy": { - "version": "1.17.9", - "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz", - "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==", + "version": "1.17.11", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.11.tgz", + "integrity": "sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/json-schema": { - "version": "7.0.11", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "version": "7.0.12", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz", + "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==", "dev": true }, + "node_modules/@types/mdast": { + "version": "3.0.12", + "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.12.tgz", + "integrity": "sha512-DT+iNIRNX884cx0/Q1ja7NyUPpZuv0KPyL5rGNxm1WC1OtHstl7n4Jb7nk+xacNShQMbczJjt8uFzznpp6kYBg==", + "dev": true, + "dependencies": { + "@types/unist": "^2" + } + }, "node_modules/@types/mime": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", @@ -690,9 +702,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "17.0.35", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.35.tgz", - "integrity": "sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==", + "version": "20.4.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.9.tgz", + "integrity": "sha512-8e2HYcg7ohnTUbHk8focoklEQYvemQmu9M/f43DZVx43kHn0tE3BY/6gSDxS7k0SprtS0NHvj+L80cGLnoOUcQ==", "devOptional": true }, "node_modules/@types/qs": { @@ -713,6 +725,16 @@ "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==", "dev": true }, + "node_modules/@types/send": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz", + "integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==", + "dev": true, + "dependencies": { + "@types/mime": "^1", + "@types/node": "*" + } + }, "node_modules/@types/serve-index": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz", @@ -723,12 +745,13 @@ } }, "node_modules/@types/serve-static": { - "version": "1.13.10", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz", - "integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.2.tgz", + "integrity": "sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==", "dev": true, "dependencies": { - "@types/mime": "^1", + "@types/http-errors": "*", + "@types/mime": "*", "@types/node": "*" } }, @@ -741,10 +764,16 @@ "@types/node": "*" } }, + "node_modules/@types/unist": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.7.tgz", + "integrity": "sha512-cputDpIbFgLUaGQn6Vqg3/YsJwxUwHLO13v3i5ouxT4lat0khip9AEWxtERujXV9wxIB1EyF97BSJFt6vpdI8g==", + "dev": true + }, "node_modules/@types/ws": { - "version": "8.5.3", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz", - "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==", + "version": "8.5.5", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz", + "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==", "dev": true, "dependencies": { "@types/node": "*" @@ -760,180 +789,188 @@ } }, "node_modules/@webassemblyjs/ast": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", - "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", + "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", "dev": true, "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1" + "@webassemblyjs/helper-numbers": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6" } }, "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", - "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", + "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", "dev": true }, "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", - "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", + "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", "dev": true }, "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", - "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", + "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==", "dev": true }, "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", - "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", + "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", "dev": true, "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", + "@webassemblyjs/floating-point-hex-parser": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", - "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", + "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", "dev": true }, "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", - "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", + "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6" } }, "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", - "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", + "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", "dev": true, "dependencies": { "@xtuc/ieee754": "^1.2.0" } }, "node_modules/@webassemblyjs/leb128": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", - "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", + "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", "dev": true, "dependencies": { "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/utf8": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", - "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", + "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", "dev": true }, "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", - "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", + "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/helper-wasm-section": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-opt": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "@webassemblyjs/wast-printer": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-opt": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6", + "@webassemblyjs/wast-printer": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", - "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", + "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", - "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", + "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", - "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", + "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "node_modules/@webassemblyjs/wast-printer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", - "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", + "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/ast": "1.11.6", "@xtuc/long": "4.2.2" } }, "node_modules/@webpack-cli/configtest": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz", - "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz", + "integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==", "dev": true, + "engines": { + "node": ">=14.15.0" + }, "peerDependencies": { - "webpack": "4.x.x || 5.x.x", - "webpack-cli": "4.x.x" + "webpack": "5.x.x", + "webpack-cli": "5.x.x" } }, "node_modules/@webpack-cli/info": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz", - "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz", + "integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==", "dev": true, - "dependencies": { - "envinfo": "^7.7.3" + "engines": { + "node": ">=14.15.0" }, "peerDependencies": { - "webpack-cli": "4.x.x" + "webpack": "5.x.x", + "webpack-cli": "5.x.x" } }, "node_modules/@webpack-cli/serve": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz", - "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz", + "integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==", "dev": true, + "engines": { + "node": ">=14.15.0" + }, "peerDependencies": { - "webpack-cli": "4.x.x" + "webpack": "5.x.x", + "webpack-cli": "5.x.x" }, "peerDependenciesMeta": { "webpack-dev-server": { @@ -953,6 +990,18 @@ "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", "dev": true }, + "node_modules/abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "dev": true, + "dependencies": { + "event-target-shim": "^5.0.0" + }, + "engines": { + "node": ">=6.5" + } + }, "node_modules/accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", @@ -967,9 +1016,9 @@ } }, "node_modules/acorn": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", - "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", + "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -979,9 +1028,9 @@ } }, "node_modules/acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", "dev": true, "peerDependencies": { "acorn": "^8" @@ -998,40 +1047,6 @@ "node": ">= 6.0.0" } }, - "node_modules/agent-base/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/agent-base/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "node_modules/aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "dependencies": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -1066,9 +1081,9 @@ } }, "node_modules/ajv-formats/node_modules/ajv": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", "dev": true, "dependencies": { "fast-deep-equal": "^3.1.1", @@ -1096,6 +1111,15 @@ "ajv": "^6.9.1" } }, + "node_modules/anchor-markdown-header": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/anchor-markdown-header/-/anchor-markdown-header-0.6.0.tgz", + "integrity": "sha512-v7HJMtE1X7wTpNFseRhxsY/pivP4uAJbidVhPT+yhz4i/vV1+qx371IXuV9V7bN6KjFtheLJxqaSm0Y/8neJTA==", + "dev": true, + "dependencies": { + "emoji-regex": "~10.1.0" + } + }, "node_modules/ansi-html-community": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz", @@ -1118,9 +1142,9 @@ } }, "node_modules/anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, "dependencies": { "normalize-path": "^3.0.0", @@ -1146,22 +1170,56 @@ "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", "dev": true }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "node_modules/asn1.js": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", + "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", "dev": true, - "engines": { - "node": ">=8" + "dependencies": { + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "safer-buffer": "^2.1.0" } }, - "node_modules/async": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", - "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", + "node_modules/asn1.js/node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + }, + "node_modules/assert": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz", + "integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==", "dev": true, "dependencies": { - "lodash": "^4.17.14" + "es6-object-assign": "^1.1.0", + "is-nan": "^1.2.1", + "object-is": "^1.0.1", + "util": "^0.12.0" + } + }, + "node_modules/available-typed-arrays": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", + "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/bail": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz", + "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" } }, "node_modules/balanced-match": { @@ -1191,7 +1249,7 @@ "node_modules/batch": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", - "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=", + "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==", "dev": true }, "node_modules/big-integer": { @@ -1260,15 +1318,34 @@ "ieee754": "^1.1.13" } }, + "node_modules/bl/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/blakejs": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.2.1.tgz", "integrity": "sha512-QXUSXI3QVc/gJME0dBpXrag1kbzOqCjCX8/b54ntNyW6sjtoqxqRk3LTmXzaJoh71zMsDCjM+47jS7XiwN/+fQ==" }, + "node_modules/bn.js": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", + "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==", + "dev": true + }, "node_modules/body-parser": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz", - "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==", + "version": "1.20.1", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", + "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", "dev": true, "dependencies": { "bytes": "3.1.2", @@ -1279,7 +1356,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.10.3", + "qs": "6.11.0", "raw-body": "2.5.1", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -1298,24 +1375,52 @@ "node": ">= 0.8" } }, - "node_modules/bonjour": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", - "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", + "node_modules/body-parser/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/body-parser/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, + "node_modules/body-parser/node_modules/qs": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "dev": true, + "dependencies": { + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/bonjour-service": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz", + "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==", "dev": true, "dependencies": { - "array-flatten": "^2.1.0", - "deep-equal": "^1.0.1", + "array-flatten": "^2.1.2", "dns-equal": "^1.0.0", - "dns-txt": "^2.0.2", - "multicast-dns": "^6.0.1", - "multicast-dns-service-types": "^1.1.0" + "fast-deep-equal": "^3.1.3", + "multicast-dns": "^7.2.5" } }, "node_modules/boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", + "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", "dev": true }, "node_modules/brace-expansion": { @@ -1339,10 +1444,103 @@ "node": ">=8" } }, + "node_modules/brorand": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==", + "dev": true + }, + "node_modules/browserify-aes": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", + "dev": true, + "dependencies": { + "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" + } + }, + "node_modules/browserify-cipher": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", + "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", + "dev": true, + "dependencies": { + "browserify-aes": "^1.0.4", + "browserify-des": "^1.0.0", + "evp_bytestokey": "^1.0.0" + } + }, + "node_modules/browserify-des": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", + "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", + "dev": true, + "dependencies": { + "cipher-base": "^1.0.1", + "des.js": "^1.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" + } + }, + "node_modules/browserify-rsa": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz", + "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==", + "dev": true, + "dependencies": { + "bn.js": "^5.0.0", + "randombytes": "^2.0.1" + } + }, + "node_modules/browserify-sign": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", + "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", + "dev": true, + "dependencies": { + "bn.js": "^5.1.1", + "browserify-rsa": "^4.0.1", + "create-hash": "^1.2.0", + "create-hmac": "^1.1.7", + "elliptic": "^6.5.3", + "inherits": "^2.0.4", + "parse-asn1": "^5.1.5", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" + } + }, + "node_modules/browserify-sign/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/browserify-zlib": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", + "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", + "dev": true, + "dependencies": { + "pako": "~1.0.5" + } + }, "node_modules/browserslist": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.0.tgz", - "integrity": "sha512-UQxE0DIhRB5z/zDz9iA03BOfxaN2+GQdBYH/2WrSIWEUrnpzTPJbhqt+umq6r3acaPRTW1FNTkrcp0PXgtFkvA==", + "version": "4.21.10", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz", + "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==", "dev": true, "funding": [ { @@ -1352,13 +1550,17 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "caniuse-lite": "^1.0.30001358", - "electron-to-chromium": "^1.4.164", - "node-releases": "^2.0.5", - "update-browserslist-db": "^1.0.0" + "caniuse-lite": "^1.0.30001517", + "electron-to-chromium": "^1.4.477", + "node-releases": "^2.0.13", + "update-browserslist-db": "^1.0.11" }, "bin": { "browserslist": "cli.js" @@ -1405,10 +1607,10 @@ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, - "node_modules/buffer-indexof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz", - "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==", + "node_modules/buffer-xor": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", + "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==", "dev": true }, "node_modules/bufferutil": { @@ -1423,10 +1625,16 @@ "node": ">=6.14.2" } }, + "node_modules/builtin-status-codes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", + "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==", + "dev": true + }, "node_modules/bytes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", + "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==", "dev": true, "engines": { "node": ">= 0.8" @@ -1456,9 +1664,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001358", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001358.tgz", - "integrity": "sha512-hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw==", + "version": "1.0.30001519", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz", + "integrity": "sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==", "dev": true, "funding": [ { @@ -1468,34 +1676,78 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ] }, - "node_modules/chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "node_modules/ccount": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz", + "integrity": "sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], - "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/character-entities": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz", + "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/character-entities-legacy": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz", + "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/character-reference-invalid": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz", + "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" } }, "node_modules/chownr": { @@ -1512,10 +1764,20 @@ "node": ">=6.0" } }, + "node_modules/cipher-base": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", + "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", + "dev": true, + "dependencies": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, "node_modules/clean-css": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.0.tgz", - "integrity": "sha512-YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz", + "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==", "dev": true, "dependencies": { "source-map": "~0.6.0" @@ -1524,15 +1786,6 @@ "node": ">= 10.0" } }, - "node_modules/clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/clone-deep": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", @@ -1548,9 +1801,9 @@ } }, "node_modules/colorette": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz", - "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", "dev": true }, "node_modules/commander": { @@ -1592,6 +1845,21 @@ "node": ">= 0.8.0" } }, + "node_modules/compression/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/compression/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, "node_modules/compression/node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -1604,14 +1872,26 @@ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, "node_modules/connect-history-api-fallback": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", - "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz", + "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==", "dev": true, "engines": { "node": ">=0.8" } }, + "node_modules/console-browserify": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", + "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==", + "dev": true + }, + "node_modules/constants-browserify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", + "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==", + "dev": true + }, "node_modules/content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", @@ -1625,9 +1905,9 @@ } }, "node_modules/content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", "dev": true, "engines": { "node": ">= 0.6" @@ -1645,7 +1925,7 @@ "node_modules/cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", "dev": true }, "node_modules/core-util-is": { @@ -1654,6 +1934,49 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", "dev": true }, + "node_modules/create-ecdh": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", + "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", + "dev": true, + "dependencies": { + "bn.js": "^4.1.0", + "elliptic": "^6.5.3" + } + }, + "node_modules/create-ecdh/node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + }, + "node_modules/create-hash": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", + "dev": true, + "dependencies": { + "cipher-base": "^1.0.1", + "inherits": "^2.0.1", + "md5.js": "^1.3.4", + "ripemd160": "^2.0.1", + "sha.js": "^2.4.0" + } + }, + "node_modules/create-hmac": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", + "dev": true, + "dependencies": { + "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" + } + }, "node_modules/cross-fetch": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", @@ -1676,6 +1999,28 @@ "node": ">= 8" } }, + "node_modules/crypto-browserify": { + "version": "3.12.0", + "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", + "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", + "dev": true, + "dependencies": { + "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" + }, + "engines": { + "node": "*" + } + }, "node_modules/css-select": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", @@ -1705,29 +2050,19 @@ } }, "node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/deep-equal": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", - "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", - "dev": true, + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dependencies": { - "is-arguments": "^1.0.4", - "is-date-object": "^1.0.1", - "is-regex": "^1.0.4", - "object-is": "^1.0.1", - "object-keys": "^1.1.1", - "regexp.prototype.flags": "^1.2.0" + "ms": "2.1.2" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, "node_modules/default-gateway": { @@ -1752,9 +2087,9 @@ } }, "node_modules/define-properties": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", - "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", + "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", "dev": true, "dependencies": { "has-property-descriptors": "^1.0.0", @@ -1767,28 +2102,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/del": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz", - "integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==", - "dev": true, - "dependencies": { - "globby": "^11.0.1", - "graceful-fs": "^4.2.4", - "is-glob": "^4.0.1", - "is-path-cwd": "^2.2.0", - "is-path-inside": "^3.0.2", - "p-map": "^4.0.0", - "rimraf": "^3.0.2", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -1798,6 +2111,16 @@ "node": ">= 0.8" } }, + "node_modules/des.js": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz", + "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==", + "dev": true, + "dependencies": { + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" + } + }, "node_modules/destroy": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", @@ -1815,22 +2138,27 @@ "dev": true }, "node_modules/devtools-protocol": { - "version": "0.0.1011705", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1011705.tgz", - "integrity": "sha512-OKvTvu9n3swmgYshvsyVHYX0+aPzCoYUnyXUacfQMmFtBtBKewV/gT4I9jkAbpTqtTi2E4S9MXLlvzBDUlqg0Q==" + "version": "0.0.1019158", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1019158.tgz", + "integrity": "sha512-wvq+KscQ7/6spEV7czhnZc9RM/woz1AY+/Vpd8/h2HFMwJSdTliu7f/yr1A6vDdJfKICZsShqsYpEQbdhg8AFQ==" }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "node_modules/diffie-hellman": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", + "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "dev": true, "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" + "bn.js": "^4.1.0", + "miller-rabin": "^4.0.0", + "randombytes": "^2.0.0" } }, + "node_modules/diffie-hellman/node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + }, "node_modules/dns-equal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", @@ -1838,22 +2166,32 @@ "dev": true }, "node_modules/dns-packet": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz", - "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.0.tgz", + "integrity": "sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ==", "dev": true, "dependencies": { - "ip": "^1.1.0", - "safe-buffer": "^5.0.1" + "@leichtgewicht/ip-codec": "^2.0.1" + }, + "engines": { + "node": ">=6" } }, - "node_modules/dns-txt": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz", - "integrity": "sha512-Ix5PrWjphuSoUXV/Zv5gaFHjnaJtb02F2+Si3Ht9dyJ87+Z/lMmy+dpNHtTGraNK958ndXq2i+GLkWsWHcKaBQ==", + "node_modules/doctoc": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/doctoc/-/doctoc-2.2.1.tgz", + "integrity": "sha512-qNJ1gsuo7hH40vlXTVVrADm6pdg30bns/Mo7Nv1SxuXSM1bwF9b4xQ40a6EFT/L1cI+Yylbyi8MPI4G4y7XJzQ==", "dev": true, "dependencies": { - "buffer-indexof": "^1.0.0" + "@textlint/markdown-to-ast": "^12.1.1", + "anchor-markdown-header": "^0.6.0", + "htmlparser2": "^7.2.0", + "minimist": "^1.2.6", + "underscore": "^1.13.2", + "update-section": "^0.3.3" + }, + "bin": { + "doctoc": "doctoc.js" } }, "node_modules/dom-converter": { @@ -1879,6 +2217,27 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom-serializer/node_modules/entities": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "dev": true, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/domain-browser": { + "version": "4.22.0", + "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-4.22.0.tgz", + "integrity": "sha512-IGBwjF7tNk3cwypFNH/7bfzBcgSCbaMOD3GsaY1AU/JRrnHnYgEM0+9kQt52iZxjNsjBtJYtao146V+f8jFZNw==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://bevry.me/fund" + } + }, "node_modules/domelementtype": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", @@ -1937,9 +2296,36 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.167", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.167.tgz", - "integrity": "sha512-lPHuHXBwpkr4RcfaZBKm6TKOWG/1N9mVggUpP4fY3l1JIUU2x4fkM8928smYdZ5lF+6KCTAxo1aK9JmqT+X71Q==", + "version": "1.4.490", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.490.tgz", + "integrity": "sha512-6s7NVJz+sATdYnIwhdshx/N/9O6rvMxmhVoDSDFdj6iA45gHR8EQje70+RYsF4GeB+k0IeNSBnP7yG9ZXJFr7A==", + "dev": true + }, + "node_modules/elliptic": { + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", + "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", + "dev": true, + "dependencies": { + "bn.js": "^4.11.9", + "brorand": "^1.1.0", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.1", + "inherits": "^2.0.4", + "minimalistic-assert": "^1.0.1", + "minimalistic-crypto-utils": "^1.0.1" + } + }, + "node_modules/elliptic/node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + }, + "node_modules/emoji-regex": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.1.0.tgz", + "integrity": "sha512-xAEnNCT3w2Tg6MA7ly6QqYJvEoY1tm9iIjJ3yMKK9JPlWuRHAMoe5iETwQnx3M9TVbFMfsrBgWKR+IsmswwNjg==", "dev": true }, "node_modules/encodeurl": { @@ -1960,9 +2346,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz", - "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", "dev": true, "dependencies": { "graceful-fs": "^4.2.4", @@ -1973,18 +2359,21 @@ } }, "node_modules/entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz", + "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==", "dev": true, + "engines": { + "node": ">=0.12" + }, "funding": { "url": "https://github.com/fb55/entities?sponsor=1" } }, "node_modules/envinfo": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz", - "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.10.0.tgz", + "integrity": "sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==", "dev": true, "bin": { "envinfo": "dist/cli.js" @@ -1994,9 +2383,15 @@ } }, "node_modules/es-module-lexer": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", - "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz", + "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==", + "dev": true + }, + "node_modules/es6-object-assign": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz", + "integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==", "dev": true }, "node_modules/esbuild": { @@ -2077,6 +2472,18 @@ "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", "dev": true }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -2129,6 +2536,15 @@ "node": ">= 0.6" } }, + "node_modules/event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/eventemitter3": { "version": "4.0.7", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", @@ -2144,6 +2560,16 @@ "node": ">=0.8.x" } }, + "node_modules/evp_bytestokey": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", + "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", + "dev": true, + "dependencies": { + "md5.js": "^1.3.4", + "safe-buffer": "^5.1.1" + } + }, "node_modules/execa": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", @@ -2167,15 +2593,27 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, + "node_modules/execa/node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/express": { - "version": "4.18.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz", - "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==", + "version": "4.18.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", + "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", "dev": true, "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.0", + "body-parser": "1.20.1", "content-disposition": "0.5.4", "content-type": "~1.0.4", "cookie": "0.5.0", @@ -2194,7 +2632,7 @@ "parseurl": "~1.3.3", "path-to-regexp": "0.1.7", "proxy-addr": "~2.0.7", - "qs": "6.10.3", + "qs": "6.11.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", "send": "0.18.0", @@ -2215,82 +2653,67 @@ "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", "dev": true }, - "node_modules/extract-zip": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", - "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", + "node_modules/express/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, "dependencies": { - "debug": "^4.1.1", - "get-stream": "^5.1.0", - "yauzl": "^2.10.0" - }, - "bin": { - "extract-zip": "cli.js" - }, - "engines": { - "node": ">= 10.17.0" - }, - "optionalDependencies": { - "@types/yauzl": "^2.9.1" + "ms": "2.0.0" } }, - "node_modules/extract-zip/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "node_modules/express/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, + "node_modules/express/node_modules/qs": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "dev": true, "dependencies": { - "ms": "2.1.2" + "side-channel": "^1.0.4" }, "engines": { - "node": ">=6.0" + "node": ">=0.6" }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/extract-zip/node_modules/get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "node_modules/extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "dev": true + }, + "node_modules/extract-zip": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", + "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", "dependencies": { - "pump": "^3.0.0" + "debug": "^4.1.1", + "get-stream": "^5.1.0", + "yauzl": "^2.10.0" + }, + "bin": { + "extract-zip": "cli.js" }, "engines": { - "node": ">=8" + "node": ">= 10.17.0" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "optionalDependencies": { + "@types/yauzl": "^2.9.1" } }, - "node_modules/extract-zip/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, - "node_modules/fast-glob": { - "version": "3.2.11", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", - "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", @@ -2298,21 +2721,25 @@ "dev": true }, "node_modules/fastest-levenshtein": { - "version": "1.0.14", - "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.14.tgz", - "integrity": "sha512-tFfWHjnuUfKE186Tfgr+jtaFc0mZTApEgKDOeyN+FwOqRkO/zK/3h1AiRd8u8CY53owL3CUmGr/oI9p/RdyLTA==", + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", + "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", "dev": true, "engines": { "node": ">= 4.9.1" } }, - "node_modules/fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", + "node_modules/fault": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz", + "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==", "dev": true, "dependencies": { - "reusify": "^1.0.4" + "format": "^0.2.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" } }, "node_modules/faye-websocket": { @@ -2347,6 +2774,15 @@ "node": ">=8" } }, + "node_modules/filter-obj": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-2.0.2.tgz", + "integrity": "sha512-lO3ttPjHZRfjMcxWKb1j1eDhTFsu4meeR3lnMcnBFhk6RuLhvEiuALu2TlfL310ph4lCYYwgF/ElIjdP739tdg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/finalhandler": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", @@ -2365,6 +2801,21 @@ "node": ">= 0.8" } }, + "node_modules/finalhandler/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/finalhandler/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, "node_modules/find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", @@ -2378,9 +2829,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", - "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", "dev": true, "funding": [ { @@ -2397,6 +2848,24 @@ } } }, + "node_modules/for-each": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", + "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "dev": true, + "dependencies": { + "is-callable": "^1.1.3" + } + }, + "node_modules/format": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz", + "integrity": "sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==", + "dev": true, + "engines": { + "node": ">=0.4.x" + } + }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -2421,9 +2890,9 @@ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" }, "node_modules/fs-monkey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz", - "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.4.tgz", + "integrity": "sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==", "dev": true }, "node_modules/fs.realpath": { @@ -2451,36 +2920,30 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, - "node_modules/functions-have-names": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/get-intrinsic": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", + "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", "dev": true, "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", - "has-symbols": "^1.0.1" + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true, + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dependencies": { + "pump": "^3.0.0" + }, "engines": { - "node": ">=10" + "node": ">=8" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -2523,30 +2986,22 @@ "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", "dev": true }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", "dev": true, "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" + "get-intrinsic": "^1.1.3" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true }, "node_modules/handle-thing": { @@ -2588,6 +3043,18 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/has-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/has-symbols": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", @@ -2615,6 +3082,44 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/hash-base": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz", + "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.4", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/hash-base/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/hash.js": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", + "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" + } + }, "node_modules/he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -2624,6 +3129,17 @@ "he": "bin/he" } }, + "node_modules/hmac-drbg": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", + "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", + "dev": true, + "dependencies": { + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" + } + }, "node_modules/hpack.js": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", @@ -2637,9 +3153,9 @@ } }, "node_modules/hpack.js/node_modules/readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, "dependencies": { "core-util-is": "~1.0.0", @@ -2667,10 +3183,20 @@ } }, "node_modules/html-entities": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz", - "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==", - "dev": true + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz", + "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/mdevils" + }, + { + "type": "patreon", + "url": "https://patreon.com/mdevils" + } + ] }, "node_modules/html-minifier-terser": { "version": "6.1.0", @@ -2694,9 +3220,9 @@ } }, "node_modules/html-webpack-plugin": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz", - "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==", + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz", + "integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==", "dev": true, "dependencies": { "@types/html-minifier-terser": "^6.0.0", @@ -2717,9 +3243,9 @@ } }, "node_modules/htmlparser2": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", - "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz", + "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==", "dev": true, "funding": [ "https://github.com/fb55/htmlparser2?sponsor=1", @@ -2730,9 +3256,9 @@ ], "dependencies": { "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", - "domutils": "^2.5.2", - "entities": "^2.0.0" + "domhandler": "^4.2.2", + "domutils": "^2.8.0", + "entities": "^3.0.1" } }, "node_modules/http-deceiver": { @@ -2758,9 +3284,9 @@ } }, "node_modules/http-parser-js": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz", - "integrity": "sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA==", + "version": "0.5.8", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz", + "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==", "dev": true }, "node_modules/http-proxy": { @@ -2801,6 +3327,24 @@ } } }, + "node_modules/http-proxy-middleware/node_modules/is-plain-obj": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", + "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/https-browserify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", + "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==", + "dev": true + }, "node_modules/https-proxy-agent": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", @@ -2813,27 +3357,6 @@ "node": ">= 6" } }, - "node_modules/https-proxy-agent/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/https-proxy-agent/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, "node_modules/human-signals": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", @@ -2874,15 +3397,6 @@ } ] }, - "node_modules/ignore": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", - "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, "node_modules/import-local": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", @@ -2912,15 +3426,6 @@ "url": "https://github.com/sponsors/wooorm" } }, - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -2936,29 +3441,47 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/interpret": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz", - "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz", + "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==", "dev": true, "engines": { - "node": ">= 0.10" + "node": ">=10.13.0" } }, - "node_modules/ip": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz", - "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==", - "dev": true - }, "node_modules/ipaddr.js": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz", - "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz", + "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==", "dev": true, "engines": { "node": ">= 10" } }, + "node_modules/is-alphabetical": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz", + "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/is-alphanumerical": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz", + "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==", + "dev": true, + "dependencies": { + "is-alphabetical": "^1.0.0", + "is-decimal": "^1.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/is-arguments": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", @@ -2987,26 +3510,34 @@ "node": ">=8" } }, - "node_modules/is-core-module": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", - "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", - "dev": true, - "dependencies": { - "has": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-date-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "node_modules/is-buffer": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", + "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "engines": { + "node": ">=4" + } + }, + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, "engines": { "node": ">= 0.4" }, @@ -3014,6 +3545,28 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-core-module": { + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", + "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", + "dev": true, + "dependencies": { + "has": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-decimal": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz", + "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/is-docker": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", @@ -3038,6 +3591,21 @@ "node": ">=0.10.0" } }, + "node_modules/is-generator-function": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", + "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", @@ -3050,43 +3618,48 @@ "node": ">=0.10.0" } }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "node_modules/is-hexadecimal": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz", + "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==", "dev": true, - "engines": { - "node": ">=0.12.0" + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" } }, - "node_modules/is-path-cwd": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", - "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==", + "node_modules/is-nan": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz", + "integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==", "dev": true, + "dependencies": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3" + }, "engines": { - "node": ">=6" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, "engines": { - "node": ">=8" + "node": ">=0.12.0" } }, "node_modules/is-plain-obj": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", - "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", "dev": true, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=8" } }, "node_modules/is-plain-object": { @@ -3101,22 +3674,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-stream": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", @@ -3129,6 +3686,21 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/is-typed-array": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", + "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", + "dev": true, + "dependencies": { + "which-typed-array": "^1.1.11" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-wsl": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", @@ -3176,10 +3748,10 @@ "node": ">= 10.13.0" } }, - "node_modules/json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", "dev": true }, "node_modules/json-schema-traverse": { @@ -3205,6 +3777,16 @@ "node": ">=0.10.0" } }, + "node_modules/launch-editor": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz", + "integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==", + "dev": true, + "dependencies": { + "picocolors": "^1.0.0", + "shell-quote": "^1.7.3" + } + }, "node_modules/loader-runner": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", @@ -3231,6 +3813,16 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, + "node_modules/longest-streak": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz", + "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/lower-case": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", @@ -3240,6 +3832,189 @@ "tslib": "^2.0.3" } }, + "node_modules/markdown-table": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz", + "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==", + "dev": true, + "dependencies": { + "repeat-string": "^1.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/md5.js": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", + "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", + "dev": true, + "dependencies": { + "hash-base": "^3.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" + } + }, + "node_modules/mdast-util-find-and-replace": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-1.1.1.tgz", + "integrity": "sha512-9cKl33Y21lyckGzpSmEQnIDjEfeeWelN5s1kUW1LwdB0Fkuq2u+4GdqcGEygYxJE8GVqCl0741bYXHgamfWAZA==", + "dev": true, + "dependencies": { + "escape-string-regexp": "^4.0.0", + "unist-util-is": "^4.0.0", + "unist-util-visit-parents": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-footnote": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/mdast-util-footnote/-/mdast-util-footnote-0.1.7.tgz", + "integrity": "sha512-QxNdO8qSxqbO2e3m09KwDKfWiLgqyCurdWTQ198NpbZ2hxntdc+VKS4fDJCmNWbAroUdYnSthu+XbZ8ovh8C3w==", + "dev": true, + "dependencies": { + "mdast-util-to-markdown": "^0.6.0", + "micromark": "~2.11.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-from-markdown": { + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz", + "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==", + "dev": true, + "dependencies": { + "@types/mdast": "^3.0.0", + "mdast-util-to-string": "^2.0.0", + "micromark": "~2.11.0", + "parse-entities": "^2.0.0", + "unist-util-stringify-position": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-frontmatter": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/mdast-util-frontmatter/-/mdast-util-frontmatter-0.2.0.tgz", + "integrity": "sha512-FHKL4w4S5fdt1KjJCwB0178WJ0evnyyQr5kXTM3wrOVpytD0hrkvd+AOOjU9Td8onOejCkmZ+HQRT3CZ3coHHQ==", + "dev": true, + "dependencies": { + "micromark-extension-frontmatter": "^0.2.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-gfm": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-0.1.2.tgz", + "integrity": "sha512-NNkhDx/qYcuOWB7xHUGWZYVXvjPFFd6afg6/e2g+SV4r9q5XUcCbV4Wfa3DLYIiD+xAEZc6K4MGaE/m0KDcPwQ==", + "dev": true, + "dependencies": { + "mdast-util-gfm-autolink-literal": "^0.1.0", + "mdast-util-gfm-strikethrough": "^0.2.0", + "mdast-util-gfm-table": "^0.1.0", + "mdast-util-gfm-task-list-item": "^0.1.0", + "mdast-util-to-markdown": "^0.6.1" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-gfm-autolink-literal": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-0.1.3.tgz", + "integrity": "sha512-GjmLjWrXg1wqMIO9+ZsRik/s7PLwTaeCHVB7vRxUwLntZc8mzmTsLVr6HW1yLokcnhfURsn5zmSVdi3/xWWu1A==", + "dev": true, + "dependencies": { + "ccount": "^1.0.0", + "mdast-util-find-and-replace": "^1.1.0", + "micromark": "^2.11.3" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-gfm-strikethrough": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-0.2.3.tgz", + "integrity": "sha512-5OQLXpt6qdbttcDG/UxYY7Yjj3e8P7X16LzvpX8pIQPYJ/C2Z1qFGMmcw+1PZMUM3Z8wt8NRfYTvCni93mgsgA==", + "dev": true, + "dependencies": { + "mdast-util-to-markdown": "^0.6.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-gfm-table": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-0.1.6.tgz", + "integrity": "sha512-j4yDxQ66AJSBwGkbpFEp9uG/LS1tZV3P33fN1gkyRB2LoRL+RR3f76m0HPHaby6F4Z5xr9Fv1URmATlRRUIpRQ==", + "dev": true, + "dependencies": { + "markdown-table": "^2.0.0", + "mdast-util-to-markdown": "~0.6.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-gfm-task-list-item": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-0.1.6.tgz", + "integrity": "sha512-/d51FFIfPsSmCIRNp7E6pozM9z1GYPIkSy1urQ8s/o4TC22BZ7DqfHFWiqBD23bc7J3vV1Fc9O4QIHBlfuit8A==", + "dev": true, + "dependencies": { + "mdast-util-to-markdown": "~0.6.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-to-markdown": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz", + "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==", + "dev": true, + "dependencies": { + "@types/unist": "^2.0.0", + "longest-streak": "^2.0.0", + "mdast-util-to-string": "^2.0.0", + "parse-entities": "^2.0.0", + "repeat-string": "^1.0.0", + "zwitch": "^1.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-to-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz", + "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==", + "dev": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, "node_modules/media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -3250,12 +4025,12 @@ } }, "node_modules/memfs": { - "version": "3.4.6", - "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.6.tgz", - "integrity": "sha512-rH9mjopto6Wkr7RFuH9l9dk3qb2XGOcYKr7xMhaYqfzuJqOqhRrcFvfD7JMuPj6SLmPreh5+6eAuv36NFAU+Mw==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz", + "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==", "dev": true, "dependencies": { - "fs-monkey": "^1.0.3" + "fs-monkey": "^1.0.4" }, "engines": { "node": ">= 4.0.0" @@ -3273,22 +4048,139 @@ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", "dev": true }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "node_modules/methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/micromark": { + "version": "2.11.4", + "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz", + "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "dependencies": { + "debug": "^4.0.0", + "parse-entities": "^2.0.0" + } + }, + "node_modules/micromark-extension-footnote": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/micromark-extension-footnote/-/micromark-extension-footnote-0.3.2.tgz", + "integrity": "sha512-gr/BeIxbIWQoUm02cIfK7mdMZ/fbroRpLsck4kvFtjbzP4yi+OPVbnukTc/zy0i7spC2xYE/dbX1Sur8BEDJsQ==", + "dev": true, + "dependencies": { + "micromark": "~2.11.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/micromark-extension-frontmatter": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/micromark-extension-frontmatter/-/micromark-extension-frontmatter-0.2.2.tgz", + "integrity": "sha512-q6nPLFCMTLtfsctAuS0Xh4vaolxSFUWUWR6PZSrXXiRy+SANGllpcqdXFv2z07l0Xz/6Hl40hK0ffNCJPH2n1A==", + "dev": true, + "dependencies": { + "fault": "^1.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/micromark-extension-gfm": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-0.3.3.tgz", + "integrity": "sha512-oVN4zv5/tAIA+l3GbMi7lWeYpJ14oQyJ3uEim20ktYFAcfX1x3LNlFGGlmrZHt7u9YlKExmyJdDGaTt6cMSR/A==", + "dev": true, + "dependencies": { + "micromark": "~2.11.0", + "micromark-extension-gfm-autolink-literal": "~0.5.0", + "micromark-extension-gfm-strikethrough": "~0.6.5", + "micromark-extension-gfm-table": "~0.4.0", + "micromark-extension-gfm-tagfilter": "~0.3.0", + "micromark-extension-gfm-task-list-item": "~0.3.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/micromark-extension-gfm-autolink-literal": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-0.5.7.tgz", + "integrity": "sha512-ePiDGH0/lhcngCe8FtH4ARFoxKTUelMp4L7Gg2pujYD5CSMb9PbblnyL+AAMud/SNMyusbS2XDSiPIRcQoNFAw==", + "dev": true, + "dependencies": { + "micromark": "~2.11.3" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/micromark-extension-gfm-strikethrough": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-0.6.5.tgz", + "integrity": "sha512-PpOKlgokpQRwUesRwWEp+fHjGGkZEejj83k9gU5iXCbDG+XBA92BqnRKYJdfqfkrRcZRgGuPuXb7DaK/DmxOhw==", + "dev": true, + "dependencies": { + "micromark": "~2.11.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/micromark-extension-gfm-table": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-0.4.3.tgz", + "integrity": "sha512-hVGvESPq0fk6ALWtomcwmgLvH8ZSVpcPjzi0AjPclB9FsVRgMtGZkUcpE0zgjOCFAznKepF4z3hX8z6e3HODdA==", + "dev": true, + "dependencies": { + "micromark": "~2.11.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/micromark-extension-gfm-tagfilter": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-0.3.0.tgz", + "integrity": "sha512-9GU0xBatryXifL//FJH+tAZ6i240xQuFrSL7mYi8f4oZSbc+NvXjkrHemeYP0+L4ZUT+Ptz3b95zhUZnMtoi/Q==", "dev": true, - "engines": { - "node": ">= 8" + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" } }, - "node_modules/methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", + "node_modules/micromark-extension-gfm-task-list-item": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-0.3.3.tgz", + "integrity": "sha512-0zvM5iSLKrc/NQl84pZSjGo66aTGd57C1idmlWmE87lkMcXrTxg1uXa/nXomxJytoje9trP0NDLvw4bZ/Z/XCQ==", "dev": true, - "engines": { - "node": ">= 0.6" + "dependencies": { + "micromark": "~2.11.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" } }, "node_modules/micromatch": { @@ -3304,6 +4196,25 @@ "node": ">=8.6" } }, + "node_modules/miller-rabin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", + "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", + "dev": true, + "dependencies": { + "bn.js": "^4.0.0", + "brorand": "^1.0.1" + }, + "bin": { + "miller-rabin": "bin/miller-rabin" + } + }, + "node_modules/miller-rabin/node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + }, "node_modules/mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", @@ -3352,6 +4263,12 @@ "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", "dev": true }, + "node_modules/minimalistic-crypto-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", + "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==", + "dev": true + }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -3364,21 +4281,12 @@ } }, "node_modules/minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", - "dev": true - }, - "node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", "dev": true, - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/mkdirp-classic": { @@ -3387,30 +4295,23 @@ "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" }, "node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/multicast-dns": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz", - "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==", + "version": "7.2.5", + "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz", + "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==", "dev": true, "dependencies": { - "dns-packet": "^1.3.1", + "dns-packet": "^5.2.2", "thunky": "^1.0.2" }, "bin": { "multicast-dns": "cli.js" } }, - "node_modules/multicast-dns-service-types": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", - "integrity": "sha512-cnAsSVxIDsYt0v7HmC0hWZFwwXSh+E6PgCrREDuN/EsjgLwA5XRmlMHhSiDPrt6HxY1gTivEa/Zh7GtODoLevQ==", - "dev": true - }, "node_modules/negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", @@ -3455,25 +4356,6 @@ } } }, - "node_modules/node-fetch/node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, - "node_modules/node-fetch/node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "node_modules/node-fetch/node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "node_modules/node-forge": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", @@ -3484,19 +4366,58 @@ } }, "node_modules/node-gyp-build": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.4.0.tgz", - "integrity": "sha512-amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz", + "integrity": "sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==", "bin": { "node-gyp-build": "bin.js", "node-gyp-build-optional": "optional.js", "node-gyp-build-test": "build-test.js" } }, + "node_modules/node-polyfill-webpack-plugin": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/node-polyfill-webpack-plugin/-/node-polyfill-webpack-plugin-2.0.1.tgz", + "integrity": "sha512-ZUMiCnZkP1LF0Th2caY6J/eKKoA0TefpoVa68m/LQU1I/mE8rGt4fNYGgNuCcK+aG8P8P43nbeJ2RqJMOL/Y1A==", + "dev": true, + "dependencies": { + "assert": "^2.0.0", + "browserify-zlib": "^0.2.0", + "buffer": "^6.0.3", + "console-browserify": "^1.2.0", + "constants-browserify": "^1.0.0", + "crypto-browserify": "^3.12.0", + "domain-browser": "^4.22.0", + "events": "^3.3.0", + "filter-obj": "^2.0.2", + "https-browserify": "^1.0.0", + "os-browserify": "^0.3.0", + "path-browserify": "^1.0.1", + "process": "^0.11.10", + "punycode": "^2.1.1", + "querystring-es3": "^0.2.1", + "readable-stream": "^4.0.0", + "stream-browserify": "^3.0.0", + "stream-http": "^3.2.0", + "string_decoder": "^1.3.0", + "timers-browserify": "^2.0.12", + "tty-browserify": "^0.0.1", + "type-fest": "^2.14.0", + "url": "^0.11.0", + "util": "^0.12.4", + "vm-browserify": "^1.1.2" + }, + "engines": { + "node": ">=12" + }, + "peerDependencies": { + "webpack": ">=5" + } + }, "node_modules/node-releases": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz", - "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==", + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", + "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", "dev": true }, "node_modules/normalize-path": { @@ -3533,9 +4454,9 @@ } }, "node_modules/object-inspect": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.1.tgz", - "integrity": "sha512-Y/jF6vnvEtOPGiKD1+q+X0CiUYRQtEHp89MLLUJ7TUivtH8Ugn2+3A7Rynqk7BRsAoqeOQWnFnjpDrKSxDgIGA==", + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3617,9 +4538,9 @@ } }, "node_modules/open": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz", - "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", + "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", "dev": true, "dependencies": { "define-lazy-prop": "^2.0.0", @@ -3633,6 +4554,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/os-browserify": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", + "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==", + "dev": true + }, "node_modules/p-limit": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", @@ -3658,21 +4585,6 @@ "node": ">=8" } }, - "node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "dependencies": { - "aggregate-error": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/p-retry": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz", @@ -3694,6 +4606,12 @@ "node": ">=6" } }, + "node_modules/pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "dev": true + }, "node_modules/param-case": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", @@ -3704,6 +4622,37 @@ "tslib": "^2.0.3" } }, + "node_modules/parse-asn1": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", + "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", + "dev": true, + "dependencies": { + "asn1.js": "^5.2.0", + "browserify-aes": "^1.0.0", + "evp_bytestokey": "^1.0.0", + "pbkdf2": "^3.0.3", + "safe-buffer": "^5.1.1" + } + }, + "node_modules/parse-entities": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", + "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==", + "dev": true, + "dependencies": { + "character-entities": "^1.0.0", + "character-entities-legacy": "^1.0.0", + "character-reference-invalid": "^1.0.0", + "is-alphanumerical": "^1.0.0", + "is-decimal": "^1.0.0", + "is-hexadecimal": "^1.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -3723,6 +4672,12 @@ "tslib": "^2.0.3" } }, + "node_modules/path-browserify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", + "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==", + "dev": true + }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -3760,13 +4715,20 @@ "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", "dev": true }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "node_modules/pbkdf2": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", + "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==", "dev": true, + "dependencies": { + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4", + "ripemd160": "^2.0.1", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" + }, "engines": { - "node": ">=8" + "node": ">=0.12" } }, "node_modules/pend": { @@ -3803,35 +4765,6 @@ "node": ">=8" } }, - "node_modules/portfinder": { - "version": "1.0.28", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", - "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==", - "dev": true, - "dependencies": { - "async": "^2.6.2", - "debug": "^3.1.1", - "mkdirp": "^0.5.5" - }, - "engines": { - "node": ">= 0.12.0" - } - }, - "node_modules/portfinder/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/portfinder/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true - }, "node_modules/pretty-error": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz", @@ -3842,6 +4775,15 @@ "renderkid": "^3.0.0" } }, + "node_modules/process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", + "dev": true, + "engines": { + "node": ">= 0.6.0" + } + }, "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -3883,6 +4825,26 @@ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" }, + "node_modules/public-encrypt": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", + "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", + "dev": true, + "dependencies": { + "bn.js": "^4.1.0", + "browserify-rsa": "^4.0.0", + "create-hash": "^1.1.0", + "parse-asn1": "^5.0.0", + "randombytes": "^2.0.1", + "safe-buffer": "^5.1.2" + } + }, + "node_modules/public-encrypt/node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + }, "node_modules/pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", @@ -3893,22 +4855,22 @@ } }, "node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", "dev": true, "engines": { "node": ">=6" } }, "node_modules/puppeteer-core": { - "version": "15.3.2", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-15.3.2.tgz", - "integrity": "sha512-Fmca9UzXmJkRrvGBgUmrffGD2BlulUTfsVefV1+vqfNm4PnlZ/U1bfD6X8XQ0nftyyg520tmSKd81yH3Z2tszg==", + "version": "15.5.0", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-15.5.0.tgz", + "integrity": "sha512-5Q8EmF++MARczJD1JcRehVePlctxGG2TFHSxdCV8NqPOk44/cMySmZw2nETn+lwUOyp0L9afosMFTnT4KgmWgw==", "dependencies": { "cross-fetch": "3.1.5", "debug": "4.3.4", - "devtools-protocol": "0.0.1011705", + "devtools-protocol": "0.0.1019158", "extract-zip": "2.0.1", "https-proxy-agent": "5.0.1", "pkg-dir": "4.2.0", @@ -3923,27 +4885,6 @@ "node": ">=14.1.0" } }, - "node_modules/puppeteer-core/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/puppeteer-core/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, "node_modules/puppeteer-core/node_modules/ws": { "version": "8.8.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz", @@ -3965,9 +4906,9 @@ } }, "node_modules/qs": { - "version": "6.10.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz", - "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==", + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", + "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==", "dev": true, "dependencies": { "side-channel": "^1.0.4" @@ -3979,25 +4920,14 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "node_modules/querystring-es3": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", + "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==", "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] + "engines": { + "node": ">=0.4.x" + } }, "node_modules/randombytes": { "version": "2.1.0", @@ -4008,6 +4938,16 @@ "safe-buffer": "^5.1.0" } }, + "node_modules/randomfill": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", + "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", + "dev": true, + "dependencies": { + "randombytes": "^2.0.5", + "safe-buffer": "^5.1.0" + } + }, "node_modules/range-parser": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", @@ -4042,16 +4982,19 @@ } }, "node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.2.tgz", + "integrity": "sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==", + "dev": true, "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "abort-controller": "^3.0.0", + "buffer": "^6.0.3", + "events": "^3.3.0", + "process": "^0.11.10", + "string_decoder": "^1.3.0" }, "engines": { - "node": ">= 6" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/readdirp": { @@ -4067,15 +5010,15 @@ } }, "node_modules/rechoir": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", - "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz", + "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==", "dev": true, "dependencies": { - "resolve": "^1.9.0" + "resolve": "^1.20.0" }, "engines": { - "node": ">= 0.10" + "node": ">= 10.13.0" } }, "node_modules/reconnecting-websocket": { @@ -4083,30 +5026,68 @@ "resolved": "https://registry.npmjs.org/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz", "integrity": "sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng==" }, - "node_modules/regexp.prototype.flags": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", - "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", + "node_modules/relateurl": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", + "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==", + "dev": true, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/remark-footnotes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/remark-footnotes/-/remark-footnotes-3.0.0.tgz", + "integrity": "sha512-ZssAvH9FjGYlJ/PBVKdSmfyPc3Cz4rTWgZLI4iE/SX8Nt5l3o3oEjv3wwG5VD7xOjktzdwp5coac+kJV9l4jgg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "functions-have-names": "^1.2.2" + "mdast-util-footnote": "^0.1.0", + "micromark-extension-footnote": "^0.3.0" }, - "engines": { - "node": ">= 0.4" + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/remark-frontmatter": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-3.0.0.tgz", + "integrity": "sha512-mSuDd3svCHs+2PyO29h7iijIZx4plX0fheacJcAoYAASfgzgVIcXGYSq9GFyYocFLftQs8IOmmkgtOovs6d4oA==", + "dev": true, + "dependencies": { + "mdast-util-frontmatter": "^0.2.0", + "micromark-extension-frontmatter": "^0.2.0" }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "type": "opencollective", + "url": "https://opencollective.com/unified" } }, - "node_modules/relateurl": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", - "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==", + "node_modules/remark-gfm": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-1.0.0.tgz", + "integrity": "sha512-KfexHJCiqvrdBZVbQ6RopMZGwaXz6wFJEfByIuEwGf0arvITHjiKKZ1dpXujjH9KZdm1//XJQwgfnJ3lmXaDPA==", "dev": true, - "engines": { - "node": ">= 0.10" + "dependencies": { + "mdast-util-gfm": "^0.1.0", + "micromark-extension-gfm": "^0.3.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/remark-parse": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz", + "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==", + "dev": true, + "dependencies": { + "mdast-util-from-markdown": "^0.8.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" } }, "node_modules/renderkid": { @@ -4122,6 +5103,43 @@ "strip-ansi": "^6.0.1" } }, + "node_modules/renderkid/node_modules/entities": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "dev": true, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/renderkid/node_modules/htmlparser2": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", + "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", + "dev": true, + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "dependencies": { + "domelementtype": "^2.0.1", + "domhandler": "^4.0.0", + "domutils": "^2.5.2", + "entities": "^2.0.0" + } + }, + "node_modules/repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==", + "dev": true, + "engines": { + "node": ">=0.10" + } + }, "node_modules/require-from-string": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", @@ -4138,12 +5156,12 @@ "dev": true }, "node_modules/resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "version": "1.22.4", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz", + "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==", "dev": true, "dependencies": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -4184,16 +5202,6 @@ "node": ">= 4" } }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true, - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, "node_modules/rimraf": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", @@ -4208,27 +5216,14 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "node_modules/ripemd160": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", + "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], "dependencies": { - "queue-microtask": "^1.2.2" + "hash-base": "^3.0.0", + "inherits": "^2.0.1" } }, "node_modules/safe-buffer": { @@ -4257,9 +5252,9 @@ "dev": true }, "node_modules/schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.8", @@ -4281,9 +5276,9 @@ "dev": true }, "node_modules/selfsigned": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.1.tgz", - "integrity": "sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz", + "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==", "dev": true, "dependencies": { "node-forge": "^1" @@ -4316,6 +5311,21 @@ "node": ">= 0.8.0" } }, + "node_modules/send/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/send/node_modules/debug/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -4323,9 +5333,9 @@ "dev": true }, "node_modules/serialize-javascript": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", + "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", "dev": true, "dependencies": { "randombytes": "^2.1.0" @@ -4349,6 +5359,15 @@ "node": ">= 0.8.0" } }, + "node_modules/serve-index/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, "node_modules/serve-index/node_modules/depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -4379,6 +5398,12 @@ "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", "dev": true }, + "node_modules/serve-index/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, "node_modules/serve-index/node_modules/setprototypeof": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", @@ -4409,12 +5434,31 @@ "node": ">= 0.8.0" } }, + "node_modules/setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", + "dev": true + }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", "dev": true }, + "node_modules/sha.js": { + "version": "2.4.11", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", + "dev": true, + "dependencies": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + }, + "bin": { + "sha.js": "bin.js" + } + }, "node_modules/shallow-clone": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", @@ -4448,6 +5492,15 @@ "node": ">=8" } }, + "node_modules/shell-quote": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", + "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/side-channel": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", @@ -4468,15 +5521,6 @@ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/sockjs": { "version": "0.3.24", "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz", @@ -4537,59 +5581,77 @@ "wbuf": "^1.7.3" } }, - "node_modules/spdy-transport/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "node_modules/spdy-transport/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, "dependencies": { - "ms": "2.1.2" + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" }, "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } + "node": ">= 6" } }, - "node_modules/spdy-transport/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "dev": true, + "engines": { + "node": ">= 0.8" + } }, - "node_modules/spdy/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "node_modules/stream-browserify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz", + "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==", "dev": true, "dependencies": { - "ms": "2.1.2" + "inherits": "~2.0.4", + "readable-stream": "^3.5.0" + } + }, + "node_modules/stream-browserify/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" }, "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } + "node": ">= 6" } }, - "node_modules/spdy/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "node_modules/stream-http": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz", + "integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==", + "dev": true, + "dependencies": { + "builtin-status-codes": "^3.0.0", + "inherits": "^2.0.4", + "readable-stream": "^3.6.0", + "xtend": "^4.0.2" + } }, - "node_modules/statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "node_modules/stream-http/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, "engines": { - "node": ">= 0.8" + "node": ">= 6" } }, "node_modules/string_decoder": { @@ -4683,14 +5745,27 @@ "node": ">=6" } }, + "node_modules/tar-stream/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/terser": { - "version": "5.15.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz", - "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==", + "version": "5.19.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz", + "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==", "dev": true, "dependencies": { - "@jridgewell/source-map": "^0.3.2", - "acorn": "^8.5.0", + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", "commander": "^2.20.0", "source-map-support": "~0.5.20" }, @@ -4702,16 +5777,16 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz", - "integrity": "sha512-Fx60G5HNYknNTNQnzQ1VePRuu89ZVYWfjRAeT5rITuCY/1b08s49e5kSQwHDirKZWuoKOBRFS98EUUoZ9kLEwQ==", + "version": "5.3.9", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz", + "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==", "dev": true, "dependencies": { - "@jridgewell/trace-mapping": "^0.3.7", + "@jridgewell/trace-mapping": "^0.3.17", "jest-worker": "^27.4.5", "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.0", - "terser": "^5.7.2" + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { "node": ">= 10.13.0" @@ -4752,6 +5827,18 @@ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", "dev": true }, + "node_modules/timers-browserify": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz", + "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==", + "dev": true, + "dependencies": { + "setimmediate": "^1.0.4" + }, + "engines": { + "node": ">=0.6.0" + } + }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -4773,12 +5860,54 @@ "node": ">=0.6" } }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, + "node_modules/traverse": { + "version": "0.6.7", + "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.7.tgz", + "integrity": "sha512-/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/trough": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz", + "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", + "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", + "dev": true + }, + "node_modules/tty-browserify": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz", + "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==", "dev": true }, + "node_modules/type-fest": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", + "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", + "dev": true, + "engines": { + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/type-is": { "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", @@ -4824,11 +5953,72 @@ "ieee754": "^1.1.13" } }, + "node_modules/underscore": { + "version": "1.13.6", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz", + "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==", + "dev": true + }, + "node_modules/unified": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz", + "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==", + "dev": true, + "dependencies": { + "bail": "^1.0.0", + "extend": "^3.0.0", + "is-buffer": "^2.0.0", + "is-plain-obj": "^2.0.0", + "trough": "^1.0.0", + "vfile": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, "node_modules/uniqid": { "version": "5.4.0", "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-5.4.0.tgz", "integrity": "sha512-38JRbJ4Fj94VmnC7G/J/5n5SC7Ab46OM5iNtSstB/ko3l1b5g7ALt4qzHFgGciFkyiRNtDXtLNb+VsxtMSE77A==" }, + "node_modules/unist-util-is": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz", + "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==", + "dev": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-stringify-position": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz", + "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==", + "dev": true, + "dependencies": { + "@types/unist": "^2.0.2" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-visit-parents": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz", + "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==", + "dev": true, + "dependencies": { + "@types/unist": "^2.0.0", + "unist-util-is": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -4839,9 +6029,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.3.tgz", - "integrity": "sha512-ufSazemeh9Gty0qiWtoRpJ9F5Q5W3xdIPm1UZQqYQv/q0Nyb9EMHUB2lu+O9x1re9WsorpMAUu4Y6Lxcs5n+XQ==", + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", + "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", "dev": true, "funding": [ { @@ -4851,6 +6041,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { @@ -4858,12 +6052,18 @@ "picocolors": "^1.0.0" }, "bin": { - "browserslist-lint": "cli.js" + "update-browserslist-db": "cli.js" }, "peerDependencies": { "browserslist": ">= 4.21.0" } }, + "node_modules/update-section": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/update-section/-/update-section-0.3.3.tgz", + "integrity": "sha512-BpRZMZpgXLuTiKeiu7kK0nIPwGdyrqrs6EDSaXtjD/aQ2T+qVo9a5hRC3HN3iJjCMxNT/VxoLGQ7E/OzE5ucnw==", + "dev": true + }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -4873,6 +6073,35 @@ "punycode": "^2.1.0" } }, + "node_modules/url": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.1.tgz", + "integrity": "sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==", + "dev": true, + "dependencies": { + "punycode": "^1.4.1", + "qs": "^6.11.0" + } + }, + "node_modules/url/node_modules/punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", + "dev": true + }, + "node_modules/util": { + "version": "0.12.5", + "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", + "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "is-arguments": "^1.0.4", + "is-generator-function": "^1.0.7", + "is-typed-array": "^1.1.3", + "which-typed-array": "^1.1.2" + } + }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -4902,19 +6131,55 @@ "uuid": "dist/bin/uuid" } }, - "node_modules/vary": { + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/vfile": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz", + "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==", + "dev": true, + "dependencies": { + "@types/unist": "^2.0.0", + "is-buffer": "^2.0.0", + "unist-util-stringify-position": "^2.0.0", + "vfile-message": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/vfile-message": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz", + "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==", + "dev": true, + "dependencies": { + "@types/unist": "^2.0.0", + "unist-util-stringify-position": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/vm-browserify": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "dev": true, - "engines": { - "node": ">= 0.8" - } + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", + "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==", + "dev": true }, "node_modules/watchpack": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz", - "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", + "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", "dev": true, "dependencies": { "glob-to-regexp": "^0.4.1", @@ -4933,35 +6198,40 @@ "minimalistic-assert": "^1.0.0" } }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, "node_modules/webpack": { - "version": "5.67.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.67.0.tgz", - "integrity": "sha512-LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw==", - "dev": true, - "dependencies": { - "@types/eslint-scope": "^3.7.0", - "@types/estree": "^0.0.50", - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/wasm-edit": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "acorn": "^8.4.1", - "acorn-import-assertions": "^1.7.6", + "version": "5.88.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.1.tgz", + "integrity": "sha512-FROX3TxQnC/ox4N+3xQoWZzvGXSuscxR32rbzjpXgEzWudJFEJBpdlkkob2ylrv5yzzufD1zph1OoFsLtm6stQ==", + "dev": true, + "dependencies": { + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.8.3", - "es-module-lexer": "^0.9.0", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.2.9", - "json-parse-better-errors": "^1.0.2", + "json-parse-even-better-errors": "^2.3.1", "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", - "schema-utils": "^3.1.0", + "schema-utils": "^3.2.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.1.3", - "watchpack": "^2.3.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", "webpack-sources": "^3.2.3" }, "bin": { @@ -4981,44 +6251,42 @@ } }, "node_modules/webpack-cli": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz", - "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz", + "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==", "dev": true, "dependencies": { "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^1.2.0", - "@webpack-cli/info": "^1.5.0", - "@webpack-cli/serve": "^1.7.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", "colorette": "^2.0.14", - "commander": "^7.0.0", + "commander": "^10.0.1", "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", "fastest-levenshtein": "^1.0.12", "import-local": "^3.0.2", - "interpret": "^2.2.0", - "rechoir": "^0.7.0", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", "webpack-merge": "^5.7.3" }, "bin": { "webpack-cli": "bin/cli.js" }, "engines": { - "node": ">=10.13.0" + "node": ">=14.15.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "webpack": "4.x.x || 5.x.x" + "webpack": "5.x.x" }, "peerDependenciesMeta": { "@webpack-cli/generators": { "optional": true }, - "@webpack-cli/migrate": { - "optional": true - }, "webpack-bundle-analyzer": { "optional": true }, @@ -5028,12 +6296,12 @@ } }, "node_modules/webpack-cli/node_modules/commander": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", "dev": true, "engines": { - "node": ">= 10" + "node": ">=14" } }, "node_modules/webpack-dev-middleware": { @@ -5060,9 +6328,9 @@ } }, "node_modules/webpack-dev-middleware/node_modules/ajv": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", "dev": true, "dependencies": { "fast-deep-equal": "^3.1.1", @@ -5094,15 +6362,15 @@ "dev": true }, "node_modules/webpack-dev-middleware/node_modules/schema-utils": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", - "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", + "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.9", - "ajv": "^8.8.0", + "ajv": "^8.9.0", "ajv-formats": "^2.1.1", - "ajv-keywords": "^5.0.0" + "ajv-keywords": "^5.1.0" }, "engines": { "node": ">= 12.13.0" @@ -5113,41 +6381,41 @@ } }, "node_modules/webpack-dev-server": { - "version": "4.7.4", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.7.4.tgz", - "integrity": "sha512-nfdsb02Zi2qzkNmgtZjkrMOcXnYZ6FLKcQwpxT7MvmHKc+oTtDsBju8j+NMyAygZ9GW1jMEUpy3itHtqgEhe1A==", + "version": "4.15.1", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz", + "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==", "dev": true, "dependencies": { "@types/bonjour": "^3.5.9", "@types/connect-history-api-fallback": "^1.3.5", "@types/express": "^4.17.13", "@types/serve-index": "^1.9.1", + "@types/serve-static": "^1.13.10", "@types/sockjs": "^0.3.33", - "@types/ws": "^8.2.2", + "@types/ws": "^8.5.5", "ansi-html-community": "^0.0.8", - "bonjour": "^3.5.0", + "bonjour-service": "^1.0.11", "chokidar": "^3.5.3", "colorette": "^2.0.10", "compression": "^1.7.4", - "connect-history-api-fallback": "^1.6.0", + "connect-history-api-fallback": "^2.0.0", "default-gateway": "^6.0.3", - "del": "^6.0.0", - "express": "^4.17.1", + "express": "^4.17.3", "graceful-fs": "^4.2.6", "html-entities": "^2.3.2", - "http-proxy-middleware": "^2.0.0", + "http-proxy-middleware": "^2.0.3", "ipaddr.js": "^2.0.1", + "launch-editor": "^2.6.0", "open": "^8.0.9", "p-retry": "^4.5.0", - "portfinder": "^1.0.28", + "rimraf": "^3.0.2", "schema-utils": "^4.0.0", - "selfsigned": "^2.0.0", + "selfsigned": "^2.1.1", "serve-index": "^1.9.1", - "sockjs": "^0.3.21", + "sockjs": "^0.3.24", "spdy": "^4.0.2", - "strip-ansi": "^7.0.0", "webpack-dev-middleware": "^5.3.1", - "ws": "^8.4.2" + "ws": "^8.13.0" }, "bin": { "webpack-dev-server": "bin/webpack-dev-server.js" @@ -5155,19 +6423,26 @@ "engines": { "node": ">= 12.13.0" }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, "peerDependencies": { "webpack": "^4.37.0 || ^5.0.0" }, "peerDependenciesMeta": { + "webpack": { + "optional": true + }, "webpack-cli": { "optional": true } } }, "node_modules/webpack-dev-server/node_modules/ajv": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", "dev": true, "dependencies": { "fast-deep-equal": "^3.1.1", @@ -5192,18 +6467,6 @@ "ajv": "^8.8.2" } }, - "node_modules/webpack-dev-server/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, "node_modules/webpack-dev-server/node_modules/json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", @@ -5211,15 +6474,15 @@ "dev": true }, "node_modules/webpack-dev-server/node_modules/schema-utils": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", - "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", + "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.9", - "ajv": "^8.8.0", + "ajv": "^8.9.0", "ajv-formats": "^2.1.1", - "ajv-keywords": "^5.0.0" + "ajv-keywords": "^5.1.0" }, "engines": { "node": ">= 12.13.0" @@ -5229,32 +6492,17 @@ "url": "https://opencollective.com/webpack" } }, - "node_modules/webpack-dev-server/node_modules/strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", - "dev": true, - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, "node_modules/webpack-dev-server/node_modules/ws": { - "version": "8.6.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz", - "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==", + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", + "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", "dev": true, "engines": { "node": ">=10.0.0" }, "peerDependencies": { "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" + "utf-8-validate": ">=5.0.2" }, "peerDependenciesMeta": { "bufferutil": { @@ -5266,9 +6514,9 @@ } }, "node_modules/webpack-merge": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", - "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.9.0.tgz", + "integrity": "sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==", "dev": true, "dependencies": { "clone-deep": "^4.0.1", @@ -5310,6 +6558,15 @@ "node": ">=0.8.0" } }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -5325,16 +6582,35 @@ "node": ">= 8" } }, + "node_modules/which-typed-array": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", + "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==", + "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/wildcard": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", - "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz", + "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==", "dev": true }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "node_modules/ws": { "version": "8.4.0", @@ -5364,6 +6640,15 @@ "node": ">= 6" } }, + "node_modules/xtend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "dev": true, + "engines": { + "node": ">=0.4" + } + }, "node_modules/yauzl": { "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", @@ -5372,6 +6657,16 @@ "buffer-crc32": "~0.2.3", "fd-slicer": "~1.1.0" } + }, + "node_modules/zwitch": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz", + "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } } }, "dependencies": { @@ -5392,9 +6687,9 @@ "integrity": "sha512-PoKh1tQnJX18f8iEr8Jk1KXxKCn9eqaSslMI1pyOJvYRJhQVDLCh0+9YReufjp0oFJIY1ShcrR+4/WnECVZUKQ==" }, "@emurgo/cardano-serialization-lib-browser": { - "version": "11.2.1", - "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-11.2.1.tgz", - "integrity": "sha512-J9Pmeta7y1GYnMCxtb3GnGCRw6zk1wiQ8EdCYQRn/Yqa/ss1zoBjd41euVi02Eb58aLuOJS81nNU+BcMLGXvUg==" + "version": "11.4.0", + "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-11.4.0.tgz", + "integrity": "sha512-VWMvLRBFo7MAYh42zledURFs5BpMTWvkP4DzsLNbyJxZlwjDS+bPyehJVyGc116d2gq8NHFmANbfdeuK8ffJ7A==" }, "@emurgo/cardano-serialization-lib-nodejs": { "version": "11.4.0", @@ -5556,9 +6851,9 @@ "optional": true }, "@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", "dev": true, "requires": { "@jridgewell/set-array": "^1.0.1", @@ -5567,9 +6862,9 @@ } }, "@jridgewell/resolve-uri": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz", - "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", "dev": true }, "@jridgewell/set-array": { @@ -5579,9 +6874,9 @@ "dev": true }, "@jridgewell/source-map": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", - "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz", + "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==", "dev": true, "requires": { "@jridgewell/gen-mapping": "^0.3.0", @@ -5589,19 +6884,19 @@ } }, "@jridgewell/sourcemap-codec": { - "version": "1.4.13", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz", - "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==", + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", "dev": true }, "@jridgewell/trace-mapping": { - "version": "0.3.13", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz", - "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==", + "version": "0.3.19", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz", + "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==", "dev": true, "requires": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "@jspm/core": { @@ -5610,19 +6905,25 @@ "integrity": "sha512-Lg3PnLp0QXpxwLIAuuJboLeRaIhrgJjeuh797QADg3xz8wGLugQOS5DpsE8A6i6Adgzf+bacllkKZG3J0tGfDw==", "dev": true }, + "@leichtgewicht/ip-codec": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz", + "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==", + "dev": true + }, "@mlabs-haskell/cardano-serialization-lib-gc-browser": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.2.tgz", - "integrity": "sha512-hkfXjMy+GD4YMCM3ReXmlaZnWpMufx5NXoyYoyGvEKgQ3kHsArKirBf0YOuhSINyS8emOerXh/0mXPCgz1l3mw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.3.tgz", + "integrity": "sha512-TXzaD8lWqpA5U5KRiW2iDIQzSyddcgd5tn08GE0KpecuBFOQievtnetUIV6+ERFxWUG7R8x9qWWu8syVfP4WRQ==", "requires": { "@emurgo/cardano-serialization-lib-browser": "^11.2.1", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" } }, "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.2.tgz", - "integrity": "sha512-HD75q8yyhfrrI4zeb2gkoO3wcq0EaVIwiAbyhVQWuniUPgQ6mOr2Lz31vw7YSyY1jksVU69eXngdstgErY6/yw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.3.tgz", + "integrity": "sha512-wjNZH4hwEYYQbjI/vHWmbDRu8Pec40+/ywXWRBUr7mOcE99Zo9u911qeQgdULPp7R4TOhK5alOz+Arp06yCKiQ==", "requires": { "@emurgo/cardano-serialization-lib-nodejs": "^11.4.0", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" @@ -5642,39 +6943,36 @@ } }, "@noble/hashes": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.0.tgz", - "integrity": "sha512-ilHEACi9DwqJB0pw7kv+Apvh50jiiSyR/cQ3y4W7lOR5mhvn/50FLUfsnfJz0BDZtl/RR16kXvptiv6q1msYZg==" + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.1.tgz", + "integrity": "sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==" }, "@noble/secp256k1": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.0.tgz", - "integrity": "sha512-kbacwGSsH/CTout0ZnZWxnW1B+jH/7r/WAAKLBtrRJ/+CUH7lgmQzl3GTrQua3SGKWNSDsS6lmjnDpIJ5Dxyaw==" - }, - "@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - } + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz", + "integrity": "sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw==" }, - "@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "@textlint/ast-node-types": { + "version": "12.6.1", + "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.6.1.tgz", + "integrity": "sha512-uzlJ+ZsCAyJm+lBi7j0UeBbj+Oy6w/VWoGJ3iHRHE5eZ8Z4iK66mq+PG/spupmbllLtz77OJbY89BYqgFyjXmA==", "dev": true }, - "@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "@textlint/markdown-to-ast": { + "version": "12.6.1", + "resolved": "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.6.1.tgz", + "integrity": "sha512-T0HO+VrU9VbLRiEx/kH4+gwGMHNMIGkp0Pok+p0I33saOOLyhfGvwOKQgvt2qkxzQEV2L5MtGB8EnW4r5d3CqQ==", "dev": true, "requires": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" + "@textlint/ast-node-types": "^12.6.1", + "debug": "^4.3.4", + "mdast-util-gfm-autolink-literal": "^0.1.3", + "remark-footnotes": "^3.0.0", + "remark-frontmatter": "^3.0.0", + "remark-gfm": "^1.0.0", + "remark-parse": "^9.0.0", + "traverse": "^0.6.7", + "unified": "^9.2.2" } }, "@types/body-parser": { @@ -5706,9 +7004,9 @@ } }, "@types/connect-history-api-fallback": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz", - "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz", + "integrity": "sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==", "dev": true, "requires": { "@types/express-serve-static-core": "*", @@ -5716,9 +7014,9 @@ } }, "@types/eslint": { - "version": "8.4.3", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.3.tgz", - "integrity": "sha512-YP1S7YJRMPs+7KZKDb9G63n8YejIwW9BALq7a5j2+H4yl6iOv9CB29edho+cuFRrvmJbbaH2yiVChKLJVysDGw==", + "version": "8.44.2", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.2.tgz", + "integrity": "sha512-sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg==", "dev": true, "requires": { "@types/estree": "*", @@ -5726,9 +7024,9 @@ } }, "@types/eslint-scope": { - "version": "3.7.3", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz", - "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==", + "version": "3.7.4", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz", + "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==", "dev": true, "requires": { "@types/eslint": "*", @@ -5736,32 +7034,33 @@ } }, "@types/estree": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz", - "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz", + "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==", "dev": true }, "@types/express": { - "version": "4.17.13", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz", - "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==", + "version": "4.17.17", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz", + "integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==", "dev": true, "requires": { "@types/body-parser": "*", - "@types/express-serve-static-core": "^4.17.18", + "@types/express-serve-static-core": "^4.17.33", "@types/qs": "*", "@types/serve-static": "*" } }, "@types/express-serve-static-core": { - "version": "4.17.29", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.29.tgz", - "integrity": "sha512-uMd++6dMKS32EOuw1Uli3e3BPgdLIXmezcfHv7N4c1s3gkhikBplORPpMq3fuWkxncZN1reb16d5n8yhQ80x7Q==", + "version": "4.17.35", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz", + "integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==", "dev": true, "requires": { "@types/node": "*", "@types/qs": "*", - "@types/range-parser": "*" + "@types/range-parser": "*", + "@types/send": "*" } }, "@types/html-minifier-terser": { @@ -5770,21 +7069,36 @@ "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==", "dev": true }, + "@types/http-errors": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz", + "integrity": "sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==", + "dev": true + }, "@types/http-proxy": { - "version": "1.17.9", - "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz", - "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==", + "version": "1.17.11", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.11.tgz", + "integrity": "sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==", "dev": true, "requires": { "@types/node": "*" } }, "@types/json-schema": { - "version": "7.0.11", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "version": "7.0.12", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz", + "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==", "dev": true }, + "@types/mdast": { + "version": "3.0.12", + "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.12.tgz", + "integrity": "sha512-DT+iNIRNX884cx0/Q1ja7NyUPpZuv0KPyL5rGNxm1WC1OtHstl7n4Jb7nk+xacNShQMbczJjt8uFzznpp6kYBg==", + "dev": true, + "requires": { + "@types/unist": "^2" + } + }, "@types/mime": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", @@ -5792,9 +7106,9 @@ "dev": true }, "@types/node": { - "version": "17.0.35", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.35.tgz", - "integrity": "sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==", + "version": "20.4.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.9.tgz", + "integrity": "sha512-8e2HYcg7ohnTUbHk8focoklEQYvemQmu9M/f43DZVx43kHn0tE3BY/6gSDxS7k0SprtS0NHvj+L80cGLnoOUcQ==", "devOptional": true }, "@types/qs": { @@ -5815,6 +7129,16 @@ "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==", "dev": true }, + "@types/send": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz", + "integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==", + "dev": true, + "requires": { + "@types/mime": "^1", + "@types/node": "*" + } + }, "@types/serve-index": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz", @@ -5825,12 +7149,13 @@ } }, "@types/serve-static": { - "version": "1.13.10", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz", - "integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.2.tgz", + "integrity": "sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==", "dev": true, "requires": { - "@types/mime": "^1", + "@types/http-errors": "*", + "@types/mime": "*", "@types/node": "*" } }, @@ -5843,10 +7168,16 @@ "@types/node": "*" } }, + "@types/unist": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.7.tgz", + "integrity": "sha512-cputDpIbFgLUaGQn6Vqg3/YsJwxUwHLO13v3i5ouxT4lat0khip9AEWxtERujXV9wxIB1EyF97BSJFt6vpdI8g==", + "dev": true + }, "@types/ws": { - "version": "8.5.3", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz", - "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==", + "version": "8.5.5", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz", + "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==", "dev": true, "requires": { "@types/node": "*" @@ -5862,171 +7193,169 @@ } }, "@webassemblyjs/ast": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", - "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", + "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", "dev": true, "requires": { - "@webassemblyjs/helper-numbers": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1" + "@webassemblyjs/helper-numbers": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6" } }, "@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", - "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", + "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", "dev": true }, "@webassemblyjs/helper-api-error": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", - "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", + "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", "dev": true }, "@webassemblyjs/helper-buffer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", - "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", + "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==", "dev": true }, "@webassemblyjs/helper-numbers": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", - "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", + "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", "dev": true, "requires": { - "@webassemblyjs/floating-point-hex-parser": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", + "@webassemblyjs/floating-point-hex-parser": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", "@xtuc/long": "4.2.2" } }, "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", - "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", + "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", "dev": true }, "@webassemblyjs/helper-wasm-section": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", - "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", + "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6" } }, "@webassemblyjs/ieee754": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", - "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", + "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", "dev": true, "requires": { "@xtuc/ieee754": "^1.2.0" } }, "@webassemblyjs/leb128": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", - "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", + "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", "dev": true, "requires": { "@xtuc/long": "4.2.2" } }, "@webassemblyjs/utf8": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", - "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", + "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", "dev": true }, "@webassemblyjs/wasm-edit": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", - "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", + "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/helper-wasm-section": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-opt": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "@webassemblyjs/wast-printer": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-opt": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6", + "@webassemblyjs/wast-printer": "1.11.6" } }, "@webassemblyjs/wasm-gen": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", - "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", + "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "@webassemblyjs/wasm-opt": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", - "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", + "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6" } }, "@webassemblyjs/wasm-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", - "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", + "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "@webassemblyjs/wast-printer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", - "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", + "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/ast": "1.11.6", "@xtuc/long": "4.2.2" } }, "@webpack-cli/configtest": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz", - "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz", + "integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==", "dev": true, "requires": {} }, "@webpack-cli/info": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz", - "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz", + "integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==", "dev": true, - "requires": { - "envinfo": "^7.7.3" - } + "requires": {} }, "@webpack-cli/serve": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz", - "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz", + "integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==", "dev": true, "requires": {} }, @@ -6042,6 +7371,15 @@ "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", "dev": true }, + "abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "dev": true, + "requires": { + "event-target-shim": "^5.0.0" + } + }, "accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", @@ -6053,15 +7391,15 @@ } }, "acorn": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", - "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", + "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", "dev": true }, "acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", "dev": true, "requires": {} }, @@ -6071,31 +7409,6 @@ "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", "requires": { "debug": "4" - }, - "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - } - } - }, - "aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "requires": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" } }, "ajv": { @@ -6120,9 +7433,9 @@ }, "dependencies": { "ajv": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -6146,6 +7459,15 @@ "dev": true, "requires": {} }, + "anchor-markdown-header": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/anchor-markdown-header/-/anchor-markdown-header-0.6.0.tgz", + "integrity": "sha512-v7HJMtE1X7wTpNFseRhxsY/pivP4uAJbidVhPT+yhz4i/vV1+qx371IXuV9V7bN6KjFtheLJxqaSm0Y/8neJTA==", + "dev": true, + "requires": { + "emoji-regex": "~10.1.0" + } + }, "ansi-html-community": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz", @@ -6159,9 +7481,9 @@ "dev": true }, "anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, "requires": { "normalize-path": "^3.0.0", @@ -6184,21 +7506,50 @@ "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", "dev": true }, - "array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true + "asn1.js": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", + "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", + "dev": true, + "requires": { + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "safer-buffer": "^2.1.0" + }, + "dependencies": { + "bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + } + } }, - "async": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", - "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", + "assert": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz", + "integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==", "dev": true, "requires": { - "lodash": "^4.17.14" + "es6-object-assign": "^1.1.0", + "is-nan": "^1.2.1", + "object-is": "^1.0.1", + "util": "^0.12.0" } }, + "available-typed-arrays": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", + "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", + "dev": true + }, + "bail": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz", + "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==", + "dev": true + }, "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -6212,7 +7563,7 @@ "batch": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", - "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=", + "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==", "dev": true }, "big-integer": { @@ -6257,6 +7608,16 @@ "base64-js": "^1.3.1", "ieee754": "^1.1.13" } + }, + "readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } } } }, @@ -6265,10 +7626,16 @@ "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.2.1.tgz", "integrity": "sha512-QXUSXI3QVc/gJME0dBpXrag1kbzOqCjCX8/b54ntNyW6sjtoqxqRk3LTmXzaJoh71zMsDCjM+47jS7XiwN/+fQ==" }, + "bn.js": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", + "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==", + "dev": true + }, "body-parser": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz", - "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==", + "version": "1.20.1", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", + "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", "dev": true, "requires": { "bytes": "3.1.2", @@ -6279,7 +7646,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.10.3", + "qs": "6.11.0", "raw-body": "2.5.1", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -6290,27 +7657,49 @@ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "dev": true + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, + "qs": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "dev": true, + "requires": { + "side-channel": "^1.0.4" + } } } }, - "bonjour": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", - "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", + "bonjour-service": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz", + "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==", "dev": true, "requires": { - "array-flatten": "^2.1.0", - "deep-equal": "^1.0.1", + "array-flatten": "^2.1.2", "dns-equal": "^1.0.0", - "dns-txt": "^2.0.2", - "multicast-dns": "^6.0.1", - "multicast-dns-service-types": "^1.1.0" + "fast-deep-equal": "^3.1.3", + "multicast-dns": "^7.2.5" } }, "boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", + "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", "dev": true }, "brace-expansion": { @@ -6331,16 +7720,108 @@ "fill-range": "^7.0.1" } }, + "brorand": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==", + "dev": true + }, + "browserify-aes": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", + "dev": true, + "requires": { + "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": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", + "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", + "dev": true, + "requires": { + "browserify-aes": "^1.0.4", + "browserify-des": "^1.0.0", + "evp_bytestokey": "^1.0.0" + } + }, + "browserify-des": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", + "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", + "dev": true, + "requires": { + "cipher-base": "^1.0.1", + "des.js": "^1.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" + } + }, + "browserify-rsa": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz", + "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==", + "dev": true, + "requires": { + "bn.js": "^5.0.0", + "randombytes": "^2.0.1" + } + }, + "browserify-sign": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", + "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", + "dev": true, + "requires": { + "bn.js": "^5.1.1", + "browserify-rsa": "^4.0.1", + "create-hash": "^1.2.0", + "create-hmac": "^1.1.7", + "elliptic": "^6.5.3", + "inherits": "^2.0.4", + "parse-asn1": "^5.1.5", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, + "browserify-zlib": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", + "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", + "dev": true, + "requires": { + "pako": "~1.0.5" + } + }, "browserslist": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.0.tgz", - "integrity": "sha512-UQxE0DIhRB5z/zDz9iA03BOfxaN2+GQdBYH/2WrSIWEUrnpzTPJbhqt+umq6r3acaPRTW1FNTkrcp0PXgtFkvA==", + "version": "4.21.10", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz", + "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001358", - "electron-to-chromium": "^1.4.164", - "node-releases": "^2.0.5", - "update-browserslist-db": "^1.0.0" + "caniuse-lite": "^1.0.30001517", + "electron-to-chromium": "^1.4.477", + "node-releases": "^2.0.13", + "update-browserslist-db": "^1.0.11" } }, "buffer": { @@ -6364,10 +7845,10 @@ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, - "buffer-indexof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz", - "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==", + "buffer-xor": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", + "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==", "dev": true }, "bufferutil": { @@ -6378,10 +7859,16 @@ "node-gyp-build": "^4.3.0" } }, + "builtin-status-codes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", + "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==", + "dev": true + }, "bytes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", + "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==", "dev": true }, "call-bind": { @@ -6405,9 +7892,33 @@ } }, "caniuse-lite": { - "version": "1.0.30001358", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001358.tgz", - "integrity": "sha512-hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw==", + "version": "1.0.30001519", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz", + "integrity": "sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==", + "dev": true + }, + "ccount": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz", + "integrity": "sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==", + "dev": true + }, + "character-entities": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz", + "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==", + "dev": true + }, + "character-entities-legacy": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz", + "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==", + "dev": true + }, + "character-reference-invalid": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz", + "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==", "dev": true }, "chokidar": { @@ -6437,21 +7948,25 @@ "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", "dev": true }, + "cipher-base": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", + "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", + "dev": true, + "requires": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, "clean-css": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.0.tgz", - "integrity": "sha512-YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz", + "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==", "dev": true, "requires": { "source-map": "~0.6.0" } }, - "clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true - }, "clone-deep": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", @@ -6464,9 +7979,9 @@ } }, "colorette": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz", - "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", "dev": true }, "commander": { @@ -6499,6 +8014,21 @@ "vary": "~1.1.2" }, "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -6513,9 +8043,21 @@ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, "connect-history-api-fallback": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", - "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz", + "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==", + "dev": true + }, + "console-browserify": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", + "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==", + "dev": true + }, + "constants-browserify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", + "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==", "dev": true }, "content-disposition": { @@ -6528,9 +8070,9 @@ } }, "content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", "dev": true }, "cookie": { @@ -6542,7 +8084,7 @@ "cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", "dev": true }, "core-util-is": { @@ -6551,6 +8093,51 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", "dev": true }, + "create-ecdh": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", + "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", + "dev": true, + "requires": { + "bn.js": "^4.1.0", + "elliptic": "^6.5.3" + }, + "dependencies": { + "bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + } + } + }, + "create-hash": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", + "dev": true, + "requires": { + "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": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", + "dev": true, + "requires": { + "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-fetch": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", @@ -6570,6 +8157,25 @@ "which": "^2.0.1" } }, + "crypto-browserify": { + "version": "3.12.0", + "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", + "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", + "dev": true, + "requires": { + "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" + } + }, "css-select": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", @@ -6590,26 +8196,11 @@ "dev": true }, "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-equal": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", - "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", - "dev": true, + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "requires": { - "is-arguments": "^1.0.4", - "is-date-object": "^1.0.1", - "is-regex": "^1.0.4", - "object-is": "^1.0.1", - "object-keys": "^1.1.1", - "regexp.prototype.flags": "^1.2.0" + "ms": "2.1.2" } }, "default-gateway": { @@ -6628,37 +8219,31 @@ "dev": true }, "define-properties": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", - "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", + "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", "dev": true, "requires": { "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" } }, - "del": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz", - "integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==", - "dev": true, - "requires": { - "globby": "^11.0.1", - "graceful-fs": "^4.2.4", - "is-glob": "^4.0.1", - "is-path-cwd": "^2.2.0", - "is-path-inside": "^3.0.2", - "p-map": "^4.0.0", - "rimraf": "^3.0.2", - "slash": "^3.0.0" - } - }, "depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "dev": true }, + "des.js": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz", + "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==", + "dev": true, + "requires": { + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" + } + }, "destroy": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", @@ -6672,17 +8257,27 @@ "dev": true }, "devtools-protocol": { - "version": "0.0.1011705", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1011705.tgz", - "integrity": "sha512-OKvTvu9n3swmgYshvsyVHYX0+aPzCoYUnyXUacfQMmFtBtBKewV/gT4I9jkAbpTqtTi2E4S9MXLlvzBDUlqg0Q==" + "version": "0.0.1019158", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1019158.tgz", + "integrity": "sha512-wvq+KscQ7/6spEV7czhnZc9RM/woz1AY+/Vpd8/h2HFMwJSdTliu7f/yr1A6vDdJfKICZsShqsYpEQbdhg8AFQ==" }, - "dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "diffie-hellman": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", + "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "dev": true, "requires": { - "path-type": "^4.0.0" + "bn.js": "^4.1.0", + "miller-rabin": "^4.0.0", + "randombytes": "^2.0.0" + }, + "dependencies": { + "bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + } } }, "dns-equal": { @@ -6692,22 +8287,26 @@ "dev": true }, "dns-packet": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz", - "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.0.tgz", + "integrity": "sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ==", "dev": true, "requires": { - "ip": "^1.1.0", - "safe-buffer": "^5.0.1" + "@leichtgewicht/ip-codec": "^2.0.1" } }, - "dns-txt": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz", - "integrity": "sha512-Ix5PrWjphuSoUXV/Zv5gaFHjnaJtb02F2+Si3Ht9dyJ87+Z/lMmy+dpNHtTGraNK958ndXq2i+GLkWsWHcKaBQ==", + "doctoc": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/doctoc/-/doctoc-2.2.1.tgz", + "integrity": "sha512-qNJ1gsuo7hH40vlXTVVrADm6pdg30bns/Mo7Nv1SxuXSM1bwF9b4xQ40a6EFT/L1cI+Yylbyi8MPI4G4y7XJzQ==", "dev": true, "requires": { - "buffer-indexof": "^1.0.0" + "@textlint/markdown-to-ast": "^12.1.1", + "anchor-markdown-header": "^0.6.0", + "htmlparser2": "^7.2.0", + "minimist": "^1.2.6", + "underscore": "^1.13.2", + "update-section": "^0.3.3" } }, "dom-converter": { @@ -6728,8 +8327,22 @@ "domelementtype": "^2.0.1", "domhandler": "^4.2.0", "entities": "^2.0.0" + }, + "dependencies": { + "entities": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "dev": true + } } }, + "domain-browser": { + "version": "4.22.0", + "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-4.22.0.tgz", + "integrity": "sha512-IGBwjF7tNk3cwypFNH/7bfzBcgSCbaMOD3GsaY1AU/JRrnHnYgEM0+9kQt52iZxjNsjBtJYtao146V+f8jFZNw==", + "dev": true + }, "domelementtype": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", @@ -6773,9 +8386,38 @@ "dev": true }, "electron-to-chromium": { - "version": "1.4.167", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.167.tgz", - "integrity": "sha512-lPHuHXBwpkr4RcfaZBKm6TKOWG/1N9mVggUpP4fY3l1JIUU2x4fkM8928smYdZ5lF+6KCTAxo1aK9JmqT+X71Q==", + "version": "1.4.490", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.490.tgz", + "integrity": "sha512-6s7NVJz+sATdYnIwhdshx/N/9O6rvMxmhVoDSDFdj6iA45gHR8EQje70+RYsF4GeB+k0IeNSBnP7yG9ZXJFr7A==", + "dev": true + }, + "elliptic": { + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", + "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", + "dev": true, + "requires": { + "bn.js": "^4.11.9", + "brorand": "^1.1.0", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.1", + "inherits": "^2.0.4", + "minimalistic-assert": "^1.0.1", + "minimalistic-crypto-utils": "^1.0.1" + }, + "dependencies": { + "bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + } + } + }, + "emoji-regex": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.1.0.tgz", + "integrity": "sha512-xAEnNCT3w2Tg6MA7ly6QqYJvEoY1tm9iIjJ3yMKK9JPlWuRHAMoe5iETwQnx3M9TVbFMfsrBgWKR+IsmswwNjg==", "dev": true }, "encodeurl": { @@ -6793,9 +8435,9 @@ } }, "enhanced-resolve": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz", - "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", "dev": true, "requires": { "graceful-fs": "^4.2.4", @@ -6803,21 +8445,27 @@ } }, "entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz", + "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==", "dev": true }, "envinfo": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz", - "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.10.0.tgz", + "integrity": "sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==", "dev": true }, "es-module-lexer": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", - "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz", + "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==", + "dev": true + }, + "es6-object-assign": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz", + "integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==", "dev": true }, "esbuild": { @@ -6878,6 +8526,12 @@ "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", "dev": true }, + "escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true + }, "eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -6917,6 +8571,12 @@ "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", "dev": true }, + "event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", + "dev": true + }, "eventemitter3": { "version": "4.0.7", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", @@ -6929,6 +8589,16 @@ "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", "dev": true }, + "evp_bytestokey": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", + "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", + "dev": true, + "requires": { + "md5.js": "^1.3.4", + "safe-buffer": "^5.1.1" + } + }, "execa": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", @@ -6944,17 +8614,25 @@ "onetime": "^5.1.2", "signal-exit": "^3.0.3", "strip-final-newline": "^2.0.0" + }, + "dependencies": { + "get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true + } } }, "express": { - "version": "4.18.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz", - "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==", + "version": "4.18.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", + "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", "dev": true, "requires": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.0", + "body-parser": "1.20.1", "content-disposition": "0.5.4", "content-type": "~1.0.4", "cookie": "0.5.0", @@ -6973,7 +8651,7 @@ "parseurl": "~1.3.3", "path-to-regexp": "0.1.7", "proxy-addr": "~2.0.7", - "qs": "6.10.3", + "qs": "6.11.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", "send": "0.18.0", @@ -6990,9 +8668,39 @@ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", "dev": true + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, + "qs": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "dev": true, + "requires": { + "side-channel": "^1.0.4" + } } } }, + "extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "dev": true + }, "extract-zip": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", @@ -7002,29 +8710,6 @@ "debug": "^4.1.1", "get-stream": "^5.1.0", "yauzl": "^2.10.0" - }, - "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "requires": { - "ms": "2.1.2" - } - }, - "get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "requires": { - "pump": "^3.0.0" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - } } }, "fast-deep-equal": { @@ -7033,19 +8718,6 @@ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, - "fast-glob": { - "version": "3.2.11", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", - "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - } - }, "fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", @@ -7053,18 +8725,18 @@ "dev": true }, "fastest-levenshtein": { - "version": "1.0.14", - "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.14.tgz", - "integrity": "sha512-tFfWHjnuUfKE186Tfgr+jtaFc0mZTApEgKDOeyN+FwOqRkO/zK/3h1AiRd8u8CY53owL3CUmGr/oI9p/RdyLTA==", + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", + "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", "dev": true }, - "fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", + "fault": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz", + "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==", "dev": true, "requires": { - "reusify": "^1.0.4" + "format": "^0.2.0" } }, "faye-websocket": { @@ -7093,6 +8765,12 @@ "to-regex-range": "^5.0.1" } }, + "filter-obj": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-2.0.2.tgz", + "integrity": "sha512-lO3ttPjHZRfjMcxWKb1j1eDhTFsu4meeR3lnMcnBFhk6RuLhvEiuALu2TlfL310ph4lCYYwgF/ElIjdP739tdg==", + "dev": true + }, "finalhandler": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", @@ -7106,6 +8784,23 @@ "parseurl": "~1.3.3", "statuses": "2.0.1", "unpipe": "~1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + } } }, "find-up": { @@ -7118,9 +8813,24 @@ } }, "follow-redirects": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", - "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "dev": true + }, + "for-each": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", + "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "dev": true, + "requires": { + "is-callable": "^1.1.3" + } + }, + "format": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz", + "integrity": "sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==", "dev": true }, "forwarded": { @@ -7141,9 +8851,9 @@ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" }, "fs-monkey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz", - "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.4.tgz", + "integrity": "sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==", "dev": true }, "fs.realpath": { @@ -7164,28 +8874,25 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, - "functions-have-names": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", - "dev": true - }, "get-intrinsic": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", + "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", "dev": true, "requires": { "function-bind": "^1.1.1", "has": "^1.0.3", - "has-symbols": "^1.0.1" + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3" } }, "get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "requires": { + "pump": "^3.0.0" + } }, "glob": { "version": "7.2.3", @@ -7215,24 +8922,19 @@ "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", "dev": true }, - "globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", "dev": true, "requires": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" + "get-intrinsic": "^1.1.3" } }, "graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true }, "handle-thing": { @@ -7265,6 +8967,12 @@ "get-intrinsic": "^1.1.1" } }, + "has-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "dev": true + }, "has-symbols": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", @@ -7280,12 +8988,57 @@ "has-symbols": "^1.0.2" } }, + "hash-base": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz", + "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", + "dev": true, + "requires": { + "inherits": "^2.0.4", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, + "hash.js": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", + "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" + } + }, "he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true }, + "hmac-drbg": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", + "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", + "dev": true, + "requires": { + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" + } + }, "hpack.js": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", @@ -7299,9 +9052,9 @@ }, "dependencies": { "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, "requires": { "core-util-is": "~1.0.0", @@ -7331,9 +9084,9 @@ } }, "html-entities": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz", - "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz", + "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==", "dev": true }, "html-minifier-terser": { @@ -7352,9 +9105,9 @@ } }, "html-webpack-plugin": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz", - "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==", + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz", + "integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==", "dev": true, "requires": { "@types/html-minifier-terser": "^6.0.0", @@ -7365,15 +9118,15 @@ } }, "htmlparser2": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", - "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz", + "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==", "dev": true, "requires": { "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", - "domutils": "^2.5.2", - "entities": "^2.0.0" + "domhandler": "^4.2.2", + "domutils": "^2.8.0", + "entities": "^3.0.1" } }, "http-deceiver": { @@ -7396,9 +9149,9 @@ } }, "http-parser-js": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz", - "integrity": "sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA==", + "version": "0.5.8", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz", + "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==", "dev": true }, "http-proxy": { @@ -7423,8 +9176,22 @@ "is-glob": "^4.0.1", "is-plain-obj": "^3.0.0", "micromatch": "^4.0.2" + }, + "dependencies": { + "is-plain-obj": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", + "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", + "dev": true + } } }, + "https-browserify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", + "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==", + "dev": true + }, "https-proxy-agent": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", @@ -7432,21 +9199,6 @@ "requires": { "agent-base": "6", "debug": "4" - }, - "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - } } }, "human-signals": { @@ -7469,12 +9221,6 @@ "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" }, - "ignore": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", - "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", - "dev": true - }, "import-local": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", @@ -7491,12 +9237,6 @@ "integrity": "sha512-4IwhLhNNA8yy445rPjD/lWh++7hMDOml2eHtd58eG7h+qK3EryMuuRbsHGPikCoAgIkkDnckKfWSk2iDla/ejg==", "dev": true }, - "indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true - }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -7512,23 +9252,33 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "interpret": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz", - "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz", + "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==", "dev": true }, - "ip": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz", - "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==", + "ipaddr.js": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz", + "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==", "dev": true }, - "ipaddr.js": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz", - "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==", + "is-alphabetical": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz", + "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==", "dev": true }, + "is-alphanumerical": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz", + "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==", + "dev": true, + "requires": { + "is-alphabetical": "^1.0.0", + "is-decimal": "^1.0.0" + } + }, "is-arguments": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", @@ -7548,23 +9298,32 @@ "binary-extensions": "^2.0.0" } }, + "is-buffer": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", + "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", + "dev": true + }, + "is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "dev": true + }, "is-core-module": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", - "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", + "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", "dev": true, "requires": { "has": "^1.0.3" } }, - "is-date-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", - "dev": true, - "requires": { - "has-tostringtag": "^1.0.0" - } + "is-decimal": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz", + "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==", + "dev": true }, "is-docker": { "version": "2.2.1", @@ -7578,6 +9337,15 @@ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "dev": true }, + "is-generator-function": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", + "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", + "dev": true, + "requires": { + "has-tostringtag": "^1.0.0" + } + }, "is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", @@ -7587,28 +9355,32 @@ "is-extglob": "^2.1.1" } }, + "is-hexadecimal": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz", + "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==", + "dev": true + }, + "is-nan": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz", + "integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3" + } + }, "is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true }, - "is-path-cwd": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", - "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==", - "dev": true - }, - "is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true - }, "is-plain-obj": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", - "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", "dev": true }, "is-plain-object": { @@ -7620,22 +9392,21 @@ "isobject": "^3.0.1" } }, - "is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - } - }, "is-stream": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "dev": true }, + "is-typed-array": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", + "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", + "dev": true, + "requires": { + "which-typed-array": "^1.1.11" + } + }, "is-wsl": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", @@ -7674,10 +9445,10 @@ "supports-color": "^8.0.0" } }, - "json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", "dev": true }, "json-schema-traverse": { @@ -7697,6 +9468,16 @@ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true }, + "launch-editor": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz", + "integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==", + "dev": true, + "requires": { + "picocolors": "^1.0.0", + "shell-quote": "^1.7.3" + } + }, "loader-runner": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", @@ -7717,6 +9498,12 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, + "longest-streak": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz", + "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==", + "dev": true + }, "lower-case": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", @@ -7726,6 +9513,141 @@ "tslib": "^2.0.3" } }, + "markdown-table": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz", + "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==", + "dev": true, + "requires": { + "repeat-string": "^1.0.0" + } + }, + "md5.js": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", + "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", + "dev": true, + "requires": { + "hash-base": "^3.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" + } + }, + "mdast-util-find-and-replace": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-1.1.1.tgz", + "integrity": "sha512-9cKl33Y21lyckGzpSmEQnIDjEfeeWelN5s1kUW1LwdB0Fkuq2u+4GdqcGEygYxJE8GVqCl0741bYXHgamfWAZA==", + "dev": true, + "requires": { + "escape-string-regexp": "^4.0.0", + "unist-util-is": "^4.0.0", + "unist-util-visit-parents": "^3.0.0" + } + }, + "mdast-util-footnote": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/mdast-util-footnote/-/mdast-util-footnote-0.1.7.tgz", + "integrity": "sha512-QxNdO8qSxqbO2e3m09KwDKfWiLgqyCurdWTQ198NpbZ2hxntdc+VKS4fDJCmNWbAroUdYnSthu+XbZ8ovh8C3w==", + "dev": true, + "requires": { + "mdast-util-to-markdown": "^0.6.0", + "micromark": "~2.11.0" + } + }, + "mdast-util-from-markdown": { + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz", + "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==", + "dev": true, + "requires": { + "@types/mdast": "^3.0.0", + "mdast-util-to-string": "^2.0.0", + "micromark": "~2.11.0", + "parse-entities": "^2.0.0", + "unist-util-stringify-position": "^2.0.0" + } + }, + "mdast-util-frontmatter": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/mdast-util-frontmatter/-/mdast-util-frontmatter-0.2.0.tgz", + "integrity": "sha512-FHKL4w4S5fdt1KjJCwB0178WJ0evnyyQr5kXTM3wrOVpytD0hrkvd+AOOjU9Td8onOejCkmZ+HQRT3CZ3coHHQ==", + "dev": true, + "requires": { + "micromark-extension-frontmatter": "^0.2.0" + } + }, + "mdast-util-gfm": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-0.1.2.tgz", + "integrity": "sha512-NNkhDx/qYcuOWB7xHUGWZYVXvjPFFd6afg6/e2g+SV4r9q5XUcCbV4Wfa3DLYIiD+xAEZc6K4MGaE/m0KDcPwQ==", + "dev": true, + "requires": { + "mdast-util-gfm-autolink-literal": "^0.1.0", + "mdast-util-gfm-strikethrough": "^0.2.0", + "mdast-util-gfm-table": "^0.1.0", + "mdast-util-gfm-task-list-item": "^0.1.0", + "mdast-util-to-markdown": "^0.6.1" + } + }, + "mdast-util-gfm-autolink-literal": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-0.1.3.tgz", + "integrity": "sha512-GjmLjWrXg1wqMIO9+ZsRik/s7PLwTaeCHVB7vRxUwLntZc8mzmTsLVr6HW1yLokcnhfURsn5zmSVdi3/xWWu1A==", + "dev": true, + "requires": { + "ccount": "^1.0.0", + "mdast-util-find-and-replace": "^1.1.0", + "micromark": "^2.11.3" + } + }, + "mdast-util-gfm-strikethrough": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-0.2.3.tgz", + "integrity": "sha512-5OQLXpt6qdbttcDG/UxYY7Yjj3e8P7X16LzvpX8pIQPYJ/C2Z1qFGMmcw+1PZMUM3Z8wt8NRfYTvCni93mgsgA==", + "dev": true, + "requires": { + "mdast-util-to-markdown": "^0.6.0" + } + }, + "mdast-util-gfm-table": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-0.1.6.tgz", + "integrity": "sha512-j4yDxQ66AJSBwGkbpFEp9uG/LS1tZV3P33fN1gkyRB2LoRL+RR3f76m0HPHaby6F4Z5xr9Fv1URmATlRRUIpRQ==", + "dev": true, + "requires": { + "markdown-table": "^2.0.0", + "mdast-util-to-markdown": "~0.6.0" + } + }, + "mdast-util-gfm-task-list-item": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-0.1.6.tgz", + "integrity": "sha512-/d51FFIfPsSmCIRNp7E6pozM9z1GYPIkSy1urQ8s/o4TC22BZ7DqfHFWiqBD23bc7J3vV1Fc9O4QIHBlfuit8A==", + "dev": true, + "requires": { + "mdast-util-to-markdown": "~0.6.0" + } + }, + "mdast-util-to-markdown": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz", + "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==", + "dev": true, + "requires": { + "@types/unist": "^2.0.0", + "longest-streak": "^2.0.0", + "mdast-util-to-string": "^2.0.0", + "parse-entities": "^2.0.0", + "repeat-string": "^1.0.0", + "zwitch": "^1.0.0" + } + }, + "mdast-util-to-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz", + "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==", + "dev": true + }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -7733,12 +9655,12 @@ "dev": true }, "memfs": { - "version": "3.4.6", - "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.6.tgz", - "integrity": "sha512-rH9mjopto6Wkr7RFuH9l9dk3qb2XGOcYKr7xMhaYqfzuJqOqhRrcFvfD7JMuPj6SLmPreh5+6eAuv36NFAU+Mw==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz", + "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==", "dev": true, "requires": { - "fs-monkey": "^1.0.3" + "fs-monkey": "^1.0.4" } }, "merge-descriptors": { @@ -7753,18 +9675,96 @@ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", "dev": true }, - "merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true - }, "methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", "dev": true }, + "micromark": { + "version": "2.11.4", + "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz", + "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==", + "dev": true, + "requires": { + "debug": "^4.0.0", + "parse-entities": "^2.0.0" + } + }, + "micromark-extension-footnote": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/micromark-extension-footnote/-/micromark-extension-footnote-0.3.2.tgz", + "integrity": "sha512-gr/BeIxbIWQoUm02cIfK7mdMZ/fbroRpLsck4kvFtjbzP4yi+OPVbnukTc/zy0i7spC2xYE/dbX1Sur8BEDJsQ==", + "dev": true, + "requires": { + "micromark": "~2.11.0" + } + }, + "micromark-extension-frontmatter": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/micromark-extension-frontmatter/-/micromark-extension-frontmatter-0.2.2.tgz", + "integrity": "sha512-q6nPLFCMTLtfsctAuS0Xh4vaolxSFUWUWR6PZSrXXiRy+SANGllpcqdXFv2z07l0Xz/6Hl40hK0ffNCJPH2n1A==", + "dev": true, + "requires": { + "fault": "^1.0.0" + } + }, + "micromark-extension-gfm": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-0.3.3.tgz", + "integrity": "sha512-oVN4zv5/tAIA+l3GbMi7lWeYpJ14oQyJ3uEim20ktYFAcfX1x3LNlFGGlmrZHt7u9YlKExmyJdDGaTt6cMSR/A==", + "dev": true, + "requires": { + "micromark": "~2.11.0", + "micromark-extension-gfm-autolink-literal": "~0.5.0", + "micromark-extension-gfm-strikethrough": "~0.6.5", + "micromark-extension-gfm-table": "~0.4.0", + "micromark-extension-gfm-tagfilter": "~0.3.0", + "micromark-extension-gfm-task-list-item": "~0.3.0" + } + }, + "micromark-extension-gfm-autolink-literal": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-0.5.7.tgz", + "integrity": "sha512-ePiDGH0/lhcngCe8FtH4ARFoxKTUelMp4L7Gg2pujYD5CSMb9PbblnyL+AAMud/SNMyusbS2XDSiPIRcQoNFAw==", + "dev": true, + "requires": { + "micromark": "~2.11.3" + } + }, + "micromark-extension-gfm-strikethrough": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-0.6.5.tgz", + "integrity": "sha512-PpOKlgokpQRwUesRwWEp+fHjGGkZEejj83k9gU5iXCbDG+XBA92BqnRKYJdfqfkrRcZRgGuPuXb7DaK/DmxOhw==", + "dev": true, + "requires": { + "micromark": "~2.11.0" + } + }, + "micromark-extension-gfm-table": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-0.4.3.tgz", + "integrity": "sha512-hVGvESPq0fk6ALWtomcwmgLvH8ZSVpcPjzi0AjPclB9FsVRgMtGZkUcpE0zgjOCFAznKepF4z3hX8z6e3HODdA==", + "dev": true, + "requires": { + "micromark": "~2.11.0" + } + }, + "micromark-extension-gfm-tagfilter": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-0.3.0.tgz", + "integrity": "sha512-9GU0xBatryXifL//FJH+tAZ6i240xQuFrSL7mYi8f4oZSbc+NvXjkrHemeYP0+L4ZUT+Ptz3b95zhUZnMtoi/Q==", + "dev": true + }, + "micromark-extension-gfm-task-list-item": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-0.3.3.tgz", + "integrity": "sha512-0zvM5iSLKrc/NQl84pZSjGo66aTGd57C1idmlWmE87lkMcXrTxg1uXa/nXomxJytoje9trP0NDLvw4bZ/Z/XCQ==", + "dev": true, + "requires": { + "micromark": "~2.11.0" + } + }, "micromatch": { "version": "4.0.5", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", @@ -7775,6 +9775,24 @@ "picomatch": "^2.3.1" } }, + "miller-rabin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", + "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", + "dev": true, + "requires": { + "bn.js": "^4.0.0", + "brorand": "^1.0.1" + }, + "dependencies": { + "bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + } + } + }, "mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", @@ -7808,6 +9826,12 @@ "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", "dev": true }, + "minimalistic-crypto-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", + "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==", + "dev": true + }, "minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -7817,47 +9841,31 @@ } }, "minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", "dev": true }, - "mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "requires": { - "minimist": "^1.2.6" - } - }, "mkdirp-classic": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" }, "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "multicast-dns": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz", - "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==", + "version": "7.2.5", + "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz", + "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==", "dev": true, "requires": { - "dns-packet": "^1.3.1", + "dns-packet": "^5.2.2", "thunky": "^1.0.2" } }, - "multicast-dns-service-types": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", - "integrity": "sha512-cnAsSVxIDsYt0v7HmC0hWZFwwXSh+E6PgCrREDuN/EsjgLwA5XRmlMHhSiDPrt6HxY1gTivEa/Zh7GtODoLevQ==", - "dev": true - }, "negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", @@ -7886,27 +9894,6 @@ "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", "requires": { "whatwg-url": "^5.0.0" - }, - "dependencies": { - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - } } }, "node-forge": { @@ -7916,14 +9903,47 @@ "dev": true }, "node-gyp-build": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.4.0.tgz", - "integrity": "sha512-amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ==" + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz", + "integrity": "sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==" + }, + "node-polyfill-webpack-plugin": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/node-polyfill-webpack-plugin/-/node-polyfill-webpack-plugin-2.0.1.tgz", + "integrity": "sha512-ZUMiCnZkP1LF0Th2caY6J/eKKoA0TefpoVa68m/LQU1I/mE8rGt4fNYGgNuCcK+aG8P8P43nbeJ2RqJMOL/Y1A==", + "dev": true, + "requires": { + "assert": "^2.0.0", + "browserify-zlib": "^0.2.0", + "buffer": "^6.0.3", + "console-browserify": "^1.2.0", + "constants-browserify": "^1.0.0", + "crypto-browserify": "^3.12.0", + "domain-browser": "^4.22.0", + "events": "^3.3.0", + "filter-obj": "^2.0.2", + "https-browserify": "^1.0.0", + "os-browserify": "^0.3.0", + "path-browserify": "^1.0.1", + "process": "^0.11.10", + "punycode": "^2.1.1", + "querystring-es3": "^0.2.1", + "readable-stream": "^4.0.0", + "stream-browserify": "^3.0.0", + "stream-http": "^3.2.0", + "string_decoder": "^1.3.0", + "timers-browserify": "^2.0.12", + "tty-browserify": "^0.0.1", + "type-fest": "^2.14.0", + "url": "^0.11.0", + "util": "^0.12.4", + "vm-browserify": "^1.1.2" + } }, "node-releases": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz", - "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==", + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", + "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", "dev": true }, "normalize-path": { @@ -7951,9 +9971,9 @@ } }, "object-inspect": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.1.tgz", - "integrity": "sha512-Y/jF6vnvEtOPGiKD1+q+X0CiUYRQtEHp89MLLUJ7TUivtH8Ugn2+3A7Rynqk7BRsAoqeOQWnFnjpDrKSxDgIGA==", + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", "dev": true }, "object-is": { @@ -8011,9 +10031,9 @@ } }, "open": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz", - "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", + "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", "dev": true, "requires": { "define-lazy-prop": "^2.0.0", @@ -8021,6 +10041,12 @@ "is-wsl": "^2.2.0" } }, + "os-browserify": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", + "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==", + "dev": true + }, "p-limit": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", @@ -8037,15 +10063,6 @@ "p-limit": "^2.2.0" } }, - "p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "requires": { - "aggregate-error": "^3.0.0" - } - }, "p-retry": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz", @@ -8061,6 +10078,12 @@ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" }, + "pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "dev": true + }, "param-case": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", @@ -8071,6 +10094,33 @@ "tslib": "^2.0.3" } }, + "parse-asn1": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", + "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", + "dev": true, + "requires": { + "asn1.js": "^5.2.0", + "browserify-aes": "^1.0.0", + "evp_bytestokey": "^1.0.0", + "pbkdf2": "^3.0.3", + "safe-buffer": "^5.1.1" + } + }, + "parse-entities": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", + "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==", + "dev": true, + "requires": { + "character-entities": "^1.0.0", + "character-entities-legacy": "^1.0.0", + "character-reference-invalid": "^1.0.0", + "is-alphanumerical": "^1.0.0", + "is-decimal": "^1.0.0", + "is-hexadecimal": "^1.0.0" + } + }, "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -8087,6 +10137,12 @@ "tslib": "^2.0.3" } }, + "path-browserify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", + "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==", + "dev": true + }, "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -8115,11 +10171,18 @@ "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", "dev": true }, - "path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true + "pbkdf2": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", + "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==", + "dev": true, + "requires": { + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4", + "ripemd160": "^2.0.1", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" + } }, "pend": { "version": "1.2.0", @@ -8143,35 +10206,7 @@ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "requires": { - "find-up": "^4.0.0" - } - }, - "portfinder": { - "version": "1.0.28", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", - "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==", - "dev": true, - "requires": { - "async": "^2.6.2", - "debug": "^3.1.1", - "mkdirp": "^0.5.5" - }, - "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true - } + "find-up": "^4.0.0" } }, "pretty-error": { @@ -8184,6 +10219,12 @@ "renderkid": "^3.0.0" } }, + "process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", + "dev": true + }, "process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -8218,6 +10259,28 @@ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" }, + "public-encrypt": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", + "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", + "dev": true, + "requires": { + "bn.js": "^4.1.0", + "browserify-rsa": "^4.0.0", + "create-hash": "^1.1.0", + "parse-asn1": "^5.0.0", + "randombytes": "^2.0.1", + "safe-buffer": "^5.1.2" + }, + "dependencies": { + "bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + } + } + }, "pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", @@ -8228,19 +10291,19 @@ } }, "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", "dev": true }, "puppeteer-core": { - "version": "15.3.2", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-15.3.2.tgz", - "integrity": "sha512-Fmca9UzXmJkRrvGBgUmrffGD2BlulUTfsVefV1+vqfNm4PnlZ/U1bfD6X8XQ0nftyyg520tmSKd81yH3Z2tszg==", + "version": "15.5.0", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-15.5.0.tgz", + "integrity": "sha512-5Q8EmF++MARczJD1JcRehVePlctxGG2TFHSxdCV8NqPOk44/cMySmZw2nETn+lwUOyp0L9afosMFTnT4KgmWgw==", "requires": { "cross-fetch": "3.1.5", "debug": "4.3.4", - "devtools-protocol": "0.0.1011705", + "devtools-protocol": "0.0.1019158", "extract-zip": "2.0.1", "https-proxy-agent": "5.0.1", "pkg-dir": "4.2.0", @@ -8252,19 +10315,6 @@ "ws": "8.8.0" }, "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, "ws": { "version": "8.8.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz", @@ -8274,18 +10324,18 @@ } }, "qs": { - "version": "6.10.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz", - "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==", + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", + "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==", "dev": true, "requires": { "side-channel": "^1.0.4" } }, - "queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "querystring-es3": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", + "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==", "dev": true }, "randombytes": { @@ -8297,6 +10347,16 @@ "safe-buffer": "^5.1.0" } }, + "randomfill": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", + "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", + "dev": true, + "requires": { + "randombytes": "^2.0.5", + "safe-buffer": "^5.1.0" + } + }, "range-parser": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", @@ -8324,13 +10384,16 @@ } }, "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.2.tgz", + "integrity": "sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==", + "dev": true, "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "abort-controller": "^3.0.0", + "buffer": "^6.0.3", + "events": "^3.3.0", + "process": "^0.11.10", + "string_decoder": "^1.3.0" } }, "readdirp": { @@ -8343,12 +10406,12 @@ } }, "rechoir": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", - "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz", + "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==", "dev": true, "requires": { - "resolve": "^1.9.0" + "resolve": "^1.20.0" } }, "reconnecting-websocket": { @@ -8356,23 +10419,51 @@ "resolved": "https://registry.npmjs.org/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz", "integrity": "sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng==" }, - "regexp.prototype.flags": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", - "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "functions-have-names": "^1.2.2" - } - }, "relateurl": { "version": "0.2.7", "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==", "dev": true }, + "remark-footnotes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/remark-footnotes/-/remark-footnotes-3.0.0.tgz", + "integrity": "sha512-ZssAvH9FjGYlJ/PBVKdSmfyPc3Cz4rTWgZLI4iE/SX8Nt5l3o3oEjv3wwG5VD7xOjktzdwp5coac+kJV9l4jgg==", + "dev": true, + "requires": { + "mdast-util-footnote": "^0.1.0", + "micromark-extension-footnote": "^0.3.0" + } + }, + "remark-frontmatter": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-3.0.0.tgz", + "integrity": "sha512-mSuDd3svCHs+2PyO29h7iijIZx4plX0fheacJcAoYAASfgzgVIcXGYSq9GFyYocFLftQs8IOmmkgtOovs6d4oA==", + "dev": true, + "requires": { + "mdast-util-frontmatter": "^0.2.0", + "micromark-extension-frontmatter": "^0.2.0" + } + }, + "remark-gfm": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-1.0.0.tgz", + "integrity": "sha512-KfexHJCiqvrdBZVbQ6RopMZGwaXz6wFJEfByIuEwGf0arvITHjiKKZ1dpXujjH9KZdm1//XJQwgfnJ3lmXaDPA==", + "dev": true, + "requires": { + "mdast-util-gfm": "^0.1.0", + "micromark-extension-gfm": "^0.3.0" + } + }, + "remark-parse": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz", + "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==", + "dev": true, + "requires": { + "mdast-util-from-markdown": "^0.8.0" + } + }, "renderkid": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz", @@ -8384,8 +10475,34 @@ "htmlparser2": "^6.1.0", "lodash": "^4.17.21", "strip-ansi": "^6.0.1" + }, + "dependencies": { + "entities": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "dev": true + }, + "htmlparser2": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", + "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", + "dev": true, + "requires": { + "domelementtype": "^2.0.1", + "domhandler": "^4.0.0", + "domutils": "^2.5.2", + "entities": "^2.0.0" + } + } } }, + "repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==", + "dev": true + }, "require-from-string": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", @@ -8399,12 +10516,12 @@ "dev": true }, "resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "version": "1.22.4", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz", + "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==", "dev": true, "requires": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" } @@ -8430,12 +10547,6 @@ "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", "dev": true }, - "reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true - }, "rimraf": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", @@ -8444,13 +10555,14 @@ "glob": "^7.1.3" } }, - "run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "ripemd160": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", + "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", "dev": true, "requires": { - "queue-microtask": "^1.2.2" + "hash-base": "^3.0.0", + "inherits": "^2.0.1" } }, "safe-buffer": { @@ -8465,9 +10577,9 @@ "dev": true }, "schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "requires": { "@types/json-schema": "^7.0.8", @@ -8482,9 +10594,9 @@ "dev": true }, "selfsigned": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.1.tgz", - "integrity": "sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz", + "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==", "dev": true, "requires": { "node-forge": "^1" @@ -8511,6 +10623,23 @@ "statuses": "2.0.1" }, "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + } + } + }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -8520,9 +10649,9 @@ } }, "serialize-javascript": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", + "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", "dev": true, "requires": { "randombytes": "^2.1.0" @@ -8543,6 +10672,15 @@ "parseurl": "~1.3.2" }, "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -8567,6 +10705,12 @@ "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", "dev": true }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, "setprototypeof": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", @@ -8593,12 +10737,28 @@ "send": "0.18.0" } }, + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", + "dev": true + }, "setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", "dev": true }, + "sha.js": { + "version": "2.4.11", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", + "dev": true, + "requires": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, "shallow-clone": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", @@ -8623,6 +10783,12 @@ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true }, + "shell-quote": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", + "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", + "dev": true + }, "side-channel": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", @@ -8640,12 +10806,6 @@ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, "sockjs": { "version": "0.3.24", "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz", @@ -8684,23 +10844,6 @@ "http-deceiver": "^1.2.7", "select-hose": "^2.0.0", "spdy-transport": "^3.0.0" - }, - "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } } }, "spdy-transport": { @@ -8717,20 +10860,16 @@ "wbuf": "^1.7.3" }, "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, "requires": { - "ms": "2.1.2" + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true } } }, @@ -8740,6 +10879,54 @@ "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", "dev": true }, + "stream-browserify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz", + "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==", + "dev": true, + "requires": { + "inherits": "~2.0.4", + "readable-stream": "^3.5.0" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, + "stream-http": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz", + "integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==", + "dev": true, + "requires": { + "builtin-status-codes": "^3.0.0", + "inherits": "^2.0.4", + "readable-stream": "^3.6.0", + "xtend": "^4.0.2" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, "string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", @@ -8805,16 +10992,28 @@ "fs-constants": "^1.0.0", "inherits": "^2.0.3", "readable-stream": "^3.1.1" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } } }, "terser": { - "version": "5.15.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz", - "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==", + "version": "5.19.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz", + "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==", "dev": true, "requires": { - "@jridgewell/source-map": "^0.3.2", - "acorn": "^8.5.0", + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", "commander": "^2.20.0", "source-map-support": "~0.5.20" }, @@ -8828,16 +11027,16 @@ } }, "terser-webpack-plugin": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz", - "integrity": "sha512-Fx60G5HNYknNTNQnzQ1VePRuu89ZVYWfjRAeT5rITuCY/1b08s49e5kSQwHDirKZWuoKOBRFS98EUUoZ9kLEwQ==", + "version": "5.3.9", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz", + "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==", "dev": true, "requires": { - "@jridgewell/trace-mapping": "^0.3.7", + "@jridgewell/trace-mapping": "^0.3.17", "jest-worker": "^27.4.5", "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.0", - "terser": "^5.7.2" + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" } }, "through": { @@ -8851,6 +11050,15 @@ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", "dev": true }, + "timers-browserify": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz", + "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==", + "dev": true, + "requires": { + "setimmediate": "^1.0.4" + } + }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -8866,10 +11074,39 @@ "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "dev": true }, + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, + "traverse": { + "version": "0.6.7", + "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.7.tgz", + "integrity": "sha512-/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg==", + "dev": true + }, + "trough": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz", + "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==", + "dev": true + }, "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", + "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", + "dev": true + }, + "tty-browserify": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz", + "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==", + "dev": true + }, + "type-fest": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", + "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", "dev": true }, "type-is": { @@ -8902,11 +11139,56 @@ } } }, + "underscore": { + "version": "1.13.6", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz", + "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==", + "dev": true + }, + "unified": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz", + "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==", + "dev": true, + "requires": { + "bail": "^1.0.0", + "extend": "^3.0.0", + "is-buffer": "^2.0.0", + "is-plain-obj": "^2.0.0", + "trough": "^1.0.0", + "vfile": "^4.0.0" + } + }, "uniqid": { "version": "5.4.0", "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-5.4.0.tgz", "integrity": "sha512-38JRbJ4Fj94VmnC7G/J/5n5SC7Ab46OM5iNtSstB/ko3l1b5g7ALt4qzHFgGciFkyiRNtDXtLNb+VsxtMSE77A==" }, + "unist-util-is": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz", + "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==", + "dev": true + }, + "unist-util-stringify-position": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz", + "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==", + "dev": true, + "requires": { + "@types/unist": "^2.0.2" + } + }, + "unist-util-visit-parents": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz", + "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==", + "dev": true, + "requires": { + "@types/unist": "^2.0.0", + "unist-util-is": "^4.0.0" + } + }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -8914,15 +11196,21 @@ "dev": true }, "update-browserslist-db": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.3.tgz", - "integrity": "sha512-ufSazemeh9Gty0qiWtoRpJ9F5Q5W3xdIPm1UZQqYQv/q0Nyb9EMHUB2lu+O9x1re9WsorpMAUu4Y6Lxcs5n+XQ==", + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", + "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", "dev": true, "requires": { "escalade": "^3.1.1", "picocolors": "^1.0.0" } }, + "update-section": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/update-section/-/update-section-0.3.3.tgz", + "integrity": "sha512-BpRZMZpgXLuTiKeiu7kK0nIPwGdyrqrs6EDSaXtjD/aQ2T+qVo9a5hRC3HN3iJjCMxNT/VxoLGQ7E/OzE5ucnw==", + "dev": true + }, "uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -8932,6 +11220,37 @@ "punycode": "^2.1.0" } }, + "url": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.1.tgz", + "integrity": "sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==", + "dev": true, + "requires": { + "punycode": "^1.4.1", + "qs": "^6.11.0" + }, + "dependencies": { + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", + "dev": true + } + } + }, + "util": { + "version": "0.12.5", + "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", + "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "is-arguments": "^1.0.4", + "is-generator-function": "^1.0.7", + "is-typed-array": "^1.1.3", + "which-typed-array": "^1.1.2" + } + }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -8961,10 +11280,38 @@ "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", "dev": true }, + "vfile": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz", + "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==", + "dev": true, + "requires": { + "@types/unist": "^2.0.0", + "is-buffer": "^2.0.0", + "unist-util-stringify-position": "^2.0.0", + "vfile-message": "^2.0.0" + } + }, + "vfile-message": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz", + "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==", + "dev": true, + "requires": { + "@types/unist": "^2.0.0", + "unist-util-stringify-position": "^2.0.0" + } + }, + "vm-browserify": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", + "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==", + "dev": true + }, "watchpack": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz", - "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", + "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", "dev": true, "requires": { "glob-to-regexp": "^0.4.1", @@ -8980,62 +11327,68 @@ "minimalistic-assert": "^1.0.0" } }, + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, "webpack": { - "version": "5.67.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.67.0.tgz", - "integrity": "sha512-LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw==", - "dev": true, - "requires": { - "@types/eslint-scope": "^3.7.0", - "@types/estree": "^0.0.50", - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/wasm-edit": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "acorn": "^8.4.1", - "acorn-import-assertions": "^1.7.6", + "version": "5.88.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.1.tgz", + "integrity": "sha512-FROX3TxQnC/ox4N+3xQoWZzvGXSuscxR32rbzjpXgEzWudJFEJBpdlkkob2ylrv5yzzufD1zph1OoFsLtm6stQ==", + "dev": true, + "requires": { + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.8.3", - "es-module-lexer": "^0.9.0", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.2.9", - "json-parse-better-errors": "^1.0.2", + "json-parse-even-better-errors": "^2.3.1", "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", - "schema-utils": "^3.1.0", + "schema-utils": "^3.2.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.1.3", - "watchpack": "^2.3.1", + "terser-webpack-plugin": "^5.3.7", + "watchpack": "^2.4.0", "webpack-sources": "^3.2.3" } }, "webpack-cli": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz", - "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz", + "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==", "dev": true, "requires": { "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^1.2.0", - "@webpack-cli/info": "^1.5.0", - "@webpack-cli/serve": "^1.7.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", "colorette": "^2.0.14", - "commander": "^7.0.0", + "commander": "^10.0.1", "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", "fastest-levenshtein": "^1.0.12", "import-local": "^3.0.2", - "interpret": "^2.2.0", - "rechoir": "^0.7.0", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", "webpack-merge": "^5.7.3" }, "dependencies": { "commander": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", "dev": true } } @@ -9054,9 +11407,9 @@ }, "dependencies": { "ajv": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -9081,61 +11434,61 @@ "dev": true }, "schema-utils": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", - "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", + "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", "dev": true, "requires": { "@types/json-schema": "^7.0.9", - "ajv": "^8.8.0", + "ajv": "^8.9.0", "ajv-formats": "^2.1.1", - "ajv-keywords": "^5.0.0" + "ajv-keywords": "^5.1.0" } } } }, "webpack-dev-server": { - "version": "4.7.4", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.7.4.tgz", - "integrity": "sha512-nfdsb02Zi2qzkNmgtZjkrMOcXnYZ6FLKcQwpxT7MvmHKc+oTtDsBju8j+NMyAygZ9GW1jMEUpy3itHtqgEhe1A==", + "version": "4.15.1", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz", + "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==", "dev": true, "requires": { "@types/bonjour": "^3.5.9", "@types/connect-history-api-fallback": "^1.3.5", "@types/express": "^4.17.13", "@types/serve-index": "^1.9.1", + "@types/serve-static": "^1.13.10", "@types/sockjs": "^0.3.33", - "@types/ws": "^8.2.2", + "@types/ws": "^8.5.5", "ansi-html-community": "^0.0.8", - "bonjour": "^3.5.0", + "bonjour-service": "^1.0.11", "chokidar": "^3.5.3", "colorette": "^2.0.10", "compression": "^1.7.4", - "connect-history-api-fallback": "^1.6.0", + "connect-history-api-fallback": "^2.0.0", "default-gateway": "^6.0.3", - "del": "^6.0.0", - "express": "^4.17.1", + "express": "^4.17.3", "graceful-fs": "^4.2.6", "html-entities": "^2.3.2", - "http-proxy-middleware": "^2.0.0", + "http-proxy-middleware": "^2.0.3", "ipaddr.js": "^2.0.1", + "launch-editor": "^2.6.0", "open": "^8.0.9", "p-retry": "^4.5.0", - "portfinder": "^1.0.28", + "rimraf": "^3.0.2", "schema-utils": "^4.0.0", - "selfsigned": "^2.0.0", + "selfsigned": "^2.1.1", "serve-index": "^1.9.1", - "sockjs": "^0.3.21", + "sockjs": "^0.3.24", "spdy": "^4.0.2", - "strip-ansi": "^7.0.0", "webpack-dev-middleware": "^5.3.1", - "ws": "^8.4.2" + "ws": "^8.13.0" }, "dependencies": { "ajv": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -9153,12 +11506,6 @@ "fast-deep-equal": "^3.1.3" } }, - "ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true - }, "json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", @@ -9166,39 +11513,30 @@ "dev": true }, "schema-utils": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", - "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", + "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", "dev": true, "requires": { "@types/json-schema": "^7.0.9", - "ajv": "^8.8.0", + "ajv": "^8.9.0", "ajv-formats": "^2.1.1", - "ajv-keywords": "^5.0.0" - } - }, - "strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", - "dev": true, - "requires": { - "ansi-regex": "^6.0.1" + "ajv-keywords": "^5.1.0" } }, "ws": { - "version": "8.6.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz", - "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==", + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", + "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", "dev": true, "requires": {} } } }, "webpack-merge": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", - "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.9.0.tgz", + "integrity": "sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==", "dev": true, "requires": { "clone-deep": "^4.0.1", @@ -9228,6 +11566,15 @@ "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", "dev": true }, + "whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "requires": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -9237,16 +11584,29 @@ "isexe": "^2.0.0" } }, + "which-typed-array": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", + "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==", + "dev": true, + "requires": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-tostringtag": "^1.0.0" + } + }, "wildcard": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", - "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz", + "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==", "dev": true }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "ws": { "version": "8.4.0", @@ -9259,6 +11619,12 @@ "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.2.1.tgz", "integrity": "sha512-sID0rrVCqkVNUn8t6xuv9+6FViXjUVXq8H5rWOH2rz9fDNQEd4g0EA2XlcEdJXRz5BMEn4O1pJFdT+z4YHhoWw==" }, + "xtend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "dev": true + }, "yauzl": { "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", @@ -9267,6 +11633,12 @@ "buffer-crc32": "~0.2.3", "fd-slicer": "~1.1.0" } + }, + "zwitch": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz", + "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==", + "dev": true } } } diff --git a/templates/ctl-scaffold/package.json b/templates/ctl-scaffold/package.json index ee21a7b721..107691ae8f 100644 --- a/templates/ctl-scaffold/package.json +++ b/templates/ctl-scaffold/package.json @@ -27,8 +27,8 @@ "dependencies": { "@emurgo/cardano-message-signing-browser": "1.0.1", "@emurgo/cardano-message-signing-nodejs": "1.0.1", - "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.2", - "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.2", + "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.3", + "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.3", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1", "@mlabs-haskell/json-bigint": " 1.0.0", "@noble/secp256k1": "^1.7.0", @@ -49,13 +49,15 @@ }, "devDependencies": { "buffer": "6.0.3", + "doctoc": "^2.2.1", "esbuild": "0.18.11", "esbuild-plugin-polyfill-node": "^0.3.0", "esbuild-plugin-wasm": "^1.1.0", - "html-webpack-plugin": "5.5.0", - "webpack": "5.67.0", - "webpack-cli": "4.10", - "webpack-dev-server": "4.7.4" + "html-webpack-plugin": "5.5.3", + "node-polyfill-webpack-plugin": "2.0.1", + "webpack": "5.88.1", + "webpack-cli": "5.1.4", + "webpack-dev-server": "4.15.1" }, "prettier": { "arrowParens": "avoid" diff --git a/templates/ctl-scaffold/packages.dhall b/templates/ctl-scaffold/packages.dhall index 7b8dccb2fe..61e40db6a0 100644 --- a/templates/ctl-scaffold/packages.dhall +++ b/templates/ctl-scaffold/packages.dhall @@ -218,7 +218,7 @@ let additions = , "node-fs-aff" ] , repo = "https://github.com/mlabs-haskell/purescript-toppokki" - , version = "f90f92f0ddf0eecc73705c1675db37918d18cbcb" + , version = "db0d3c12348da576b28a18782df4ae5d7cc44408" } , bignumber = { dependencies = diff --git a/templates/ctl-scaffold/spago-packages.nix b/templates/ctl-scaffold/spago-packages.nix index ae7055f703..17e1e791ab 100644 --- a/templates/ctl-scaffold/spago-packages.nix +++ b/templates/ctl-scaffold/spago-packages.nix @@ -1375,11 +1375,11 @@ let "toppokki" = pkgs.stdenv.mkDerivation { name = "toppokki"; - version = "f90f92f0ddf0eecc73705c1675db37918d18cbcb"; + version = "db0d3c12348da576b28a18782df4ae5d7cc44408"; src = pkgs.fetchgit { url = "https://github.com/mlabs-haskell/purescript-toppokki"; - rev = "f90f92f0ddf0eecc73705c1675db37918d18cbcb"; - sha256 = "1kmqajf7n5l9lk4amyma3rhm60llrgamap5hi21kkqs52xm3fr2q"; + rev = "db0d3c12348da576b28a18782df4ae5d7cc44408"; + sha256 = "1ck1g9mrm8kclmzkrg9hbm97gbvjbk0dcqnzby0c38pc2dqa7xwf"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; diff --git a/templates/ctl-scaffold/webpack.config.js b/templates/ctl-scaffold/webpack.config.js index ae6edde65a..bc391a2526 100644 --- a/templates/ctl-scaffold/webpack.config.js +++ b/templates/ctl-scaffold/webpack.config.js @@ -22,6 +22,9 @@ module.exports = { stats: { errorDetails: true }, devServer: { + client: { + overlay: false, + }, port: 4008, proxy: { "/kupo": { diff --git a/test/ApplyArgs.purs b/test/ApplyArgs.purs index b39a43cb39..e2f9c11e73 100644 --- a/test/ApplyArgs.purs +++ b/test/ApplyArgs.purs @@ -15,7 +15,6 @@ import Contract.TextEnvelope import Control.Monad.Error.Class (class MonadError) import Control.Monad.Trans.Class (lift) import Control.Parallel (parTraverse) -import Ctl.Examples.Helpers.LoadScript (loadScript) import Ctl.Internal.ApplyArgs (applyArgs) import Ctl.Internal.Cardano.TextEnvelope (TextEnvelope) import Ctl.Internal.Test.TestPlanM (TestPlanM, interpret) @@ -27,6 +26,8 @@ import Effect.Aff.Class (liftAff) import Foreign.Object (Object) import Foreign.Object as Object import Mote (group, test) +import Node.Encoding (Encoding(UTF8)) +import Node.FS.Aff (readTextFile) import Test.Spec.Assertions (shouldEqual) scriptFilenames :: Object String @@ -95,6 +96,9 @@ suite = group "Applying params to scripts test" $ do ("Apply " <> argsName <> " to " <> scriptName) $ compareApplied lang scriptName (args /\ argsName) +loadScript :: String -> Aff String +loadScript = readTextFile UTF8 <<< append "./fixtures/scripts/" + compareApplied :: forall (m :: Type -> Type) . Monad m diff --git a/test/Deserialization.purs b/test/Deserialization.purs index f56e0f3d42..8f51d601a9 100644 --- a/test/Deserialization.purs +++ b/test/Deserialization.purs @@ -9,7 +9,6 @@ import Contract.TextEnvelope , decodeTextEnvelope ) import Control.Monad.Error.Class (class MonadThrow, liftMaybe) -import Ctl.Examples.Helpers.LoadScript (loadScript) import Ctl.Internal.Cardano.Types.NativeScript (NativeScript(ScriptAny)) as T import Ctl.Internal.Cardano.Types.Transaction (Transaction, TransactionOutput) as T import Ctl.Internal.Cardano.Types.Transaction (Vkeywitness) @@ -49,7 +48,6 @@ import Data.Newtype (unwrap, wrap) import Data.Traversable (traverse) import Effect (Effect) import Effect.Aff (Aff) -import Effect.Aff.Class (liftAff) import Effect.Class (class MonadEffect, liftEffect) import Effect.Exception (Error, error) import Mote (group, skip, test) @@ -248,8 +246,15 @@ suite = do test "fixture #4" $ witnessSetRoundTrip witnessSetFixture4 group "TextEnvelope decoding" do test "Decoding TestEnvelope with some other type" do - otherTypeTextEnvelope <- liftAff $ loadScript - "other-type-text-envelope.plutus" + let + otherTypeTextEnvelope = + """ + { + "cborHex": "484701000022120011", + "description": "other-type-text-envelope", + "type": "SomeOtherType" + } + """ TextEnvelope envelope <- liftMaybe (error "Unexpected parsing error") $ decodeTextEnvelope otherTypeTextEnvelope envelope.type_ `shouldEqual` (Other "SomeOtherType") diff --git a/webpack.config.cjs b/webpack.config.cjs index 2923bd7619..7495185acd 100644 --- a/webpack.config.cjs +++ b/webpack.config.cjs @@ -23,8 +23,8 @@ module.exports = env => { stats: { errorDetails: true }, devServer: { - static: { - directory: path.join(__dirname, "fixtures"), + client: { + overlay: false }, port: 4008, proxy: { @@ -86,7 +86,6 @@ module.exports = env => { plugins: [ new webpack.DefinePlugin({ BROWSER_RUNTIME: !!process.env.BROWSER_RUNTIME, - SCRIPTS_DIR: '"scripts"' }), new NodePolyfillPlugin(), new webpack.LoaderOptionsPlugin({ From 7139e1e4ba5a072374bffa7ef538a9533cec56ed Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Wed, 13 Sep 2023 16:58:56 +0400 Subject: [PATCH 40/85] WIP --- Makefile | 6 ++---- esbuild/serve.js | 6 ++++-- nix/default.nix | 18 +++++++----------- package-lock.json | 28 ++++++++++++++-------------- package.json | 6 +++--- templates/ctl-scaffold/package.json | 1 - 6 files changed, 30 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index e985f148dc..6bd9d76785 100644 --- a/Makefile +++ b/Makefile @@ -15,10 +15,8 @@ esbuild-bundle: && cp -rf fixtures dist/esbuild \ && BROWSER_RUNTIME=1 node esbuild/bundle.js ${ps-entrypoint} -esbuild-serve: - @spago build \ - && cp -rf fixtures dist/esbuild \ - && BROWSER_RUNTIME=1 node esbuild/serve.js ${ps-entrypoint} +esbuild-serve: esbuild-bundle + BROWSER_RUNTIME=1 node esbuild/serve.js ${ps-entrypoint} webpack-bundle: @spago build \ diff --git a/esbuild/serve.js b/esbuild/serve.js index 8b4220c435..6c8e965e94 100755 --- a/esbuild/serve.js +++ b/esbuild/serve.js @@ -2,8 +2,10 @@ import * as esbuild from "esbuild"; import { buildOptions } from "./config.js"; const ctx = await esbuild.context(buildOptions); -await ctx.serve({ +const config = { host: "127.0.0.1", port: 4008, servedir: "dist/esbuild", -}); +}; +console.log('serving:', config); +await ctx.serve(config); diff --git a/nix/default.nix b/nix/default.nix index a3e381898a..1c13ba1351 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -136,7 +136,7 @@ let ]; shellHook = '' export NODE_PATH="${nodeModules}/lib/node_modules" - ln -sfn $NODE_PATH node_modules + ln -sfn $NODE_PATH node_modules export PATH="${nodeModules}/bin:$PATH" ${pkgs.lib.optionalString packageLockOnly "export NPM_CONFIG_PACKAGE_LOCK_ONLY=true"} '' @@ -178,7 +178,7 @@ let unpackPhase = '' export HOME="$TMP" export NODE_PATH="${nodeModules}/lib/node_modules" - ln -sfn $NODE_PATH node_modules + ln -sfn $NODE_PATH node_modules export PATH="${nodeModules}/bin:$PATH" cp -r $src . install-spago-style @@ -230,7 +230,7 @@ let # (idea taken from `plutus-playground-client`) '' cp -r ${project}/* . - ln -sfn $NODE_PATH node_modules + ln -sfn $NODE_PATH node_modules ${nodejs}/bin/node --enable-source-maps -e 'import("./output/${testMain}/index.js").then(m => m.main())' touch $out ''; @@ -361,8 +361,8 @@ let done; mkdir project - cp -r ${project}/* project - ln -sfn $NODE_PATH node_modules + cp -r ${project}/* project + ln -sfn $NODE_PATH node_modules ${nodejs}/bin/node --enable-source-maps -e 'import("./project/output/${testMain}/index.js").then(m => m.main())' e2e-test run mkdir $out '' @@ -374,14 +374,10 @@ let # Can be used to override the name given to the resulting derivation name ? "${projectName}-bundle-" + (if browserRuntime then "web" else "nodejs") - # The Webpack `entrypoint` - , entrypoint ? "index.js" # The main Purescript module , main ? "Main" # If this bundle is being produced for a browser environment or not , browserRuntime ? true - # Path to the Webpack config to use - , webpackConfig ? "webpack.config.js" # The name of the bundled JS module that `spago bundle-module` will produce , bundledModuleName ? "output.js" # Generated `node_modules` in the Nix store. Can be passed to have better @@ -405,7 +401,7 @@ let '' export HOME="$TMP" export NODE_PATH="${nodeModules}/lib/node_modules" - ln -sfn $NODE_PATH node_modules + ln -sfn $NODE_PATH node_modules export PATH="${nodeModules}/bin:$PATH" ${pkgs.lib.optionalString browserRuntime "export BROWSER_RUNTIME=1"} cp -r ${project}/* . @@ -491,7 +487,7 @@ let } '' export NODE_PATH="${pursDocsSearchNpm.nodeDependencies}/lib/node_modules" - ln -sfn $NODE_PATH node_modules + ln -sfn $NODE_PATH node_modules export PATH="${pursDocsSearchNpm.nodeDependencies}/bin:$PATH" cp -r ${buildPursDocs { }}/{generated-docs,output,src} . install-spago-style diff --git a/package-lock.json b/package-lock.json index eb4c6d8c15..cdde7c3c77 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,8 +11,8 @@ "dependencies": { "@emurgo/cardano-message-signing-browser": "1.0.1", "@emurgo/cardano-message-signing-nodejs": "1.0.1", - "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.3", - "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.3", + "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.4", + "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.4", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1", "@mlabs-haskell/json-bigint": " 1.0.0", "@noble/secp256k1": "^1.7.0", @@ -496,18 +496,18 @@ "dev": true }, "node_modules/@mlabs-haskell/cardano-serialization-lib-gc-browser": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.3.tgz", - "integrity": "sha512-TXzaD8lWqpA5U5KRiW2iDIQzSyddcgd5tn08GE0KpecuBFOQievtnetUIV6+ERFxWUG7R8x9qWWu8syVfP4WRQ==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.4.tgz", + "integrity": "sha512-ZN74Uv9r3978Q/r/bRt4bCa5PeFUcf8qasc8bZf9JLWCpvG2Mgy1rBgb4PlxJpPIFJDU7GdDR2R9fyw334WsIg==", "dependencies": { "@emurgo/cardano-serialization-lib-browser": "^11.2.1", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" } }, "node_modules/@mlabs-haskell/cardano-serialization-lib-gc-nodejs": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.3.tgz", - "integrity": "sha512-wjNZH4hwEYYQbjI/vHWmbDRu8Pec40+/ywXWRBUr7mOcE99Zo9u911qeQgdULPp7R4TOhK5alOz+Arp06yCKiQ==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.4.tgz", + "integrity": "sha512-645lSxq5i3jxfGT0gX7/LT3Uz425l0HeJ1gfZzvuhVSPkuLai+xyrUHnf7KOzT1zyRFIyNBaGkm7z+6yKNhBnA==", "dependencies": { "@emurgo/cardano-serialization-lib-nodejs": "^11.4.0", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" @@ -6912,18 +6912,18 @@ "dev": true }, "@mlabs-haskell/cardano-serialization-lib-gc-browser": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.3.tgz", - "integrity": "sha512-TXzaD8lWqpA5U5KRiW2iDIQzSyddcgd5tn08GE0KpecuBFOQievtnetUIV6+ERFxWUG7R8x9qWWu8syVfP4WRQ==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.4.tgz", + "integrity": "sha512-ZN74Uv9r3978Q/r/bRt4bCa5PeFUcf8qasc8bZf9JLWCpvG2Mgy1rBgb4PlxJpPIFJDU7GdDR2R9fyw334WsIg==", "requires": { "@emurgo/cardano-serialization-lib-browser": "^11.2.1", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" } }, "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.3.tgz", - "integrity": "sha512-wjNZH4hwEYYQbjI/vHWmbDRu8Pec40+/ywXWRBUr7mOcE99Zo9u911qeQgdULPp7R4TOhK5alOz+Arp06yCKiQ==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.4.tgz", + "integrity": "sha512-645lSxq5i3jxfGT0gX7/LT3Uz425l0HeJ1gfZzvuhVSPkuLai+xyrUHnf7KOzT1zyRFIyNBaGkm7z+6yKNhBnA==", "requires": { "@emurgo/cardano-serialization-lib-nodejs": "^11.4.0", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" diff --git a/package.json b/package.json index aa6ebcf260..81c0162c6e 100755 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "unit-test": "spago run --main Test.Ctl.Unit", "plutip-test": "spago run --main Test.Ctl.Plutip", "staking-test": "spago run --main Test.Ctl.Plutip.Staking", - "e2e-serve": "spago bundle-module -m Ctl.Examples.ByUrl --to output.js && make webpack-serve", + "e2e-serve": "make esbuild-serve", "e2e-test": "source ./test/e2e.env && spago test --main Test.Ctl.E2E -a 'run'", "e2e-test-debug": "source ./test/e2e.env && spago test --main Test.Ctl.E2E -a 'run --no-headless'", "e2e-browser": "source ./test/e2e.env && spago run --main Test.Ctl.E2E -a 'browser'", @@ -36,8 +36,8 @@ "dependencies": { "@emurgo/cardano-message-signing-browser": "1.0.1", "@emurgo/cardano-message-signing-nodejs": "1.0.1", - "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.3", - "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.3", + "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.4", + "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.4", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1", "@mlabs-haskell/json-bigint": " 1.0.0", "@noble/secp256k1": "^1.7.0", diff --git a/templates/ctl-scaffold/package.json b/templates/ctl-scaffold/package.json index 107691ae8f..a1b19fcdd8 100644 --- a/templates/ctl-scaffold/package.json +++ b/templates/ctl-scaffold/package.json @@ -49,7 +49,6 @@ }, "devDependencies": { "buffer": "6.0.3", - "doctoc": "^2.2.1", "esbuild": "0.18.11", "esbuild-plugin-polyfill-node": "^0.3.0", "esbuild-plugin-wasm": "^1.1.0", From f318a77e5d7e939136de1f90849ec05ec0120495 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Fri, 6 Oct 2023 16:49:06 +0400 Subject: [PATCH 41/85] Update spago dependencies, fix broken link --- doc/using-from-js.md | 2 +- package-lock.json | 28 +- package.json | 4 +- packages.dhall | 14 +- spago-packages.nix | 24 +- templates/ctl-scaffold/package-lock.json | 1381 +-------------------- templates/ctl-scaffold/package.json | 4 +- templates/ctl-scaffold/packages.dhall | 56 +- templates/ctl-scaffold/spago-packages.nix | 24 +- 9 files changed, 96 insertions(+), 1441 deletions(-) diff --git a/doc/using-from-js.md b/doc/using-from-js.md index e8883a2603..4c977528d5 100644 --- a/doc/using-from-js.md +++ b/doc/using-from-js.md @@ -130,7 +130,7 @@ if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { to only one of the import variants. -Our default [WebPack config](../webpack.config.js) uses `BROWSER_RUNTIME` environment variable to differentiate between two bundling options: +Our default [WebPack config](../webpack.config.cjs) uses `BROWSER_RUNTIME` environment variable to differentiate between two bundling options: ```js plugins: [ diff --git a/package-lock.json b/package-lock.json index cdde7c3c77..1814d31217 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,8 +11,8 @@ "dependencies": { "@emurgo/cardano-message-signing-browser": "1.0.1", "@emurgo/cardano-message-signing-nodejs": "1.0.1", - "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.4", - "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.4", + "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.5", + "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.5", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1", "@mlabs-haskell/json-bigint": " 1.0.0", "@noble/secp256k1": "^1.7.0", @@ -496,18 +496,18 @@ "dev": true }, "node_modules/@mlabs-haskell/cardano-serialization-lib-gc-browser": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.4.tgz", - "integrity": "sha512-ZN74Uv9r3978Q/r/bRt4bCa5PeFUcf8qasc8bZf9JLWCpvG2Mgy1rBgb4PlxJpPIFJDU7GdDR2R9fyw334WsIg==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.5.tgz", + "integrity": "sha512-twCJkL32nytljTje4893P6IM3pI1ZwekrbuWU9C12HQSyS6OpevB/38WfLIZKLS82ZCkqQclDVdnrzCdqd7yNg==", "dependencies": { "@emurgo/cardano-serialization-lib-browser": "^11.2.1", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" } }, "node_modules/@mlabs-haskell/cardano-serialization-lib-gc-nodejs": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.4.tgz", - "integrity": "sha512-645lSxq5i3jxfGT0gX7/LT3Uz425l0HeJ1gfZzvuhVSPkuLai+xyrUHnf7KOzT1zyRFIyNBaGkm7z+6yKNhBnA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.5.tgz", + "integrity": "sha512-0NuvPFwcdQ94pozFv/VRnFOYGlbd6sb18KsTJP0tkYeuI++kjxZmtF0sT7uLUMFqMbezgYqmA1sSAFWJ6Sq5Sw==", "dependencies": { "@emurgo/cardano-serialization-lib-nodejs": "^11.4.0", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" @@ -6912,18 +6912,18 @@ "dev": true }, "@mlabs-haskell/cardano-serialization-lib-gc-browser": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.4.tgz", - "integrity": "sha512-ZN74Uv9r3978Q/r/bRt4bCa5PeFUcf8qasc8bZf9JLWCpvG2Mgy1rBgb4PlxJpPIFJDU7GdDR2R9fyw334WsIg==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.5.tgz", + "integrity": "sha512-twCJkL32nytljTje4893P6IM3pI1ZwekrbuWU9C12HQSyS6OpevB/38WfLIZKLS82ZCkqQclDVdnrzCdqd7yNg==", "requires": { "@emurgo/cardano-serialization-lib-browser": "^11.2.1", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" } }, "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.4.tgz", - "integrity": "sha512-645lSxq5i3jxfGT0gX7/LT3Uz425l0HeJ1gfZzvuhVSPkuLai+xyrUHnf7KOzT1zyRFIyNBaGkm7z+6yKNhBnA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.5.tgz", + "integrity": "sha512-0NuvPFwcdQ94pozFv/VRnFOYGlbd6sb18KsTJP0tkYeuI++kjxZmtF0sT7uLUMFqMbezgYqmA1sSAFWJ6Sq5Sw==", "requires": { "@emurgo/cardano-serialization-lib-nodejs": "^11.4.0", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" diff --git a/package.json b/package.json index 81c0162c6e..eeca76b19c 100755 --- a/package.json +++ b/package.json @@ -36,8 +36,8 @@ "dependencies": { "@emurgo/cardano-message-signing-browser": "1.0.1", "@emurgo/cardano-message-signing-nodejs": "1.0.1", - "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.4", - "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.4", + "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.5", + "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.5", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1", "@mlabs-haskell/json-bigint": " 1.0.0", "@noble/secp256k1": "^1.7.0", diff --git a/packages.dhall b/packages.dhall index e6d85cbe5a..3bfea3922b 100644 --- a/packages.dhall +++ b/packages.dhall @@ -144,8 +144,8 @@ let additions = , "uint" , "untagged-union" ] - , repo = "https://github.com/errfrom/purescript-aeson.git" - , version = "f614a840036aabb059017d03cf365f4199b9547b" + , repo = "https://github.com/mlabs-haskell/purescript-aeson.git" + , version = "e411566cf5e3adf05ea9ae866705886cfba4bfa6" } , bignumber = { dependencies = @@ -159,8 +159,8 @@ let additions = , "prelude" , "tuples" ] - , repo = "https://github.com/errfrom/purescript-bignumber" - , version = "9b3179ad07428d189e42a7a205aab9c7c4849d4a" + , repo = "https://github.com/mlabs-haskell/purescript-bignumber" + , version = "760d11b41ece31b8cdd3c53349c5c2fd48d3ff89" } , properties = { dependencies = [ "prelude", "console" ] @@ -219,8 +219,8 @@ let additions = , "unordered-collections" , "unsafe-coerce" ] - , repo = "https://github.com/errfrom/medea-ps.git" - , version = "00981e4ce7249808413a6db8d88d849bbe85245a" + , repo = "https://github.com/mlabs-haskell/medea-ps.git" + , version = "9a03a7b7b983fc1d21c4e1fef4cf0748b42f3734" } , toppokki = { dependencies = @@ -233,7 +233,7 @@ let additions = , "node-fs-aff" ] , repo = "https://github.com/mlabs-haskell/purescript-toppokki" - , version = "db0d3c12348da576b28a18782df4ae5d7cc44408" + , version = "f90f92f0ddf0eecc73705c1675db37918d18cbcb" } , noble-secp256k1 = { dependencies = diff --git a/spago-packages.nix b/spago-packages.nix index e7d589dab4..ee24509525 100644 --- a/spago-packages.nix +++ b/spago-packages.nix @@ -7,10 +7,10 @@ let "aeson" = pkgs.stdenv.mkDerivation { name = "aeson"; - version = "f614a840036aabb059017d03cf365f4199b9547b"; + version = "e411566cf5e3adf05ea9ae866705886cfba4bfa6"; src = pkgs.fetchgit { - url = "https://github.com/errfrom/purescript-aeson.git"; - rev = "f614a840036aabb059017d03cf365f4199b9547b"; + url = "https://github.com/mlabs-haskell/purescript-aeson.git"; + rev = "e411566cf5e3adf05ea9ae866705886cfba4bfa6"; sha256 = "01wqbd9pz1pmz1f0z5w4gwaswbdnkr9md7fihg4d91vs690zf792"; }; phases = "installPhase"; @@ -199,10 +199,10 @@ let "bignumber" = pkgs.stdenv.mkDerivation { name = "bignumber"; - version = "9b3179ad07428d189e42a7a205aab9c7c4849d4a"; + version = "760d11b41ece31b8cdd3c53349c5c2fd48d3ff89"; src = pkgs.fetchgit { - url = "https://github.com/errfrom/purescript-bignumber"; - rev = "9b3179ad07428d189e42a7a205aab9c7c4849d4a"; + url = "https://github.com/mlabs-haskell/purescript-bignumber"; + rev = "760d11b41ece31b8cdd3c53349c5c2fd48d3ff89"; sha256 = "03py821gnkgi5p7zaxwr4rqsiv67v83y5c04i6x4v15nr6aaf7vz"; }; phases = "installPhase"; @@ -715,10 +715,10 @@ let "medea" = pkgs.stdenv.mkDerivation { name = "medea"; - version = "00981e4ce7249808413a6db8d88d849bbe85245a"; + version = "9a03a7b7b983fc1d21c4e1fef4cf0748b42f3734"; src = pkgs.fetchgit { - url = "https://github.com/errfrom/medea-ps.git"; - rev = "00981e4ce7249808413a6db8d88d849bbe85245a"; + url = "https://github.com/mlabs-haskell/medea-ps.git"; + rev = "9a03a7b7b983fc1d21c4e1fef4cf0748b42f3734"; sha256 = "0sxv9l53hqjx5n7gdnpr5ydxp0zr2wv0ikk2sc0ch9whq5rridcy"; }; phases = "installPhase"; @@ -1363,11 +1363,11 @@ let "toppokki" = pkgs.stdenv.mkDerivation { name = "toppokki"; - version = "db0d3c12348da576b28a18782df4ae5d7cc44408"; + version = "f90f92f0ddf0eecc73705c1675db37918d18cbcb"; src = pkgs.fetchgit { url = "https://github.com/mlabs-haskell/purescript-toppokki"; - rev = "db0d3c12348da576b28a18782df4ae5d7cc44408"; - sha256 = "1ck1g9mrm8kclmzkrg9hbm97gbvjbk0dcqnzby0c38pc2dqa7xwf"; + rev = "f90f92f0ddf0eecc73705c1675db37918d18cbcb"; + sha256 = "1kmqajf7n5l9lk4amyma3rhm60llrgamap5hi21kkqs52xm3fr2q"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; diff --git a/templates/ctl-scaffold/package-lock.json b/templates/ctl-scaffold/package-lock.json index a3ce0e63a9..561ee2f297 100644 --- a/templates/ctl-scaffold/package-lock.json +++ b/templates/ctl-scaffold/package-lock.json @@ -11,8 +11,8 @@ "dependencies": { "@emurgo/cardano-message-signing-browser": "1.0.1", "@emurgo/cardano-message-signing-nodejs": "1.0.1", - "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.3", - "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.3", + "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.5", + "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.5", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1", "@mlabs-haskell/json-bigint": " 1.0.0", "@noble/secp256k1": "^1.7.0", @@ -33,7 +33,6 @@ }, "devDependencies": { "buffer": "6.0.3", - "doctoc": "^2.2.1", "esbuild": "0.18.11", "esbuild-plugin-polyfill-node": "^0.3.0", "esbuild-plugin-wasm": "^1.1.0", @@ -496,18 +495,18 @@ "dev": true }, "node_modules/@mlabs-haskell/cardano-serialization-lib-gc-browser": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.3.tgz", - "integrity": "sha512-TXzaD8lWqpA5U5KRiW2iDIQzSyddcgd5tn08GE0KpecuBFOQievtnetUIV6+ERFxWUG7R8x9qWWu8syVfP4WRQ==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.5.tgz", + "integrity": "sha512-twCJkL32nytljTje4893P6IM3pI1ZwekrbuWU9C12HQSyS6OpevB/38WfLIZKLS82ZCkqQclDVdnrzCdqd7yNg==", "dependencies": { "@emurgo/cardano-serialization-lib-browser": "^11.2.1", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" } }, "node_modules/@mlabs-haskell/cardano-serialization-lib-gc-nodejs": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.3.tgz", - "integrity": "sha512-wjNZH4hwEYYQbjI/vHWmbDRu8Pec40+/ywXWRBUr7mOcE99Zo9u911qeQgdULPp7R4TOhK5alOz+Arp06yCKiQ==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.5.tgz", + "integrity": "sha512-0NuvPFwcdQ94pozFv/VRnFOYGlbd6sb18KsTJP0tkYeuI++kjxZmtF0sT7uLUMFqMbezgYqmA1sSAFWJ6Sq5Sw==", "dependencies": { "@emurgo/cardano-serialization-lib-nodejs": "^11.4.0", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" @@ -548,29 +547,6 @@ } ] }, - "node_modules/@textlint/ast-node-types": { - "version": "12.6.1", - "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.6.1.tgz", - "integrity": "sha512-uzlJ+ZsCAyJm+lBi7j0UeBbj+Oy6w/VWoGJ3iHRHE5eZ8Z4iK66mq+PG/spupmbllLtz77OJbY89BYqgFyjXmA==", - "dev": true - }, - "node_modules/@textlint/markdown-to-ast": { - "version": "12.6.1", - "resolved": "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.6.1.tgz", - "integrity": "sha512-T0HO+VrU9VbLRiEx/kH4+gwGMHNMIGkp0Pok+p0I33saOOLyhfGvwOKQgvt2qkxzQEV2L5MtGB8EnW4r5d3CqQ==", - "dev": true, - "dependencies": { - "@textlint/ast-node-types": "^12.6.1", - "debug": "^4.3.4", - "mdast-util-gfm-autolink-literal": "^0.1.3", - "remark-footnotes": "^3.0.0", - "remark-frontmatter": "^3.0.0", - "remark-gfm": "^1.0.0", - "remark-parse": "^9.0.0", - "traverse": "^0.6.7", - "unified": "^9.2.2" - } - }, "node_modules/@types/body-parser": { "version": "1.19.2", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz", @@ -686,15 +662,6 @@ "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==", "dev": true }, - "node_modules/@types/mdast": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.12.tgz", - "integrity": "sha512-DT+iNIRNX884cx0/Q1ja7NyUPpZuv0KPyL5rGNxm1WC1OtHstl7n4Jb7nk+xacNShQMbczJjt8uFzznpp6kYBg==", - "dev": true, - "dependencies": { - "@types/unist": "^2" - } - }, "node_modules/@types/mime": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", @@ -764,12 +731,6 @@ "@types/node": "*" } }, - "node_modules/@types/unist": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.7.tgz", - "integrity": "sha512-cputDpIbFgLUaGQn6Vqg3/YsJwxUwHLO13v3i5ouxT4lat0khip9AEWxtERujXV9wxIB1EyF97BSJFt6vpdI8g==", - "dev": true - }, "node_modules/@types/ws": { "version": "8.5.5", "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz", @@ -1111,15 +1072,6 @@ "ajv": "^6.9.1" } }, - "node_modules/anchor-markdown-header": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/anchor-markdown-header/-/anchor-markdown-header-0.6.0.tgz", - "integrity": "sha512-v7HJMtE1X7wTpNFseRhxsY/pivP4uAJbidVhPT+yhz4i/vV1+qx371IXuV9V7bN6KjFtheLJxqaSm0Y/8neJTA==", - "dev": true, - "dependencies": { - "emoji-regex": "~10.1.0" - } - }, "node_modules/ansi-html-community": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz", @@ -1212,16 +1164,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/bail": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz", - "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -1683,46 +1625,6 @@ } ] }, - "node_modules/ccount": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz", - "integrity": "sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/character-entities": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz", - "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/character-entities-legacy": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz", - "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/character-reference-invalid": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz", - "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/chokidar": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", @@ -2177,23 +2079,6 @@ "node": ">=6" } }, - "node_modules/doctoc": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/doctoc/-/doctoc-2.2.1.tgz", - "integrity": "sha512-qNJ1gsuo7hH40vlXTVVrADm6pdg30bns/Mo7Nv1SxuXSM1bwF9b4xQ40a6EFT/L1cI+Yylbyi8MPI4G4y7XJzQ==", - "dev": true, - "dependencies": { - "@textlint/markdown-to-ast": "^12.1.1", - "anchor-markdown-header": "^0.6.0", - "htmlparser2": "^7.2.0", - "minimist": "^1.2.6", - "underscore": "^1.13.2", - "update-section": "^0.3.3" - }, - "bin": { - "doctoc": "doctoc.js" - } - }, "node_modules/dom-converter": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz", @@ -2322,12 +2207,6 @@ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", "dev": true }, - "node_modules/emoji-regex": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.1.0.tgz", - "integrity": "sha512-xAEnNCT3w2Tg6MA7ly6QqYJvEoY1tm9iIjJ3yMKK9JPlWuRHAMoe5iETwQnx3M9TVbFMfsrBgWKR+IsmswwNjg==", - "dev": true - }, "node_modules/encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -2358,18 +2237,6 @@ "node": ">=10.13.0" } }, - "node_modules/entities": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz", - "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==", - "dev": true, - "engines": { - "node": ">=0.12" - }, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, "node_modules/envinfo": { "version": "7.10.0", "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.10.0.tgz", @@ -2472,18 +2339,6 @@ "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", "dev": true }, - "node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -2683,12 +2538,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, "node_modules/extract-zip": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", @@ -2729,19 +2578,6 @@ "node": ">= 4.9.1" } }, - "node_modules/fault": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz", - "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==", - "dev": true, - "dependencies": { - "format": "^0.2.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/faye-websocket": { "version": "0.11.4", "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", @@ -2857,15 +2693,6 @@ "is-callable": "^1.1.3" } }, - "node_modules/format": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz", - "integrity": "sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==", - "dev": true, - "engines": { - "node": ">=0.4.x" - } - }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -3242,25 +3069,6 @@ "webpack": "^5.20.0" } }, - "node_modules/htmlparser2": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz", - "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==", - "dev": true, - "funding": [ - "https://github.com/fb55/htmlparser2?sponsor=1", - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ], - "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.2", - "domutils": "^2.8.0", - "entities": "^3.0.1" - } - }, "node_modules/http-deceiver": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", @@ -3458,30 +3266,6 @@ "node": ">= 10" } }, - "node_modules/is-alphabetical": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz", - "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/is-alphanumerical": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz", - "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==", - "dev": true, - "dependencies": { - "is-alphabetical": "^1.0.0", - "is-decimal": "^1.0.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/is-arguments": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", @@ -3510,29 +3294,6 @@ "node": ">=8" } }, - "node_modules/is-buffer": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", - "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "engines": { - "node": ">=4" - } - }, "node_modules/is-callable": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", @@ -3557,16 +3318,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-decimal": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz", - "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/is-docker": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", @@ -3618,16 +3369,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-hexadecimal": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz", - "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/is-nan": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz", @@ -3653,15 +3394,6 @@ "node": ">=0.12.0" } }, - "node_modules/is-plain-obj": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", - "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", @@ -3813,16 +3545,6 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, - "node_modules/longest-streak": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz", - "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/lower-case": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", @@ -3832,19 +3554,6 @@ "tslib": "^2.0.3" } }, - "node_modules/markdown-table": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz", - "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==", - "dev": true, - "dependencies": { - "repeat-string": "^1.0.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", @@ -3856,165 +3565,6 @@ "safe-buffer": "^5.1.2" } }, - "node_modules/mdast-util-find-and-replace": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-1.1.1.tgz", - "integrity": "sha512-9cKl33Y21lyckGzpSmEQnIDjEfeeWelN5s1kUW1LwdB0Fkuq2u+4GdqcGEygYxJE8GVqCl0741bYXHgamfWAZA==", - "dev": true, - "dependencies": { - "escape-string-regexp": "^4.0.0", - "unist-util-is": "^4.0.0", - "unist-util-visit-parents": "^3.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-footnote": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/mdast-util-footnote/-/mdast-util-footnote-0.1.7.tgz", - "integrity": "sha512-QxNdO8qSxqbO2e3m09KwDKfWiLgqyCurdWTQ198NpbZ2hxntdc+VKS4fDJCmNWbAroUdYnSthu+XbZ8ovh8C3w==", - "dev": true, - "dependencies": { - "mdast-util-to-markdown": "^0.6.0", - "micromark": "~2.11.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-from-markdown": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz", - "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==", - "dev": true, - "dependencies": { - "@types/mdast": "^3.0.0", - "mdast-util-to-string": "^2.0.0", - "micromark": "~2.11.0", - "parse-entities": "^2.0.0", - "unist-util-stringify-position": "^2.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-frontmatter": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/mdast-util-frontmatter/-/mdast-util-frontmatter-0.2.0.tgz", - "integrity": "sha512-FHKL4w4S5fdt1KjJCwB0178WJ0evnyyQr5kXTM3wrOVpytD0hrkvd+AOOjU9Td8onOejCkmZ+HQRT3CZ3coHHQ==", - "dev": true, - "dependencies": { - "micromark-extension-frontmatter": "^0.2.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-gfm": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-0.1.2.tgz", - "integrity": "sha512-NNkhDx/qYcuOWB7xHUGWZYVXvjPFFd6afg6/e2g+SV4r9q5XUcCbV4Wfa3DLYIiD+xAEZc6K4MGaE/m0KDcPwQ==", - "dev": true, - "dependencies": { - "mdast-util-gfm-autolink-literal": "^0.1.0", - "mdast-util-gfm-strikethrough": "^0.2.0", - "mdast-util-gfm-table": "^0.1.0", - "mdast-util-gfm-task-list-item": "^0.1.0", - "mdast-util-to-markdown": "^0.6.1" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-gfm-autolink-literal": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-0.1.3.tgz", - "integrity": "sha512-GjmLjWrXg1wqMIO9+ZsRik/s7PLwTaeCHVB7vRxUwLntZc8mzmTsLVr6HW1yLokcnhfURsn5zmSVdi3/xWWu1A==", - "dev": true, - "dependencies": { - "ccount": "^1.0.0", - "mdast-util-find-and-replace": "^1.1.0", - "micromark": "^2.11.3" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-gfm-strikethrough": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-0.2.3.tgz", - "integrity": "sha512-5OQLXpt6qdbttcDG/UxYY7Yjj3e8P7X16LzvpX8pIQPYJ/C2Z1qFGMmcw+1PZMUM3Z8wt8NRfYTvCni93mgsgA==", - "dev": true, - "dependencies": { - "mdast-util-to-markdown": "^0.6.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-gfm-table": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-0.1.6.tgz", - "integrity": "sha512-j4yDxQ66AJSBwGkbpFEp9uG/LS1tZV3P33fN1gkyRB2LoRL+RR3f76m0HPHaby6F4Z5xr9Fv1URmATlRRUIpRQ==", - "dev": true, - "dependencies": { - "markdown-table": "^2.0.0", - "mdast-util-to-markdown": "~0.6.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-gfm-task-list-item": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-0.1.6.tgz", - "integrity": "sha512-/d51FFIfPsSmCIRNp7E6pozM9z1GYPIkSy1urQ8s/o4TC22BZ7DqfHFWiqBD23bc7J3vV1Fc9O4QIHBlfuit8A==", - "dev": true, - "dependencies": { - "mdast-util-to-markdown": "~0.6.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-to-markdown": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz", - "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==", - "dev": true, - "dependencies": { - "@types/unist": "^2.0.0", - "longest-streak": "^2.0.0", - "mdast-util-to-string": "^2.0.0", - "parse-entities": "^2.0.0", - "repeat-string": "^1.0.0", - "zwitch": "^1.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/mdast-util-to-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz", - "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, "node_modules/media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -4057,132 +3607,6 @@ "node": ">= 0.6" } }, - "node_modules/micromark": { - "version": "2.11.4", - "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz", - "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "dependencies": { - "debug": "^4.0.0", - "parse-entities": "^2.0.0" - } - }, - "node_modules/micromark-extension-footnote": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/micromark-extension-footnote/-/micromark-extension-footnote-0.3.2.tgz", - "integrity": "sha512-gr/BeIxbIWQoUm02cIfK7mdMZ/fbroRpLsck4kvFtjbzP4yi+OPVbnukTc/zy0i7spC2xYE/dbX1Sur8BEDJsQ==", - "dev": true, - "dependencies": { - "micromark": "~2.11.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/micromark-extension-frontmatter": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/micromark-extension-frontmatter/-/micromark-extension-frontmatter-0.2.2.tgz", - "integrity": "sha512-q6nPLFCMTLtfsctAuS0Xh4vaolxSFUWUWR6PZSrXXiRy+SANGllpcqdXFv2z07l0Xz/6Hl40hK0ffNCJPH2n1A==", - "dev": true, - "dependencies": { - "fault": "^1.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/micromark-extension-gfm": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-0.3.3.tgz", - "integrity": "sha512-oVN4zv5/tAIA+l3GbMi7lWeYpJ14oQyJ3uEim20ktYFAcfX1x3LNlFGGlmrZHt7u9YlKExmyJdDGaTt6cMSR/A==", - "dev": true, - "dependencies": { - "micromark": "~2.11.0", - "micromark-extension-gfm-autolink-literal": "~0.5.0", - "micromark-extension-gfm-strikethrough": "~0.6.5", - "micromark-extension-gfm-table": "~0.4.0", - "micromark-extension-gfm-tagfilter": "~0.3.0", - "micromark-extension-gfm-task-list-item": "~0.3.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/micromark-extension-gfm-autolink-literal": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-0.5.7.tgz", - "integrity": "sha512-ePiDGH0/lhcngCe8FtH4ARFoxKTUelMp4L7Gg2pujYD5CSMb9PbblnyL+AAMud/SNMyusbS2XDSiPIRcQoNFAw==", - "dev": true, - "dependencies": { - "micromark": "~2.11.3" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/micromark-extension-gfm-strikethrough": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-0.6.5.tgz", - "integrity": "sha512-PpOKlgokpQRwUesRwWEp+fHjGGkZEejj83k9gU5iXCbDG+XBA92BqnRKYJdfqfkrRcZRgGuPuXb7DaK/DmxOhw==", - "dev": true, - "dependencies": { - "micromark": "~2.11.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/micromark-extension-gfm-table": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-0.4.3.tgz", - "integrity": "sha512-hVGvESPq0fk6ALWtomcwmgLvH8ZSVpcPjzi0AjPclB9FsVRgMtGZkUcpE0zgjOCFAznKepF4z3hX8z6e3HODdA==", - "dev": true, - "dependencies": { - "micromark": "~2.11.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/micromark-extension-gfm-tagfilter": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-0.3.0.tgz", - "integrity": "sha512-9GU0xBatryXifL//FJH+tAZ6i240xQuFrSL7mYi8f4oZSbc+NvXjkrHemeYP0+L4ZUT+Ptz3b95zhUZnMtoi/Q==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/micromark-extension-gfm-task-list-item": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-0.3.3.tgz", - "integrity": "sha512-0zvM5iSLKrc/NQl84pZSjGo66aTGd57C1idmlWmE87lkMcXrTxg1uXa/nXomxJytoje9trP0NDLvw4bZ/Z/XCQ==", - "dev": true, - "dependencies": { - "micromark": "~2.11.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, "node_modules/micromatch": { "version": "4.0.5", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", @@ -4280,15 +3704,6 @@ "node": "*" } }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/mkdirp-classic": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", @@ -4635,24 +4050,6 @@ "safe-buffer": "^5.1.1" } }, - "node_modules/parse-entities": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", - "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==", - "dev": true, - "dependencies": { - "character-entities": "^1.0.0", - "character-entities-legacy": "^1.0.0", - "character-reference-invalid": "^1.0.0", - "is-alphanumerical": "^1.0.0", - "is-decimal": "^1.0.0", - "is-hexadecimal": "^1.0.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -5035,61 +4432,6 @@ "node": ">= 0.10" } }, - "node_modules/remark-footnotes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/remark-footnotes/-/remark-footnotes-3.0.0.tgz", - "integrity": "sha512-ZssAvH9FjGYlJ/PBVKdSmfyPc3Cz4rTWgZLI4iE/SX8Nt5l3o3oEjv3wwG5VD7xOjktzdwp5coac+kJV9l4jgg==", - "dev": true, - "dependencies": { - "mdast-util-footnote": "^0.1.0", - "micromark-extension-footnote": "^0.3.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/remark-frontmatter": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-3.0.0.tgz", - "integrity": "sha512-mSuDd3svCHs+2PyO29h7iijIZx4plX0fheacJcAoYAASfgzgVIcXGYSq9GFyYocFLftQs8IOmmkgtOovs6d4oA==", - "dev": true, - "dependencies": { - "mdast-util-frontmatter": "^0.2.0", - "micromark-extension-frontmatter": "^0.2.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/remark-gfm": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-1.0.0.tgz", - "integrity": "sha512-KfexHJCiqvrdBZVbQ6RopMZGwaXz6wFJEfByIuEwGf0arvITHjiKKZ1dpXujjH9KZdm1//XJQwgfnJ3lmXaDPA==", - "dev": true, - "dependencies": { - "mdast-util-gfm": "^0.1.0", - "micromark-extension-gfm": "^0.3.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/remark-parse": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz", - "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==", - "dev": true, - "dependencies": { - "mdast-util-from-markdown": "^0.8.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, "node_modules/renderkid": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz", @@ -5131,15 +4473,6 @@ "entities": "^2.0.0" } }, - "node_modules/repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==", - "dev": true, - "engines": { - "node": ">=0.10" - } - }, "node_modules/require-from-string": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", @@ -5865,25 +5198,6 @@ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, - "node_modules/traverse": { - "version": "0.6.7", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.7.tgz", - "integrity": "sha512-/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/trough": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz", - "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/tslib": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", @@ -5953,72 +5267,11 @@ "ieee754": "^1.1.13" } }, - "node_modules/underscore": { - "version": "1.13.6", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz", - "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==", - "dev": true - }, - "node_modules/unified": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz", - "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==", - "dev": true, - "dependencies": { - "bail": "^1.0.0", - "extend": "^3.0.0", - "is-buffer": "^2.0.0", - "is-plain-obj": "^2.0.0", - "trough": "^1.0.0", - "vfile": "^4.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, "node_modules/uniqid": { "version": "5.4.0", "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-5.4.0.tgz", "integrity": "sha512-38JRbJ4Fj94VmnC7G/J/5n5SC7Ab46OM5iNtSstB/ko3l1b5g7ALt4qzHFgGciFkyiRNtDXtLNb+VsxtMSE77A==" }, - "node_modules/unist-util-is": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz", - "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/unist-util-stringify-position": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz", - "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==", - "dev": true, - "dependencies": { - "@types/unist": "^2.0.2" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/unist-util-visit-parents": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz", - "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==", - "dev": true, - "dependencies": { - "@types/unist": "^2.0.0", - "unist-util-is": "^4.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -6058,12 +5311,6 @@ "browserslist": ">= 4.21.0" } }, - "node_modules/update-section": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/update-section/-/update-section-0.3.3.tgz", - "integrity": "sha512-BpRZMZpgXLuTiKeiu7kK0nIPwGdyrqrs6EDSaXtjD/aQ2T+qVo9a5hRC3HN3iJjCMxNT/VxoLGQ7E/OzE5ucnw==", - "dev": true - }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -6134,40 +5381,10 @@ "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/vfile": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz", - "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==", - "dev": true, - "dependencies": { - "@types/unist": "^2.0.0", - "is-buffer": "^2.0.0", - "unist-util-stringify-position": "^2.0.0", - "vfile-message": "^2.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/vfile-message": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz", - "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==", - "dev": true, - "dependencies": { - "@types/unist": "^2.0.0", - "unist-util-stringify-position": "^2.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "dev": true, + "engines": { + "node": ">= 0.8" } }, "node_modules/vm-browserify": { @@ -6657,16 +5874,6 @@ "buffer-crc32": "~0.2.3", "fd-slicer": "~1.1.0" } - }, - "node_modules/zwitch": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz", - "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } } }, "dependencies": { @@ -6912,18 +6119,18 @@ "dev": true }, "@mlabs-haskell/cardano-serialization-lib-gc-browser": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.3.tgz", - "integrity": "sha512-TXzaD8lWqpA5U5KRiW2iDIQzSyddcgd5tn08GE0KpecuBFOQievtnetUIV6+ERFxWUG7R8x9qWWu8syVfP4WRQ==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.5.tgz", + "integrity": "sha512-twCJkL32nytljTje4893P6IM3pI1ZwekrbuWU9C12HQSyS6OpevB/38WfLIZKLS82ZCkqQclDVdnrzCdqd7yNg==", "requires": { "@emurgo/cardano-serialization-lib-browser": "^11.2.1", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" } }, "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.3.tgz", - "integrity": "sha512-wjNZH4hwEYYQbjI/vHWmbDRu8Pec40+/ywXWRBUr7mOcE99Zo9u911qeQgdULPp7R4TOhK5alOz+Arp06yCKiQ==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.5.tgz", + "integrity": "sha512-0NuvPFwcdQ94pozFv/VRnFOYGlbd6sb18KsTJP0tkYeuI++kjxZmtF0sT7uLUMFqMbezgYqmA1sSAFWJ6Sq5Sw==", "requires": { "@emurgo/cardano-serialization-lib-nodejs": "^11.4.0", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" @@ -6952,29 +6159,6 @@ "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz", "integrity": "sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw==" }, - "@textlint/ast-node-types": { - "version": "12.6.1", - "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.6.1.tgz", - "integrity": "sha512-uzlJ+ZsCAyJm+lBi7j0UeBbj+Oy6w/VWoGJ3iHRHE5eZ8Z4iK66mq+PG/spupmbllLtz77OJbY89BYqgFyjXmA==", - "dev": true - }, - "@textlint/markdown-to-ast": { - "version": "12.6.1", - "resolved": "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.6.1.tgz", - "integrity": "sha512-T0HO+VrU9VbLRiEx/kH4+gwGMHNMIGkp0Pok+p0I33saOOLyhfGvwOKQgvt2qkxzQEV2L5MtGB8EnW4r5d3CqQ==", - "dev": true, - "requires": { - "@textlint/ast-node-types": "^12.6.1", - "debug": "^4.3.4", - "mdast-util-gfm-autolink-literal": "^0.1.3", - "remark-footnotes": "^3.0.0", - "remark-frontmatter": "^3.0.0", - "remark-gfm": "^1.0.0", - "remark-parse": "^9.0.0", - "traverse": "^0.6.7", - "unified": "^9.2.2" - } - }, "@types/body-parser": { "version": "1.19.2", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz", @@ -7090,15 +6274,6 @@ "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==", "dev": true }, - "@types/mdast": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.12.tgz", - "integrity": "sha512-DT+iNIRNX884cx0/Q1ja7NyUPpZuv0KPyL5rGNxm1WC1OtHstl7n4Jb7nk+xacNShQMbczJjt8uFzznpp6kYBg==", - "dev": true, - "requires": { - "@types/unist": "^2" - } - }, "@types/mime": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", @@ -7168,12 +6343,6 @@ "@types/node": "*" } }, - "@types/unist": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.7.tgz", - "integrity": "sha512-cputDpIbFgLUaGQn6Vqg3/YsJwxUwHLO13v3i5ouxT4lat0khip9AEWxtERujXV9wxIB1EyF97BSJFt6vpdI8g==", - "dev": true - }, "@types/ws": { "version": "8.5.5", "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz", @@ -7459,15 +6628,6 @@ "dev": true, "requires": {} }, - "anchor-markdown-header": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/anchor-markdown-header/-/anchor-markdown-header-0.6.0.tgz", - "integrity": "sha512-v7HJMtE1X7wTpNFseRhxsY/pivP4uAJbidVhPT+yhz4i/vV1+qx371IXuV9V7bN6KjFtheLJxqaSm0Y/8neJTA==", - "dev": true, - "requires": { - "emoji-regex": "~10.1.0" - } - }, "ansi-html-community": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz", @@ -7544,12 +6704,6 @@ "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", "dev": true }, - "bail": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz", - "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==", - "dev": true - }, "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -7897,30 +7051,6 @@ "integrity": "sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==", "dev": true }, - "ccount": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz", - "integrity": "sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==", - "dev": true - }, - "character-entities": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz", - "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==", - "dev": true - }, - "character-entities-legacy": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz", - "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==", - "dev": true - }, - "character-reference-invalid": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz", - "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==", - "dev": true - }, "chokidar": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", @@ -8295,20 +7425,6 @@ "@leichtgewicht/ip-codec": "^2.0.1" } }, - "doctoc": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/doctoc/-/doctoc-2.2.1.tgz", - "integrity": "sha512-qNJ1gsuo7hH40vlXTVVrADm6pdg30bns/Mo7Nv1SxuXSM1bwF9b4xQ40a6EFT/L1cI+Yylbyi8MPI4G4y7XJzQ==", - "dev": true, - "requires": { - "@textlint/markdown-to-ast": "^12.1.1", - "anchor-markdown-header": "^0.6.0", - "htmlparser2": "^7.2.0", - "minimist": "^1.2.6", - "underscore": "^1.13.2", - "update-section": "^0.3.3" - } - }, "dom-converter": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz", @@ -8414,12 +7530,6 @@ } } }, - "emoji-regex": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.1.0.tgz", - "integrity": "sha512-xAEnNCT3w2Tg6MA7ly6QqYJvEoY1tm9iIjJ3yMKK9JPlWuRHAMoe5iETwQnx3M9TVbFMfsrBgWKR+IsmswwNjg==", - "dev": true - }, "encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -8444,12 +7554,6 @@ "tapable": "^2.2.0" } }, - "entities": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz", - "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==", - "dev": true - }, "envinfo": { "version": "7.10.0", "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.10.0.tgz", @@ -8526,12 +7630,6 @@ "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", "dev": true }, - "escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true - }, "eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -8695,12 +7793,6 @@ } } }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, "extract-zip": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", @@ -8730,15 +7822,6 @@ "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", "dev": true }, - "fault": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz", - "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==", - "dev": true, - "requires": { - "format": "^0.2.0" - } - }, "faye-websocket": { "version": "0.11.4", "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", @@ -8827,12 +7910,6 @@ "is-callable": "^1.1.3" } }, - "format": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz", - "integrity": "sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==", - "dev": true - }, "forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -9117,18 +8194,6 @@ "tapable": "^2.0.0" } }, - "htmlparser2": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz", - "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==", - "dev": true, - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.2", - "domutils": "^2.8.0", - "entities": "^3.0.1" - } - }, "http-deceiver": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", @@ -9263,22 +8328,6 @@ "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==", "dev": true }, - "is-alphabetical": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz", - "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==", - "dev": true - }, - "is-alphanumerical": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz", - "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==", - "dev": true, - "requires": { - "is-alphabetical": "^1.0.0", - "is-decimal": "^1.0.0" - } - }, "is-arguments": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", @@ -9298,12 +8347,6 @@ "binary-extensions": "^2.0.0" } }, - "is-buffer": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", - "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", - "dev": true - }, "is-callable": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", @@ -9319,12 +8362,6 @@ "has": "^1.0.3" } }, - "is-decimal": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz", - "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==", - "dev": true - }, "is-docker": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", @@ -9355,12 +8392,6 @@ "is-extglob": "^2.1.1" } }, - "is-hexadecimal": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz", - "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==", - "dev": true - }, "is-nan": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz", @@ -9377,12 +8408,6 @@ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true }, - "is-plain-obj": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", - "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", - "dev": true - }, "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", @@ -9498,12 +8523,6 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, - "longest-streak": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz", - "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==", - "dev": true - }, "lower-case": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", @@ -9513,15 +8532,6 @@ "tslib": "^2.0.3" } }, - "markdown-table": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz", - "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==", - "dev": true, - "requires": { - "repeat-string": "^1.0.0" - } - }, "md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", @@ -9533,121 +8543,6 @@ "safe-buffer": "^5.1.2" } }, - "mdast-util-find-and-replace": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-1.1.1.tgz", - "integrity": "sha512-9cKl33Y21lyckGzpSmEQnIDjEfeeWelN5s1kUW1LwdB0Fkuq2u+4GdqcGEygYxJE8GVqCl0741bYXHgamfWAZA==", - "dev": true, - "requires": { - "escape-string-regexp": "^4.0.0", - "unist-util-is": "^4.0.0", - "unist-util-visit-parents": "^3.0.0" - } - }, - "mdast-util-footnote": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/mdast-util-footnote/-/mdast-util-footnote-0.1.7.tgz", - "integrity": "sha512-QxNdO8qSxqbO2e3m09KwDKfWiLgqyCurdWTQ198NpbZ2hxntdc+VKS4fDJCmNWbAroUdYnSthu+XbZ8ovh8C3w==", - "dev": true, - "requires": { - "mdast-util-to-markdown": "^0.6.0", - "micromark": "~2.11.0" - } - }, - "mdast-util-from-markdown": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz", - "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==", - "dev": true, - "requires": { - "@types/mdast": "^3.0.0", - "mdast-util-to-string": "^2.0.0", - "micromark": "~2.11.0", - "parse-entities": "^2.0.0", - "unist-util-stringify-position": "^2.0.0" - } - }, - "mdast-util-frontmatter": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/mdast-util-frontmatter/-/mdast-util-frontmatter-0.2.0.tgz", - "integrity": "sha512-FHKL4w4S5fdt1KjJCwB0178WJ0evnyyQr5kXTM3wrOVpytD0hrkvd+AOOjU9Td8onOejCkmZ+HQRT3CZ3coHHQ==", - "dev": true, - "requires": { - "micromark-extension-frontmatter": "^0.2.0" - } - }, - "mdast-util-gfm": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-0.1.2.tgz", - "integrity": "sha512-NNkhDx/qYcuOWB7xHUGWZYVXvjPFFd6afg6/e2g+SV4r9q5XUcCbV4Wfa3DLYIiD+xAEZc6K4MGaE/m0KDcPwQ==", - "dev": true, - "requires": { - "mdast-util-gfm-autolink-literal": "^0.1.0", - "mdast-util-gfm-strikethrough": "^0.2.0", - "mdast-util-gfm-table": "^0.1.0", - "mdast-util-gfm-task-list-item": "^0.1.0", - "mdast-util-to-markdown": "^0.6.1" - } - }, - "mdast-util-gfm-autolink-literal": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-0.1.3.tgz", - "integrity": "sha512-GjmLjWrXg1wqMIO9+ZsRik/s7PLwTaeCHVB7vRxUwLntZc8mzmTsLVr6HW1yLokcnhfURsn5zmSVdi3/xWWu1A==", - "dev": true, - "requires": { - "ccount": "^1.0.0", - "mdast-util-find-and-replace": "^1.1.0", - "micromark": "^2.11.3" - } - }, - "mdast-util-gfm-strikethrough": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-0.2.3.tgz", - "integrity": "sha512-5OQLXpt6qdbttcDG/UxYY7Yjj3e8P7X16LzvpX8pIQPYJ/C2Z1qFGMmcw+1PZMUM3Z8wt8NRfYTvCni93mgsgA==", - "dev": true, - "requires": { - "mdast-util-to-markdown": "^0.6.0" - } - }, - "mdast-util-gfm-table": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-0.1.6.tgz", - "integrity": "sha512-j4yDxQ66AJSBwGkbpFEp9uG/LS1tZV3P33fN1gkyRB2LoRL+RR3f76m0HPHaby6F4Z5xr9Fv1URmATlRRUIpRQ==", - "dev": true, - "requires": { - "markdown-table": "^2.0.0", - "mdast-util-to-markdown": "~0.6.0" - } - }, - "mdast-util-gfm-task-list-item": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-0.1.6.tgz", - "integrity": "sha512-/d51FFIfPsSmCIRNp7E6pozM9z1GYPIkSy1urQ8s/o4TC22BZ7DqfHFWiqBD23bc7J3vV1Fc9O4QIHBlfuit8A==", - "dev": true, - "requires": { - "mdast-util-to-markdown": "~0.6.0" - } - }, - "mdast-util-to-markdown": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz", - "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==", - "dev": true, - "requires": { - "@types/unist": "^2.0.0", - "longest-streak": "^2.0.0", - "mdast-util-to-string": "^2.0.0", - "parse-entities": "^2.0.0", - "repeat-string": "^1.0.0", - "zwitch": "^1.0.0" - } - }, - "mdast-util-to-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz", - "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==", - "dev": true - }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -9681,90 +8576,6 @@ "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", "dev": true }, - "micromark": { - "version": "2.11.4", - "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz", - "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==", - "dev": true, - "requires": { - "debug": "^4.0.0", - "parse-entities": "^2.0.0" - } - }, - "micromark-extension-footnote": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/micromark-extension-footnote/-/micromark-extension-footnote-0.3.2.tgz", - "integrity": "sha512-gr/BeIxbIWQoUm02cIfK7mdMZ/fbroRpLsck4kvFtjbzP4yi+OPVbnukTc/zy0i7spC2xYE/dbX1Sur8BEDJsQ==", - "dev": true, - "requires": { - "micromark": "~2.11.0" - } - }, - "micromark-extension-frontmatter": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/micromark-extension-frontmatter/-/micromark-extension-frontmatter-0.2.2.tgz", - "integrity": "sha512-q6nPLFCMTLtfsctAuS0Xh4vaolxSFUWUWR6PZSrXXiRy+SANGllpcqdXFv2z07l0Xz/6Hl40hK0ffNCJPH2n1A==", - "dev": true, - "requires": { - "fault": "^1.0.0" - } - }, - "micromark-extension-gfm": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-0.3.3.tgz", - "integrity": "sha512-oVN4zv5/tAIA+l3GbMi7lWeYpJ14oQyJ3uEim20ktYFAcfX1x3LNlFGGlmrZHt7u9YlKExmyJdDGaTt6cMSR/A==", - "dev": true, - "requires": { - "micromark": "~2.11.0", - "micromark-extension-gfm-autolink-literal": "~0.5.0", - "micromark-extension-gfm-strikethrough": "~0.6.5", - "micromark-extension-gfm-table": "~0.4.0", - "micromark-extension-gfm-tagfilter": "~0.3.0", - "micromark-extension-gfm-task-list-item": "~0.3.0" - } - }, - "micromark-extension-gfm-autolink-literal": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-0.5.7.tgz", - "integrity": "sha512-ePiDGH0/lhcngCe8FtH4ARFoxKTUelMp4L7Gg2pujYD5CSMb9PbblnyL+AAMud/SNMyusbS2XDSiPIRcQoNFAw==", - "dev": true, - "requires": { - "micromark": "~2.11.3" - } - }, - "micromark-extension-gfm-strikethrough": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-0.6.5.tgz", - "integrity": "sha512-PpOKlgokpQRwUesRwWEp+fHjGGkZEejj83k9gU5iXCbDG+XBA92BqnRKYJdfqfkrRcZRgGuPuXb7DaK/DmxOhw==", - "dev": true, - "requires": { - "micromark": "~2.11.0" - } - }, - "micromark-extension-gfm-table": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-0.4.3.tgz", - "integrity": "sha512-hVGvESPq0fk6ALWtomcwmgLvH8ZSVpcPjzi0AjPclB9FsVRgMtGZkUcpE0zgjOCFAznKepF4z3hX8z6e3HODdA==", - "dev": true, - "requires": { - "micromark": "~2.11.0" - } - }, - "micromark-extension-gfm-tagfilter": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-0.3.0.tgz", - "integrity": "sha512-9GU0xBatryXifL//FJH+tAZ6i240xQuFrSL7mYi8f4oZSbc+NvXjkrHemeYP0+L4ZUT+Ptz3b95zhUZnMtoi/Q==", - "dev": true - }, - "micromark-extension-gfm-task-list-item": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-0.3.3.tgz", - "integrity": "sha512-0zvM5iSLKrc/NQl84pZSjGo66aTGd57C1idmlWmE87lkMcXrTxg1uXa/nXomxJytoje9trP0NDLvw4bZ/Z/XCQ==", - "dev": true, - "requires": { - "micromark": "~2.11.0" - } - }, "micromatch": { "version": "4.0.5", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", @@ -9840,12 +8651,6 @@ "brace-expansion": "^1.1.7" } }, - "minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true - }, "mkdirp-classic": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", @@ -10107,20 +8912,6 @@ "safe-buffer": "^5.1.1" } }, - "parse-entities": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", - "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==", - "dev": true, - "requires": { - "character-entities": "^1.0.0", - "character-entities-legacy": "^1.0.0", - "character-reference-invalid": "^1.0.0", - "is-alphanumerical": "^1.0.0", - "is-decimal": "^1.0.0", - "is-hexadecimal": "^1.0.0" - } - }, "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -10425,45 +9216,6 @@ "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==", "dev": true }, - "remark-footnotes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/remark-footnotes/-/remark-footnotes-3.0.0.tgz", - "integrity": "sha512-ZssAvH9FjGYlJ/PBVKdSmfyPc3Cz4rTWgZLI4iE/SX8Nt5l3o3oEjv3wwG5VD7xOjktzdwp5coac+kJV9l4jgg==", - "dev": true, - "requires": { - "mdast-util-footnote": "^0.1.0", - "micromark-extension-footnote": "^0.3.0" - } - }, - "remark-frontmatter": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-3.0.0.tgz", - "integrity": "sha512-mSuDd3svCHs+2PyO29h7iijIZx4plX0fheacJcAoYAASfgzgVIcXGYSq9GFyYocFLftQs8IOmmkgtOovs6d4oA==", - "dev": true, - "requires": { - "mdast-util-frontmatter": "^0.2.0", - "micromark-extension-frontmatter": "^0.2.0" - } - }, - "remark-gfm": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-1.0.0.tgz", - "integrity": "sha512-KfexHJCiqvrdBZVbQ6RopMZGwaXz6wFJEfByIuEwGf0arvITHjiKKZ1dpXujjH9KZdm1//XJQwgfnJ3lmXaDPA==", - "dev": true, - "requires": { - "mdast-util-gfm": "^0.1.0", - "micromark-extension-gfm": "^0.3.0" - } - }, - "remark-parse": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz", - "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==", - "dev": true, - "requires": { - "mdast-util-from-markdown": "^0.8.0" - } - }, "renderkid": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz", @@ -10497,12 +9249,6 @@ } } }, - "repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==", - "dev": true - }, "require-from-string": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", @@ -11079,18 +9825,6 @@ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, - "traverse": { - "version": "0.6.7", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.7.tgz", - "integrity": "sha512-/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg==", - "dev": true - }, - "trough": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz", - "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==", - "dev": true - }, "tslib": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", @@ -11139,56 +9873,11 @@ } } }, - "underscore": { - "version": "1.13.6", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz", - "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==", - "dev": true - }, - "unified": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz", - "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==", - "dev": true, - "requires": { - "bail": "^1.0.0", - "extend": "^3.0.0", - "is-buffer": "^2.0.0", - "is-plain-obj": "^2.0.0", - "trough": "^1.0.0", - "vfile": "^4.0.0" - } - }, "uniqid": { "version": "5.4.0", "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-5.4.0.tgz", "integrity": "sha512-38JRbJ4Fj94VmnC7G/J/5n5SC7Ab46OM5iNtSstB/ko3l1b5g7ALt4qzHFgGciFkyiRNtDXtLNb+VsxtMSE77A==" }, - "unist-util-is": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz", - "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==", - "dev": true - }, - "unist-util-stringify-position": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz", - "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==", - "dev": true, - "requires": { - "@types/unist": "^2.0.2" - } - }, - "unist-util-visit-parents": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz", - "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==", - "dev": true, - "requires": { - "@types/unist": "^2.0.0", - "unist-util-is": "^4.0.0" - } - }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -11205,12 +9894,6 @@ "picocolors": "^1.0.0" } }, - "update-section": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/update-section/-/update-section-0.3.3.tgz", - "integrity": "sha512-BpRZMZpgXLuTiKeiu7kK0nIPwGdyrqrs6EDSaXtjD/aQ2T+qVo9a5hRC3HN3iJjCMxNT/VxoLGQ7E/OzE5ucnw==", - "dev": true - }, "uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -11280,28 +9963,6 @@ "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", "dev": true }, - "vfile": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz", - "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==", - "dev": true, - "requires": { - "@types/unist": "^2.0.0", - "is-buffer": "^2.0.0", - "unist-util-stringify-position": "^2.0.0", - "vfile-message": "^2.0.0" - } - }, - "vfile-message": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz", - "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==", - "dev": true, - "requires": { - "@types/unist": "^2.0.0", - "unist-util-stringify-position": "^2.0.0" - } - }, "vm-browserify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", @@ -11633,12 +10294,6 @@ "buffer-crc32": "~0.2.3", "fd-slicer": "~1.1.0" } - }, - "zwitch": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz", - "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==", - "dev": true } } } diff --git a/templates/ctl-scaffold/package.json b/templates/ctl-scaffold/package.json index a1b19fcdd8..612f0c84a9 100644 --- a/templates/ctl-scaffold/package.json +++ b/templates/ctl-scaffold/package.json @@ -27,8 +27,8 @@ "dependencies": { "@emurgo/cardano-message-signing-browser": "1.0.1", "@emurgo/cardano-message-signing-nodejs": "1.0.1", - "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.3", - "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.3", + "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.5", + "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.5", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1", "@mlabs-haskell/json-bigint": " 1.0.0", "@noble/secp256k1": "^1.7.0", diff --git a/templates/ctl-scaffold/packages.dhall b/templates/ctl-scaffold/packages.dhall index 61e40db6a0..de11c58968 100644 --- a/templates/ctl-scaffold/packages.dhall +++ b/templates/ctl-scaffold/packages.dhall @@ -144,8 +144,23 @@ let additions = , "uint" , "untagged-union" ] - , repo = "https://github.com/errfrom/purescript-aeson.git" - , version = "f614a840036aabb059017d03cf365f4199b9547b" + , repo = "https://github.com/mlabs-haskell/purescript-aeson.git" + , version = "e411566cf5e3adf05ea9ae866705886cfba4bfa6" + } + , bignumber = + { dependencies = + [ "console" + , "effect" + , "either" + , "exceptions" + , "functions" + , "integers" + , "partial" + , "prelude" + , "tuples" + ] + , repo = "https://github.com/mlabs-haskell/purescript-bignumber" + , version = "760d11b41ece31b8cdd3c53349c5c2fd48d3ff89" } , properties = { dependencies = [ "prelude", "console" ] @@ -204,8 +219,8 @@ let additions = , "unordered-collections" , "unsafe-coerce" ] - , repo = "https://github.com/errfrom/medea-ps.git" - , version = "00981e4ce7249808413a6db8d88d849bbe85245a" + , repo = "https://github.com/mlabs-haskell/medea-ps.git" + , version = "9a03a7b7b983fc1d21c4e1fef4cf0748b42f3734" } , toppokki = { dependencies = @@ -218,22 +233,21 @@ let additions = , "node-fs-aff" ] , repo = "https://github.com/mlabs-haskell/purescript-toppokki" - , version = "db0d3c12348da576b28a18782df4ae5d7cc44408" + , version = "f90f92f0ddf0eecc73705c1675db37918d18cbcb" } - , bignumber = + , noble-secp256k1 = { dependencies = - [ "console" + [ "aff" + , "aff-promise" , "effect" - , "either" - , "exceptions" - , "functions" - , "integers" - , "partial" , "prelude" + , "spec" , "tuples" + , "unsafe-coerce" ] - , repo = "https://github.com/errfrom/purescript-bignumber" - , version = "9b3179ad07428d189e42a7a205aab9c7c4849d4a" + , repo = + "https://github.com/mlabs-haskell/purescript-noble-secp256k1.git" + , version = "a3c0f67e9fdb0086016d7aebfad35d09a08b4ecd" } , cardano-transaction-lib = { dependencies = @@ -330,20 +344,6 @@ let additions = , repo = "https://github.com/Plutonomicon/cardano-transaction-lib.git" , version = "325665b19859bbf3e48e296e9aa717673f5f3d79" } - , noble-secp256k1 = - { dependencies = - [ "aff" - , "aff-promise" - , "effect" - , "prelude" - , "spec" - , "tuples" - , "unsafe-coerce" - ] - , repo = - "https://github.com/mlabs-haskell/purescript-noble-secp256k1.git" - , version = "a3c0f67e9fdb0086016d7aebfad35d09a08b4ecd" - } } in upstream // additions diff --git a/templates/ctl-scaffold/spago-packages.nix b/templates/ctl-scaffold/spago-packages.nix index 17e1e791ab..91d6b9f788 100644 --- a/templates/ctl-scaffold/spago-packages.nix +++ b/templates/ctl-scaffold/spago-packages.nix @@ -7,10 +7,10 @@ let "aeson" = pkgs.stdenv.mkDerivation { name = "aeson"; - version = "f614a840036aabb059017d03cf365f4199b9547b"; + version = "e411566cf5e3adf05ea9ae866705886cfba4bfa6"; src = pkgs.fetchgit { - url = "https://github.com/errfrom/purescript-aeson.git"; - rev = "f614a840036aabb059017d03cf365f4199b9547b"; + url = "https://github.com/mlabs-haskell/purescript-aeson.git"; + rev = "e411566cf5e3adf05ea9ae866705886cfba4bfa6"; sha256 = "01wqbd9pz1pmz1f0z5w4gwaswbdnkr9md7fihg4d91vs690zf792"; }; phases = "installPhase"; @@ -199,10 +199,10 @@ let "bignumber" = pkgs.stdenv.mkDerivation { name = "bignumber"; - version = "9b3179ad07428d189e42a7a205aab9c7c4849d4a"; + version = "760d11b41ece31b8cdd3c53349c5c2fd48d3ff89"; src = pkgs.fetchgit { - url = "https://github.com/errfrom/purescript-bignumber"; - rev = "9b3179ad07428d189e42a7a205aab9c7c4849d4a"; + url = "https://github.com/mlabs-haskell/purescript-bignumber"; + rev = "760d11b41ece31b8cdd3c53349c5c2fd48d3ff89"; sha256 = "03py821gnkgi5p7zaxwr4rqsiv67v83y5c04i6x4v15nr6aaf7vz"; }; phases = "installPhase"; @@ -727,10 +727,10 @@ let "medea" = pkgs.stdenv.mkDerivation { name = "medea"; - version = "00981e4ce7249808413a6db8d88d849bbe85245a"; + version = "9a03a7b7b983fc1d21c4e1fef4cf0748b42f3734"; src = pkgs.fetchgit { - url = "https://github.com/errfrom/medea-ps.git"; - rev = "00981e4ce7249808413a6db8d88d849bbe85245a"; + url = "https://github.com/mlabs-haskell/medea-ps.git"; + rev = "9a03a7b7b983fc1d21c4e1fef4cf0748b42f3734"; sha256 = "0sxv9l53hqjx5n7gdnpr5ydxp0zr2wv0ikk2sc0ch9whq5rridcy"; }; phases = "installPhase"; @@ -1375,11 +1375,11 @@ let "toppokki" = pkgs.stdenv.mkDerivation { name = "toppokki"; - version = "db0d3c12348da576b28a18782df4ae5d7cc44408"; + version = "f90f92f0ddf0eecc73705c1675db37918d18cbcb"; src = pkgs.fetchgit { url = "https://github.com/mlabs-haskell/purescript-toppokki"; - rev = "db0d3c12348da576b28a18782df4ae5d7cc44408"; - sha256 = "1ck1g9mrm8kclmzkrg9hbm97gbvjbk0dcqnzby0c38pc2dqa7xwf"; + rev = "f90f92f0ddf0eecc73705c1675db37918d18cbcb"; + sha256 = "1kmqajf7n5l9lk4amyma3rhm60llrgamap5hi21kkqs52xm3fr2q"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; From b764665e3245387ef2d944217d3e2e36feadef8a Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Fri, 6 Oct 2023 18:05:30 +0400 Subject: [PATCH 42/85] Fix 'Invalid "exports" main target "index.js" defined in the package config ' --- package-lock.json | 28 ++++++++++++------------ package.json | 4 ++-- templates/ctl-scaffold/package-lock.json | 28 ++++++++++++------------ templates/ctl-scaffold/package.json | 4 ++-- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1814d31217..efff18a3ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,8 +11,8 @@ "dependencies": { "@emurgo/cardano-message-signing-browser": "1.0.1", "@emurgo/cardano-message-signing-nodejs": "1.0.1", - "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.5", - "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.5", + "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.6", + "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.6", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1", "@mlabs-haskell/json-bigint": " 1.0.0", "@noble/secp256k1": "^1.7.0", @@ -496,18 +496,18 @@ "dev": true }, "node_modules/@mlabs-haskell/cardano-serialization-lib-gc-browser": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.5.tgz", - "integrity": "sha512-twCJkL32nytljTje4893P6IM3pI1ZwekrbuWU9C12HQSyS6OpevB/38WfLIZKLS82ZCkqQclDVdnrzCdqd7yNg==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.6.tgz", + "integrity": "sha512-b7dLrrhjUJSdsmjzariCZO734NB+M/ONLGBiQ/TQzMRtsMydqSFQg6WbMdwYPustoNmQOg6a8bm9+RgllqdmFw==", "dependencies": { "@emurgo/cardano-serialization-lib-browser": "^11.2.1", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" } }, "node_modules/@mlabs-haskell/cardano-serialization-lib-gc-nodejs": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.5.tgz", - "integrity": "sha512-0NuvPFwcdQ94pozFv/VRnFOYGlbd6sb18KsTJP0tkYeuI++kjxZmtF0sT7uLUMFqMbezgYqmA1sSAFWJ6Sq5Sw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.6.tgz", + "integrity": "sha512-I1FqhjEHgib+y0+6K1tSqvrtldRvqjrM5mL+TW9224ezEDScQeCroPWbgGBwwi6rjkN9YpS8Uz6gC0vo8lua1A==", "dependencies": { "@emurgo/cardano-serialization-lib-nodejs": "^11.4.0", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" @@ -6912,18 +6912,18 @@ "dev": true }, "@mlabs-haskell/cardano-serialization-lib-gc-browser": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.5.tgz", - "integrity": "sha512-twCJkL32nytljTje4893P6IM3pI1ZwekrbuWU9C12HQSyS6OpevB/38WfLIZKLS82ZCkqQclDVdnrzCdqd7yNg==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.6.tgz", + "integrity": "sha512-b7dLrrhjUJSdsmjzariCZO734NB+M/ONLGBiQ/TQzMRtsMydqSFQg6WbMdwYPustoNmQOg6a8bm9+RgllqdmFw==", "requires": { "@emurgo/cardano-serialization-lib-browser": "^11.2.1", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" } }, "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.5.tgz", - "integrity": "sha512-0NuvPFwcdQ94pozFv/VRnFOYGlbd6sb18KsTJP0tkYeuI++kjxZmtF0sT7uLUMFqMbezgYqmA1sSAFWJ6Sq5Sw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.6.tgz", + "integrity": "sha512-I1FqhjEHgib+y0+6K1tSqvrtldRvqjrM5mL+TW9224ezEDScQeCroPWbgGBwwi6rjkN9YpS8Uz6gC0vo8lua1A==", "requires": { "@emurgo/cardano-serialization-lib-nodejs": "^11.4.0", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" diff --git a/package.json b/package.json index eeca76b19c..0d036440b6 100755 --- a/package.json +++ b/package.json @@ -36,8 +36,8 @@ "dependencies": { "@emurgo/cardano-message-signing-browser": "1.0.1", "@emurgo/cardano-message-signing-nodejs": "1.0.1", - "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.5", - "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.5", + "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.6", + "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.6", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1", "@mlabs-haskell/json-bigint": " 1.0.0", "@noble/secp256k1": "^1.7.0", diff --git a/templates/ctl-scaffold/package-lock.json b/templates/ctl-scaffold/package-lock.json index 561ee2f297..27ccbe434a 100644 --- a/templates/ctl-scaffold/package-lock.json +++ b/templates/ctl-scaffold/package-lock.json @@ -11,8 +11,8 @@ "dependencies": { "@emurgo/cardano-message-signing-browser": "1.0.1", "@emurgo/cardano-message-signing-nodejs": "1.0.1", - "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.5", - "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.5", + "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.6", + "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.6", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1", "@mlabs-haskell/json-bigint": " 1.0.0", "@noble/secp256k1": "^1.7.0", @@ -495,18 +495,18 @@ "dev": true }, "node_modules/@mlabs-haskell/cardano-serialization-lib-gc-browser": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.5.tgz", - "integrity": "sha512-twCJkL32nytljTje4893P6IM3pI1ZwekrbuWU9C12HQSyS6OpevB/38WfLIZKLS82ZCkqQclDVdnrzCdqd7yNg==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.6.tgz", + "integrity": "sha512-b7dLrrhjUJSdsmjzariCZO734NB+M/ONLGBiQ/TQzMRtsMydqSFQg6WbMdwYPustoNmQOg6a8bm9+RgllqdmFw==", "dependencies": { "@emurgo/cardano-serialization-lib-browser": "^11.2.1", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" } }, "node_modules/@mlabs-haskell/cardano-serialization-lib-gc-nodejs": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.5.tgz", - "integrity": "sha512-0NuvPFwcdQ94pozFv/VRnFOYGlbd6sb18KsTJP0tkYeuI++kjxZmtF0sT7uLUMFqMbezgYqmA1sSAFWJ6Sq5Sw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.6.tgz", + "integrity": "sha512-I1FqhjEHgib+y0+6K1tSqvrtldRvqjrM5mL+TW9224ezEDScQeCroPWbgGBwwi6rjkN9YpS8Uz6gC0vo8lua1A==", "dependencies": { "@emurgo/cardano-serialization-lib-nodejs": "^11.4.0", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" @@ -6119,18 +6119,18 @@ "dev": true }, "@mlabs-haskell/cardano-serialization-lib-gc-browser": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.5.tgz", - "integrity": "sha512-twCJkL32nytljTje4893P6IM3pI1ZwekrbuWU9C12HQSyS6OpevB/38WfLIZKLS82ZCkqQclDVdnrzCdqd7yNg==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-browser/-/cardano-serialization-lib-gc-browser-1.0.6.tgz", + "integrity": "sha512-b7dLrrhjUJSdsmjzariCZO734NB+M/ONLGBiQ/TQzMRtsMydqSFQg6WbMdwYPustoNmQOg6a8bm9+RgllqdmFw==", "requires": { "@emurgo/cardano-serialization-lib-browser": "^11.2.1", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" } }, "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.5.tgz", - "integrity": "sha512-0NuvPFwcdQ94pozFv/VRnFOYGlbd6sb18KsTJP0tkYeuI++kjxZmtF0sT7uLUMFqMbezgYqmA1sSAFWJ6Sq5Sw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/cardano-serialization-lib-gc-nodejs/-/cardano-serialization-lib-gc-nodejs-1.0.6.tgz", + "integrity": "sha512-I1FqhjEHgib+y0+6K1tSqvrtldRvqjrM5mL+TW9224ezEDScQeCroPWbgGBwwi6rjkN9YpS8Uz6gC0vo8lua1A==", "requires": { "@emurgo/cardano-serialization-lib-nodejs": "^11.4.0", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1" diff --git a/templates/ctl-scaffold/package.json b/templates/ctl-scaffold/package.json index 612f0c84a9..e6ad497878 100644 --- a/templates/ctl-scaffold/package.json +++ b/templates/ctl-scaffold/package.json @@ -27,8 +27,8 @@ "dependencies": { "@emurgo/cardano-message-signing-browser": "1.0.1", "@emurgo/cardano-message-signing-nodejs": "1.0.1", - "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.5", - "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.5", + "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.6", + "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.6", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1", "@mlabs-haskell/json-bigint": " 1.0.0", "@noble/secp256k1": "^1.7.0", From 0c314cc3602b185576575e3aa7cda37640a472e6 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Fri, 6 Oct 2023 20:02:21 +0400 Subject: [PATCH 43/85] Fix toppoki dependency --- packages.dhall | 2 +- spago-packages.nix | 6 +++--- templates/ctl-scaffold/packages.dhall | 2 +- templates/ctl-scaffold/spago-packages.nix | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages.dhall b/packages.dhall index 3bfea3922b..59d1f7eb24 100644 --- a/packages.dhall +++ b/packages.dhall @@ -233,7 +233,7 @@ let additions = , "node-fs-aff" ] , repo = "https://github.com/mlabs-haskell/purescript-toppokki" - , version = "f90f92f0ddf0eecc73705c1675db37918d18cbcb" + , version = "5992e93396a734c980ef61c74df5b6ab46108920" } , noble-secp256k1 = { dependencies = diff --git a/spago-packages.nix b/spago-packages.nix index ee24509525..ad8fec5935 100644 --- a/spago-packages.nix +++ b/spago-packages.nix @@ -1363,11 +1363,11 @@ let "toppokki" = pkgs.stdenv.mkDerivation { name = "toppokki"; - version = "f90f92f0ddf0eecc73705c1675db37918d18cbcb"; + version = "5992e93396a734c980ef61c74df5b6ab46108920"; src = pkgs.fetchgit { url = "https://github.com/mlabs-haskell/purescript-toppokki"; - rev = "f90f92f0ddf0eecc73705c1675db37918d18cbcb"; - sha256 = "1kmqajf7n5l9lk4amyma3rhm60llrgamap5hi21kkqs52xm3fr2q"; + rev = "5992e93396a734c980ef61c74df5b6ab46108920"; + sha256 = "12sbs5x20rmr6xrh9y69aw7bmiwnmj8a0s5s9s1mh66fyh7gfh3s"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; diff --git a/templates/ctl-scaffold/packages.dhall b/templates/ctl-scaffold/packages.dhall index de11c58968..765b35fc48 100644 --- a/templates/ctl-scaffold/packages.dhall +++ b/templates/ctl-scaffold/packages.dhall @@ -233,7 +233,7 @@ let additions = , "node-fs-aff" ] , repo = "https://github.com/mlabs-haskell/purescript-toppokki" - , version = "f90f92f0ddf0eecc73705c1675db37918d18cbcb" + , version = "5992e93396a734c980ef61c74df5b6ab46108920" } , noble-secp256k1 = { dependencies = diff --git a/templates/ctl-scaffold/spago-packages.nix b/templates/ctl-scaffold/spago-packages.nix index 91d6b9f788..ddecaa01d4 100644 --- a/templates/ctl-scaffold/spago-packages.nix +++ b/templates/ctl-scaffold/spago-packages.nix @@ -1375,11 +1375,11 @@ let "toppokki" = pkgs.stdenv.mkDerivation { name = "toppokki"; - version = "f90f92f0ddf0eecc73705c1675db37918d18cbcb"; + version = "5992e93396a734c980ef61c74df5b6ab46108920"; src = pkgs.fetchgit { url = "https://github.com/mlabs-haskell/purescript-toppokki"; - rev = "f90f92f0ddf0eecc73705c1675db37918d18cbcb"; - sha256 = "1kmqajf7n5l9lk4amyma3rhm60llrgamap5hi21kkqs52xm3fr2q"; + rev = "5992e93396a734c980ef61c74df5b6ab46108920"; + sha256 = "12sbs5x20rmr6xrh9y69aw7bmiwnmj8a0s5s9s1mh66fyh7gfh3s"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; From 62faa6e614946fd50eb4d046d0f40ac613be1450 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Fri, 6 Oct 2023 22:02:38 +0400 Subject: [PATCH 44/85] Inline script contents in ApplyArgs example to avoid bundling files --- test/ApplyArgs.purs | 281 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 235 insertions(+), 46 deletions(-) diff --git a/test/ApplyArgs.purs b/test/ApplyArgs.purs index e2f9c11e73..9e08c782bb 100644 --- a/test/ApplyArgs.purs +++ b/test/ApplyArgs.purs @@ -13,8 +13,6 @@ import Contract.TextEnvelope , plutusScriptV2FromEnvelope ) import Control.Monad.Error.Class (class MonadError) -import Control.Monad.Trans.Class (lift) -import Control.Parallel (parTraverse) import Ctl.Internal.ApplyArgs (applyArgs) import Ctl.Internal.Cardano.TextEnvelope (TextEnvelope) import Ctl.Internal.Test.TestPlanM (TestPlanM, interpret) @@ -22,54 +20,244 @@ import Data.BigInt (fromInt) import Data.List.Lazy (replicate) import Data.Profunctor.Choice (left) import Effect.Aff (Error, error, throwError) -import Effect.Aff.Class (liftAff) import Foreign.Object (Object) import Foreign.Object as Object import Mote (group, test) -import Node.Encoding (Encoding(UTF8)) -import Node.FS.Aff (readTextFile) import Test.Spec.Assertions (shouldEqual) -scriptFilenames :: Object String -scriptFilenames = +scriptSources :: Object String +scriptSources = Object.fromFoldable - [ "always-fails" /\ "always-fails.plutus" - , "include-datum" /\ "include-datum.plutus" - , "one-shot-minting" /\ "one-shot-minting.plutus" - , "redeemer1-validator" /\ "redeemer1-validator.plutus" - , "always-succeeds-v2" /\ "always-succeeds-v2.plutus" - , "one-shot-minting-v2" /\ "one-shot-minting-v2.plutus" - , "check-datum-is-inline" /\ "check-datum-is-inline.plutus" - , "always-fails-big-arg" /\ "applied/always-fails-big-arg.plutus" - , "always-fails-no-args" /\ "applied/always-fails-no-args.plutus" - , "always-fails-unit" /\ "applied/always-fails-unit.plutus" + [ "always-fails" /\ + """ +{ + "type": "PlutusScriptV1", + "description": "", + "cborHex": "581e581c01000033223232222350040071235002353003001498498480048005" +} + """ + , "always-fails-big-arg" /\ + """ +{ + "type": "PlutusScriptV1", + "description": "", + "cborHex": "58ff58fd0100003333333332232322223500400712350023530030014984984800480053010107004c0103d87980004c01089fd87980424d5fff004c01465f58404d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d414dff004c0107a20507424d5f08004c0154d9055f9f079fd87980424d5f5f58404d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d414dffffff004c0114d87e9f809f01ffa0a201d8798002d87b9f02ffff0001" +} +""" + , "always-fails-no-args" /\ + """ +{ + "type": "PlutusScriptV1", + "description": "", + "cborHex": "581e581c01000033223232222350040071235002353003001498498480048005" +} +""" + , "always-fails-unit" /\ + """ +{ + "type": "PlutusScriptV1", + "description": "", + "cborHex": "5826582401000033322323222235004007123500235300300149849848004800530103d879800001" +} +""" + + , "include-datum" /\ + """ +{ + "type": "PlutusScriptV1", + "description": "include-datum", + "cborHex": "55540100002225333573466e1cdd6801a40a82930b01" +} +""" + , "include-datum-big-arg" /\ + """ +{ + "type": "PlutusScriptV1", + "description": "", + "cborHex": "58f658f401000033333332225333573466e1cdd6801a40a82930b2610107004c0103d87980004c01089fd87980424d5fff004c01465f58404d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d414dff004c0107a20507424d5f08004c0154d9055f9f079fd87980424d5f5f58404d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d414dffffff004c0114d87e9f809f01ffa0a201d8798002d87b9f02ffff0001" +} +""" + , "include-datum-no-args" /\ + """ +{ + "type": "PlutusScriptV1", + "description": "", + "cborHex": "55540100002225333573466e1cdd6801a40a82930b01" +} +""" + , "include-datum-unit" /\ + """ +{ + "type": "PlutusScriptV1", + "description": "", + "cborHex": "581d581b01000032225333573466e1cdd6801a40a82930b26103d879800001" +} +""" + + , "one-shot-minting" /\ + """ +{ + "type": "PlutusScriptV1", + "description": "one-shot-minting", + "cborHex": "5908d75908d401000033232332233223232323232323232323232323232323232323222223232323232325335533533355300b120013232123300122333500522002002001002350012200112330012253350021022100101f2325335333573466e3cd400488008d4014880080840804ccd5cd19b873500122001350052200102102010203500122002355001222222222200a101e101f1326353357389201115574786f206e6f7420636f6e73756d65640001b0191533553355335323301d50220013550012222222222007101e22135002222533500415335333573466e3c00cd401c88cccd40048c98d4cd5ce2481024c680002302120012326353357389201024c68000230212326353357389201024c680002302102402315335333573466e3c00802409008c4ccd5cd19b870014800809008c408c408c8840944078407c4c98d4cd5ce24811357726f6e6720616d6f756e74206d696e7465640001b019101b135001220023333573466e1cd55cea8022400046644246600200600464646464646464646464646666ae68cdc39aab9d500a480008cccccccccc888888888848cccccccccc00402c02802402001c01801401000c008cd40648c8c8cccd5cd19b8735573aa0049000119910919800801801180d9aba15002301e357426ae8940088c98d4cd5ce01481501401389aab9e5001137540026ae854028cd4064068d5d0a804999aa80e3ae501b35742a010666aa038eb9406cd5d0a80399a80c8101aba15006335019335502302175a6ae854014c8c8c8cccd5cd19b8735573aa00490001199109198008018011919191999ab9a3370e6aae754009200023322123300100300233502675a6ae854008c09cd5d09aba2500223263533573805a05c05805626aae7940044dd50009aba150023232323333573466e1cd55cea8012400046644246600200600466a04ceb4d5d0a80118139aba135744a004464c6a66ae700b40b80b00ac4d55cf280089baa001357426ae8940088c98d4cd5ce01481501401389aab9e5001137540026ae854010cd4065d71aba15003335019335502375c40026ae854008c060d5d09aba2500223263533573804a04c04804626ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135744a00226aae7940044dd50009aba150043232323333573466e1d400520062321222230040053018357426aae79400c8cccd5cd19b875002480108c848888c008014c068d5d09aab9e500423333573466e1d400d20022321222230010053011357426aae7940148cccd5cd19b875004480008c848888c00c014dd71aba135573ca00c464c6a66ae7008008407c07807407006c4d55cea80089baa001357426ae8940108c98d4cd5ce00c80d00c00b98048031bae006135573ca00226ea8004c8004d5406088448894cd40044d400c88004884ccd401488008c010008ccd54c01c480040140100048c8c8cccd5cd19b8735573aa004900011991091980080180118029aba15002375a6ae84d5d1280111931a99ab9c012013011010135573ca00226ea80048c8cccd5cd19b8735573aa002900011bae357426aae7940088c98d4cd5ce00800880780709baa0011232230023758002640026aa02c446666aae7c0049405c8cd4058c010d5d080118019aba200201023232323333573466e1cd55cea801a40004666444246660020080060046464646666ae68cdc39aab9d5002480008cc8848cc00400c008c044d5d0a80119a8060081aba135744a004464c6a66ae7005005404c0484d55cf280089baa00135742a006666aa00eeb94018d5d0a80119a8043ae357426ae8940088c98d4cd5ce00800880780709aba25001135573ca00226ea80044cd54005d73ad112232230023756002640026aa02844646666aae7c008940588cd4054cd5405cc018d55cea80118029aab9e500230043574400601e26ae84004488c8c8cccd5cd19b875001480008c8488c00800cc014d5d09aab9e500323333573466e1d40092002212200123263533573801c01e01a01801626aae7540044dd500089119191999ab9a3370ea00290021091100091999ab9a3370ea00490011190911180180218031aba135573ca00846666ae68cdc3a801a400042444004464c6a66ae7003803c03403002c0284d55cea80089baa0012323333573466e1d40052002200e23333573466e1d40092000200e23263533573801401601201000e26aae74dd5000919191919191999ab9a3370ea002900610911111100191999ab9a3370ea004900510911111100211999ab9a3370ea00690041199109111111198008048041bae35742a00a6eb4d5d09aba2500523333573466e1d40112006233221222222233002009008375c6ae85401cdd71aba135744a00e46666ae68cdc3a802a400846644244444446600c01201060186ae854024dd71aba135744a01246666ae68cdc3a8032400446424444444600e010601a6ae84d55cf280591999ab9a3370ea00e900011909111111180280418071aba135573ca018464c6a66ae7004804c04404003c03803403002c0284d55cea80209aab9e5003135573ca00426aae7940044dd50009191919191999ab9a3370ea002900111999110911998008028020019bad35742a0086eb4d5d0a8019bad357426ae89400c8cccd5cd19b875002480008c8488c00800cc020d5d09aab9e500623263533573801601801401201026aae75400c4d5d1280089aab9e500113754002464646666ae68cdc3a800a400446424460020066eb8d5d09aab9e500323333573466e1d400920002321223002003375c6ae84d55cf280211931a99ab9c008009007006005135573aa00226ea800444888c8c8cccd5cd19b8735573aa0049000119aa80818031aba150023005357426ae8940088c98d4cd5ce00400480380309aab9e5001137540029324903505431001200132001355007222533500110022213500222330073330080020060010033200135500622225335001100222135002225335333573466e1c005200000a0091333008007006003133300800733500b1233300100800300200600312200212200111220021221223300100400311221233001003002112323001001223300330020020014c1074643544c4e46540001" +} +""" + , "one-shot-minting-big-arg" /\ + """ +{ + "type": "PlutusScriptV1", + "description": "", + "cborHex": "5909b75909b4010000333333333232332233223232323232323232323232323232323232323222223232323232325335533533355300b120013232123300122333500522002002001002350012200112330012253350021022100101f2325335333573466e3cd400488008d4014880080840804ccd5cd19b873500122001350052200102102010203500122002355001222222222200a101e101f132635335738921115574786f206e6f7420636f6e73756d65640001b0191533553355335323301d50220013550012222222222007101e22135002222533500415335333573466e3c00cd401c88cccd40048c98d4cd5ce2481024c680002302120012326353357389201024c68000230212326353357389201024c680002302102402315335333573466e3c00802409008c4ccd5cd19b870014800809008c408c408c8840944078407c4c98d4cd5ce24811357726f6e6720616d6f756e74206d696e7465640001b019101b135001220023333573466e1cd55cea8022400046644246600200600464646464646464646464646666ae68cdc39aab9d500a480008cccccccccc888888888848cccccccccc00402c02802402001c01801401000c008cd40648c8c8cccd5cd19b8735573aa0049000119910919800801801180d9aba15002301e357426ae8940088c98d4cd5ce01481501401389aab9e5001137540026ae854028cd4064068d5d0a804999aa80e3ae501b35742a010666aa038eb9406cd5d0a80399a80c8101aba15006335019335502302175a6ae854014c8c8c8cccd5cd19b8735573aa00490001199109198008018011919191999ab9a3370e6aae754009200023322123300100300233502675a6ae854008c09cd5d09aba2500223263533573805a05c05805626aae7940044dd50009aba150023232323333573466e1cd55cea8012400046644246600200600466a04ceb4d5d0a80118139aba135744a004464c6a66ae700b40b80b00ac4d55cf280089baa001357426ae8940088c98d4cd5ce01481501401389aab9e5001137540026ae854010cd4065d71aba15003335019335502375c40026ae854008c060d5d09aba2500223263533573804a04c04804626ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135744a00226aae7940044dd50009aba150043232323333573466e1d400520062321222230040053018357426aae79400c8cccd5cd19b875002480108c848888c008014c068d5d09aab9e500423333573466e1d400d20022321222230010053011357426aae7940148cccd5cd19b875004480008c848888c00c014dd71aba135573ca00c464c6a66ae7008008407c07807407006c4d55cea80089baa001357426ae8940108c98d4cd5ce00c80d00c00b98048031bae006135573ca00226ea8004c8004d5406088448894cd40044d400c88004884ccd401488008c010008ccd54c01c480040140100048c8c8cccd5cd19b8735573aa004900011991091980080180118029aba15002375a6ae84d5d1280111931a99ab9c012013011010135573ca00226ea80048c8cccd5cd19b8735573aa002900011bae357426aae7940088c98d4cd5ce00800880780709baa0011232230023758002640026aa02c446666aae7c0049405c8cd4058c010d5d080118019aba200201023232323333573466e1cd55cea801a40004666444246660020080060046464646666ae68cdc39aab9d5002480008cc8848cc00400c008c044d5d0a80119a8060081aba135744a004464c6a66ae7005005404c0484d55cf280089baa00135742a006666aa00eeb94018d5d0a80119a8043ae357426ae8940088c98d4cd5ce00800880780709aba25001135573ca00226ea80044cd54005d73ad112232230023756002640026aa02844646666aae7c008940588cd4054cd5405cc018d55cea80118029aab9e500230043574400601e26ae84004488c8c8cccd5cd19b875001480008c8488c00800cc014d5d09aab9e500323333573466e1d40092002212200123263533573801c01e01a01801626aae7540044dd500089119191999ab9a3370ea00290021091100091999ab9a3370ea00490011190911180180218031aba135573ca00846666ae68cdc3a801a400042444004464c6a66ae7003803c03403002c0284d55cea80089baa0012323333573466e1d40052002200e23333573466e1d40092000200e23263533573801401601201000e26aae74dd5000919191919191999ab9a3370ea002900610911111100191999ab9a3370ea004900510911111100211999ab9a3370ea00690041199109111111198008048041bae35742a00a6eb4d5d09aba2500523333573466e1d40112006233221222222233002009008375c6ae85401cdd71aba135744a00e46666ae68cdc3a802a400846644244444446600c01201060186ae854024dd71aba135744a01246666ae68cdc3a8032400446424444444600e010601a6ae84d55cf280591999ab9a3370ea00e900011909111111180280418071aba135573ca018464c6a66ae7004804c04404003c03803403002c0284d55cea80209aab9e5003135573ca00426aae7940044dd50009191919191999ab9a3370ea002900111999110911998008028020019bad35742a0086eb4d5d0a8019bad357426ae89400c8cccd5cd19b875002480008c8488c00800cc020d5d09aab9e500623263533573801601801401201026aae75400c4d5d1280089aab9e500113754002464646666ae68cdc3a800a400446424460020066eb8d5d09aab9e500323333573466e1d400920002321223002003375c6ae84d55cf280211931a99ab9c008009007006005135573aa00226ea800444888c8c8cccd5cd19b8735573aa0049000119aa80818031aba150023005357426ae8940088c98d4cd5ce00400480380309aab9e5001137540029324903505431001200132001355007222533500110022213500222330073330080020060010033200135500622225335001100222135002225335333573466e1c005200000a0091333008007006003133300800733500b1233300100800300200600312200212200111220021221223300100400311221233001003002112323001001223300330020020014c1074643544c4e4654004c010107004c0103d87980004c01089fd87980424d5fff004c01465f58404d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d414dff004c0107a20507424d5f08004c0154d9055f9f079fd87980424d5f5f58404d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d414dffffff004c0114d87e9f809f01ffa0a201d8798002d87b9f02ffff0001" +} +""" + , "one-shot-minting-no-args" /\ + """ +{ + "type": "PlutusScriptV1", + "description": "", + "cborHex": "5908d75908d401000033232332233223232323232323232323232323232323232323222223232323232325335533533355300b120013232123300122333500522002002001002350012200112330012253350021022100101f2325335333573466e3cd400488008d4014880080840804ccd5cd19b873500122001350052200102102010203500122002355001222222222200a101e101f1326353357389201115574786f206e6f7420636f6e73756d65640001b0191533553355335323301d50220013550012222222222007101e22135002222533500415335333573466e3c00cd401c88cccd40048c98d4cd5ce2481024c680002302120012326353357389201024c68000230212326353357389201024c680002302102402315335333573466e3c00802409008c4ccd5cd19b870014800809008c408c408c8840944078407c4c98d4cd5ce24811357726f6e6720616d6f756e74206d696e7465640001b019101b135001220023333573466e1cd55cea8022400046644246600200600464646464646464646464646666ae68cdc39aab9d500a480008cccccccccc888888888848cccccccccc00402c02802402001c01801401000c008cd40648c8c8cccd5cd19b8735573aa0049000119910919800801801180d9aba15002301e357426ae8940088c98d4cd5ce01481501401389aab9e5001137540026ae854028cd4064068d5d0a804999aa80e3ae501b35742a010666aa038eb9406cd5d0a80399a80c8101aba15006335019335502302175a6ae854014c8c8c8cccd5cd19b8735573aa00490001199109198008018011919191999ab9a3370e6aae754009200023322123300100300233502675a6ae854008c09cd5d09aba2500223263533573805a05c05805626aae7940044dd50009aba150023232323333573466e1cd55cea8012400046644246600200600466a04ceb4d5d0a80118139aba135744a004464c6a66ae700b40b80b00ac4d55cf280089baa001357426ae8940088c98d4cd5ce01481501401389aab9e5001137540026ae854010cd4065d71aba15003335019335502375c40026ae854008c060d5d09aba2500223263533573804a04c04804626ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135744a00226aae7940044dd50009aba150043232323333573466e1d400520062321222230040053018357426aae79400c8cccd5cd19b875002480108c848888c008014c068d5d09aab9e500423333573466e1d400d20022321222230010053011357426aae7940148cccd5cd19b875004480008c848888c00c014dd71aba135573ca00c464c6a66ae7008008407c07807407006c4d55cea80089baa001357426ae8940108c98d4cd5ce00c80d00c00b98048031bae006135573ca00226ea8004c8004d5406088448894cd40044d400c88004884ccd401488008c010008ccd54c01c480040140100048c8c8cccd5cd19b8735573aa004900011991091980080180118029aba15002375a6ae84d5d1280111931a99ab9c012013011010135573ca00226ea80048c8cccd5cd19b8735573aa002900011bae357426aae7940088c98d4cd5ce00800880780709baa0011232230023758002640026aa02c446666aae7c0049405c8cd4058c010d5d080118019aba200201023232323333573466e1cd55cea801a40004666444246660020080060046464646666ae68cdc39aab9d5002480008cc8848cc00400c008c044d5d0a80119a8060081aba135744a004464c6a66ae7005005404c0484d55cf280089baa00135742a006666aa00eeb94018d5d0a80119a8043ae357426ae8940088c98d4cd5ce00800880780709aba25001135573ca00226ea80044cd54005d73ad112232230023756002640026aa02844646666aae7c008940588cd4054cd5405cc018d55cea80118029aab9e500230043574400601e26ae84004488c8c8cccd5cd19b875001480008c8488c00800cc014d5d09aab9e500323333573466e1d40092002212200123263533573801c01e01a01801626aae7540044dd500089119191999ab9a3370ea00290021091100091999ab9a3370ea00490011190911180180218031aba135573ca00846666ae68cdc3a801a400042444004464c6a66ae7003803c03403002c0284d55cea80089baa0012323333573466e1d40052002200e23333573466e1d40092000200e23263533573801401601201000e26aae74dd5000919191919191999ab9a3370ea002900610911111100191999ab9a3370ea004900510911111100211999ab9a3370ea00690041199109111111198008048041bae35742a00a6eb4d5d09aba2500523333573466e1d40112006233221222222233002009008375c6ae85401cdd71aba135744a00e46666ae68cdc3a802a400846644244444446600c01201060186ae854024dd71aba135744a01246666ae68cdc3a8032400446424444444600e010601a6ae84d55cf280591999ab9a3370ea00e900011909111111180280418071aba135573ca018464c6a66ae7004804c04404003c03803403002c0284d55cea80209aab9e5003135573ca00426aae7940044dd50009191919191999ab9a3370ea002900111999110911998008028020019bad35742a0086eb4d5d0a8019bad357426ae89400c8cccd5cd19b875002480008c8488c00800cc020d5d09aab9e500623263533573801601801401201026aae75400c4d5d1280089aab9e500113754002464646666ae68cdc3a800a400446424460020066eb8d5d09aab9e500323333573466e1d400920002321223002003375c6ae84d55cf280211931a99ab9c008009007006005135573aa00226ea800444888c8c8cccd5cd19b8735573aa0049000119aa80818031aba150023005357426ae8940088c98d4cd5ce00400480380309aab9e5001137540029324903505431001200132001355007222533500110022213500222330073330080020060010033200135500622225335001100222135002225335333573466e1c005200000a0091333008007006003133300800733500b1233300100800300200600312200212200111220021221223300100400311221233001003002112323001001223300330020020014c1074643544c4e46540001" +} +""" + , "one-shot-minting-unit" /\ + """ +{ + "type": "PlutusScriptV1", + "description": "", + "cborHex": "5908de5908db010000333232332233223232323232323232323232323232323232323222223232323232325335533533355300b120013232123300122333500522002002001002350012200112330012253350021022100101f2325335333573466e3cd400488008d4014880080840804ccd5cd19b873500122001350052200102102010203500122002355001222222222200a101e101f132635335738921115574786f206e6f7420636f6e73756d65640001b0191533553355335323301d50220013550012222222222007101e22135002222533500415335333573466e3c00cd401c88cccd40048c98d4cd5ce2481024c680002302120012326353357389201024c68000230212326353357389201024c680002302102402315335333573466e3c00802409008c4ccd5cd19b870014800809008c408c408c8840944078407c4c98d4cd5ce24811357726f6e6720616d6f756e74206d696e7465640001b019101b135001220023333573466e1cd55cea8022400046644246600200600464646464646464646464646666ae68cdc39aab9d500a480008cccccccccc888888888848cccccccccc00402c02802402001c01801401000c008cd40648c8c8cccd5cd19b8735573aa0049000119910919800801801180d9aba15002301e357426ae8940088c98d4cd5ce01481501401389aab9e5001137540026ae854028cd4064068d5d0a804999aa80e3ae501b35742a010666aa038eb9406cd5d0a80399a80c8101aba15006335019335502302175a6ae854014c8c8c8cccd5cd19b8735573aa00490001199109198008018011919191999ab9a3370e6aae754009200023322123300100300233502675a6ae854008c09cd5d09aba2500223263533573805a05c05805626aae7940044dd50009aba150023232323333573466e1cd55cea8012400046644246600200600466a04ceb4d5d0a80118139aba135744a004464c6a66ae700b40b80b00ac4d55cf280089baa001357426ae8940088c98d4cd5ce01481501401389aab9e5001137540026ae854010cd4065d71aba15003335019335502375c40026ae854008c060d5d09aba2500223263533573804a04c04804626ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135744a00226aae7940044dd50009aba150043232323333573466e1d400520062321222230040053018357426aae79400c8cccd5cd19b875002480108c848888c008014c068d5d09aab9e500423333573466e1d400d20022321222230010053011357426aae7940148cccd5cd19b875004480008c848888c00c014dd71aba135573ca00c464c6a66ae7008008407c07807407006c4d55cea80089baa001357426ae8940108c98d4cd5ce00c80d00c00b98048031bae006135573ca00226ea8004c8004d5406088448894cd40044d400c88004884ccd401488008c010008ccd54c01c480040140100048c8c8cccd5cd19b8735573aa004900011991091980080180118029aba15002375a6ae84d5d1280111931a99ab9c012013011010135573ca00226ea80048c8cccd5cd19b8735573aa002900011bae357426aae7940088c98d4cd5ce00800880780709baa0011232230023758002640026aa02c446666aae7c0049405c8cd4058c010d5d080118019aba200201023232323333573466e1cd55cea801a40004666444246660020080060046464646666ae68cdc39aab9d5002480008cc8848cc00400c008c044d5d0a80119a8060081aba135744a004464c6a66ae7005005404c0484d55cf280089baa00135742a006666aa00eeb94018d5d0a80119a8043ae357426ae8940088c98d4cd5ce00800880780709aba25001135573ca00226ea80044cd54005d73ad112232230023756002640026aa02844646666aae7c008940588cd4054cd5405cc018d55cea80118029aab9e500230043574400601e26ae84004488c8c8cccd5cd19b875001480008c8488c00800cc014d5d09aab9e500323333573466e1d40092002212200123263533573801c01e01a01801626aae7540044dd500089119191999ab9a3370ea00290021091100091999ab9a3370ea00490011190911180180218031aba135573ca00846666ae68cdc3a801a400042444004464c6a66ae7003803c03403002c0284d55cea80089baa0012323333573466e1d40052002200e23333573466e1d40092000200e23263533573801401601201000e26aae74dd5000919191919191999ab9a3370ea002900610911111100191999ab9a3370ea004900510911111100211999ab9a3370ea00690041199109111111198008048041bae35742a00a6eb4d5d09aba2500523333573466e1d40112006233221222222233002009008375c6ae85401cdd71aba135744a00e46666ae68cdc3a802a400846644244444446600c01201060186ae854024dd71aba135744a01246666ae68cdc3a8032400446424444444600e010601a6ae84d55cf280591999ab9a3370ea00e900011909111111180280418071aba135573ca018464c6a66ae7004804c04404003c03803403002c0284d55cea80209aab9e5003135573ca00426aae7940044dd50009191919191999ab9a3370ea002900111999110911998008028020019bad35742a0086eb4d5d0a8019bad357426ae89400c8cccd5cd19b875002480008c8488c00800cc020d5d09aab9e500623263533573801601801401201026aae75400c4d5d1280089aab9e500113754002464646666ae68cdc3a800a400446424460020066eb8d5d09aab9e500323333573466e1d400920002321223002003375c6ae84d55cf280211931a99ab9c008009007006005135573aa00226ea800444888c8c8cccd5cd19b8735573aa0049000119aa80818031aba150023005357426ae8940088c98d4cd5ce00400480380309aab9e5001137540029324903505431001200132001355007222533500110022213500222330073330080020060010033200135500622225335001100222135002225335333573466e1c005200000a0091333008007006003133300800733500b1233300100800300200600312200212200111220021221223300100400311221233001003002112323001001223300330020020014c1074643544c4e4654004c0103d879800001" +} +""" + + , "always-succeeds-v2" /\ + """ +{ + "cborHex": "4e4d01000033222220051200120011", + "description": "always-succeeds", + "type": "PlutusScriptV2" +} +""" , "always-succeeds-v2-big-arg" /\ - "applied/always-succeeds-v2-big-arg.plutus" + """ +{ + "type": "PlutusScriptV2", + "description": "", + "cborHex": "58f058ee010000333333333222220051200120014c010107004c0103d87980004c01089fd87980424d5fff004c01465f58404d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d414dff004c0107a20507424d5f08004c0154d9055f9f079fd87980424d5f5f58404d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d414dffffff004c0114d87e9f809f01ffa0a201d8798002d87b9f02ffff0001" +} +""" , "always-succeeds-v2-no-args" /\ - "applied/always-succeeds-v2-no-args.plutus" - , "always-succeeds-v2-unit" /\ "applied/always-succeeds-v2-unit.plutus" + """ +{ + "type": "PlutusScriptV2", + "description": "", + "cborHex": "4e4d01000033222220051200120011" +} +""" + , "always-succeeds-v2-unit" /\ + """ +{ + "type": "PlutusScriptV2", + "description": "", + "cborHex": "5655010000333222220051200120014c0103d879800001" +} +""" + + , "check-datum-is-inline" /\ + """ +{ + "type": "PlutusScriptV2", + "description": "", + "cborHex": "59088859088501000032332232323233223232323232323232323322323232323232322223232533532325335001101b13357389211d556e657870656374656420646174756d206174206f776e20696e7075740001a323253335002153335001101c2101c2101c2153335002101c21333573466ebc00800407807484074854ccd400840708407484ccd5cd19b8f00200101e01d323500122220023235001220013553353500222350022222222222223333500d2501e2501e2501e233355302d12001321233001225335002210031001002501e2350012253355335333573466e3cd400888008d4010880080b40b04ccd5cd19b873500222001350042200102d02c102c1350220031502100d21123001002162001300a0053333573466e1cd55cea80124000466442466002006004646464646464646464646464646666ae68cdc39aab9d500c480008cccccccccccc88888888888848cccccccccccc00403403002c02802402001c01801401000c008cd4054058d5d0a80619a80a80b1aba1500b33501501735742a014666aa034eb94064d5d0a804999aa80d3ae501935742a01066a02a0426ae85401cccd54068089d69aba150063232323333573466e1cd55cea801240004664424660020060046464646666ae68cdc39aab9d5002480008cc8848cc00400c008cd40b1d69aba15002302d357426ae8940088c98c80bccd5ce01901881689aab9e5001137540026ae854008c8c8c8cccd5cd19b8735573aa004900011991091980080180119a8163ad35742a004605a6ae84d5d1280111931901799ab9c03203102d135573ca00226ea8004d5d09aba2500223263202b33573805c05a05226aae7940044dd50009aba1500533501575c6ae854010ccd540680788004d5d0a801999aa80d3ae200135742a00460406ae84d5d1280111931901399ab9c02a029025135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d55cf280089baa00135742a00460206ae84d5d1280111931900c99ab9c01c01b017101a132632018335738921035054350001a135573ca00226ea800448c88c008dd6000990009aa80d111999aab9f0012501c233501b30043574200460066ae8800805c8c8c8cccd5cd19b8735573aa004900011991091980080180118069aba150023005357426ae8940088c98c8054cd5ce00c00b80989aab9e5001137540024646464646666ae68cdc39aab9d5004480008cccc888848cccc00401401000c008c8c8c8cccd5cd19b8735573aa0049000119910919800801801180b1aba1500233500e015357426ae8940088c98c8068cd5ce00e80e00c09aab9e5001137540026ae854010ccd54025d728041aba150033232323333573466e1d400520042300b357426aae79400c8cccd5cd19b875002480088c84888c004010dd71aba135573ca00846666ae68cdc3a801a400042444006464c6403866ae7007c0780680640604d55cea80089baa00135742a00466a014eb8d5d09aba2500223263201633573803203002826ae8940044d5d1280089aab9e500113754002424446004008266aa002eb9d6889119118011bab00132001355016223233335573e0044a032466a03066442466002006004600c6aae754008c014d55cf280118021aba200301413574200224464646666ae68cdc3a800a400046a00e600a6ae84d55cf280191999ab9a3370ea00490011280391931900919ab9c01501401000f135573aa00226ea800448488c00800c44880048c8c8cccd5cd19b875001480188c848888c010014c01cd5d09aab9e500323333573466e1d400920042321222230020053009357426aae7940108cccd5cd19b875003480088c848888c004014c01cd5d09aab9e500523333573466e1d40112000232122223003005375c6ae84d55cf280311931900819ab9c01301200e00d00c00b135573aa00226ea80048c8c8cccd5cd19b8735573aa004900011991091980080180118029aba15002375a6ae84d5d1280111931900619ab9c00f00e00a135573ca00226ea80048c8cccd5cd19b8735573aa002900011bae357426aae7940088c98c8028cd5ce00680600409baa001232323232323333573466e1d4005200c21222222200323333573466e1d4009200a21222222200423333573466e1d400d2008233221222222233001009008375c6ae854014dd69aba135744a00a46666ae68cdc3a8022400c4664424444444660040120106eb8d5d0a8039bae357426ae89401c8cccd5cd19b875005480108cc8848888888cc018024020c030d5d0a8049bae357426ae8940248cccd5cd19b875006480088c848888888c01c020c034d5d09aab9e500b23333573466e1d401d2000232122222223005008300e357426aae7940308c98c804ccd5ce00b00a80880800780700680600589aab9d5004135573ca00626aae7940084d55cf280089baa0012323232323333573466e1d400520022333222122333001005004003375a6ae854010dd69aba15003375a6ae84d5d1280191999ab9a3370ea0049000119091180100198041aba135573ca00c464c6401866ae7003c0380280244d55cea80189aba25001135573ca00226ea80048c8c8cccd5cd19b875001480088c8488c00400cdd71aba135573ca00646666ae68cdc3a8012400046424460040066eb8d5d09aab9e500423263200933573801801600e00c26aae7540044dd500089119191999ab9a3370ea00290021091100091999ab9a3370ea00490011190911180180218031aba135573ca00846666ae68cdc3a801a400042444004464c6401466ae7003403002001c0184d55cea80089baa0012323333573466e1d40052002200623333573466e1d40092000200623263200633573801201000800626aae74dd5000a4c24400424400224002920103505431003200135500322112225335001135003220012213335005220023004002333553007120010050040011122002122122330010040031123230010012233003300200200101" +} +""" , "check-datum-is-inline-big-arg" /\ - "applied/check-datum-is-inline-big-arg.plutus" + """ +{ + "type": "PlutusScriptV2", + "description": "", + "cborHex": "590969590966010000333333332332232323233223232323232323232323322323232323232322223232533532325335001101b133573892011d556e657870656374656420646174756d206174206f776e20696e7075740001a323253335002153335001101c2101c2101c2153335002101c21333573466ebc00800407807484074854ccd400840708407484ccd5cd19b8f00200101e01d323500122220023235001220013553353500222350022222222222223333500d2501e2501e2501e233355302d12001321233001225335002210031001002501e2350012253355335333573466e3cd400888008d4010880080b40b04ccd5cd19b873500222001350042200102d02c102c1350220031502100d21123001002162001300a0053333573466e1cd55cea80124000466442466002006004646464646464646464646464646666ae68cdc39aab9d500c480008cccccccccccc88888888888848cccccccccccc00403403002c02802402001c01801401000c008cd4054058d5d0a80619a80a80b1aba1500b33501501735742a014666aa034eb94064d5d0a804999aa80d3ae501935742a01066a02a0426ae85401cccd54068089d69aba150063232323333573466e1cd55cea801240004664424660020060046464646666ae68cdc39aab9d5002480008cc8848cc00400c008cd40b1d69aba15002302d357426ae8940088c98c80bccd5ce01901881689aab9e5001137540026ae854008c8c8c8cccd5cd19b8735573aa004900011991091980080180119a8163ad35742a004605a6ae84d5d1280111931901799ab9c03203102d135573ca00226ea8004d5d09aba2500223263202b33573805c05a05226aae7940044dd50009aba1500533501575c6ae854010ccd540680788004d5d0a801999aa80d3ae200135742a00460406ae84d5d1280111931901399ab9c02a029025135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d55cf280089baa00135742a00460206ae84d5d1280111931900c99ab9c01c01b017101a132632018335738921035054350001a135573ca00226ea800448c88c008dd6000990009aa80d111999aab9f0012501c233501b30043574200460066ae8800805c8c8c8cccd5cd19b8735573aa004900011991091980080180118069aba150023005357426ae8940088c98c8054cd5ce00c00b80989aab9e5001137540024646464646666ae68cdc39aab9d5004480008cccc888848cccc00401401000c008c8c8c8cccd5cd19b8735573aa0049000119910919800801801180b1aba1500233500e015357426ae8940088c98c8068cd5ce00e80e00c09aab9e5001137540026ae854010ccd54025d728041aba150033232323333573466e1d400520042300b357426aae79400c8cccd5cd19b875002480088c84888c004010dd71aba135573ca00846666ae68cdc3a801a400042444006464c6403866ae7007c0780680640604d55cea80089baa00135742a00466a014eb8d5d09aba2500223263201633573803203002826ae8940044d5d1280089aab9e500113754002424446004008266aa002eb9d6889119118011bab00132001355016223233335573e0044a032466a03066442466002006004600c6aae754008c014d55cf280118021aba200301413574200224464646666ae68cdc3a800a400046a00e600a6ae84d55cf280191999ab9a3370ea00490011280391931900919ab9c01501401000f135573aa00226ea800448488c00800c44880048c8c8cccd5cd19b875001480188c848888c010014c01cd5d09aab9e500323333573466e1d400920042321222230020053009357426aae7940108cccd5cd19b875003480088c848888c004014c01cd5d09aab9e500523333573466e1d40112000232122223003005375c6ae84d55cf280311931900819ab9c01301200e00d00c00b135573aa00226ea80048c8c8cccd5cd19b8735573aa004900011991091980080180118029aba15002375a6ae84d5d1280111931900619ab9c00f00e00a135573ca00226ea80048c8cccd5cd19b8735573aa002900011bae357426aae7940088c98c8028cd5ce00680600409baa001232323232323333573466e1d4005200c21222222200323333573466e1d4009200a21222222200423333573466e1d400d2008233221222222233001009008375c6ae854014dd69aba135744a00a46666ae68cdc3a8022400c4664424444444660040120106eb8d5d0a8039bae357426ae89401c8cccd5cd19b875005480108cc8848888888cc018024020c030d5d0a8049bae357426ae8940248cccd5cd19b875006480088c848888888c01c020c034d5d09aab9e500b23333573466e1d401d2000232122222223005008300e357426aae7940308c98c804ccd5ce00b00a80880800780700680600589aab9d5004135573ca00626aae7940084d55cf280089baa0012323232323333573466e1d400520022333222122333001005004003375a6ae854010dd69aba15003375a6ae84d5d1280191999ab9a3370ea0049000119091180100198041aba135573ca00c464c6401866ae7003c0380280244d55cea80189aba25001135573ca00226ea80048c8c8cccd5cd19b875001480088c8488c00400cdd71aba135573ca00646666ae68cdc3a8012400046424460040066eb8d5d09aab9e500423263200933573801801600e00c26aae7540044dd500089119191999ab9a3370ea00290021091100091999ab9a3370ea00490011190911180180218031aba135573ca00846666ae68cdc3a801a400042444004464c6401466ae7003403002001c0184d55cea80089baa0012323333573466e1d40052002200623333573466e1d40092000200623263200633573801201000800626aae74dd5000a4c2440042440022400292010350543100320013550032211222533500113500322001221333500522002300400233355300712001005004001112200212212233001004003112323001001223300330020020014c010107004c0103d87980004c01089fd87980424d5fff004c01465f58404d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d414dff004c0107a20507424d5f08004c0154d9055f9f079fd87980424d5f5f58404d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d414dffffff004c0114d87e9f809f01ffa0a201d8798002d87b9f02ffff0001" +} +""" , "check-datum-is-inline-no-args" /\ - "applied/check-datum-is-inline-no-args.plutus" + """ +{ + "type": "PlutusScriptV2", + "description": "", + "cborHex": "59088859088501000032332232323233223232323232323232323322323232323232322223232533532325335001101b13357389211d556e657870656374656420646174756d206174206f776e20696e7075740001a323253335002153335001101c2101c2101c2153335002101c21333573466ebc00800407807484074854ccd400840708407484ccd5cd19b8f00200101e01d323500122220023235001220013553353500222350022222222222223333500d2501e2501e2501e233355302d12001321233001225335002210031001002501e2350012253355335333573466e3cd400888008d4010880080b40b04ccd5cd19b873500222001350042200102d02c102c1350220031502100d21123001002162001300a0053333573466e1cd55cea80124000466442466002006004646464646464646464646464646666ae68cdc39aab9d500c480008cccccccccccc88888888888848cccccccccccc00403403002c02802402001c01801401000c008cd4054058d5d0a80619a80a80b1aba1500b33501501735742a014666aa034eb94064d5d0a804999aa80d3ae501935742a01066a02a0426ae85401cccd54068089d69aba150063232323333573466e1cd55cea801240004664424660020060046464646666ae68cdc39aab9d5002480008cc8848cc00400c008cd40b1d69aba15002302d357426ae8940088c98c80bccd5ce01901881689aab9e5001137540026ae854008c8c8c8cccd5cd19b8735573aa004900011991091980080180119a8163ad35742a004605a6ae84d5d1280111931901799ab9c03203102d135573ca00226ea8004d5d09aba2500223263202b33573805c05a05226aae7940044dd50009aba1500533501575c6ae854010ccd540680788004d5d0a801999aa80d3ae200135742a00460406ae84d5d1280111931901399ab9c02a029025135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d55cf280089baa00135742a00460206ae84d5d1280111931900c99ab9c01c01b017101a132632018335738921035054350001a135573ca00226ea800448c88c008dd6000990009aa80d111999aab9f0012501c233501b30043574200460066ae8800805c8c8c8cccd5cd19b8735573aa004900011991091980080180118069aba150023005357426ae8940088c98c8054cd5ce00c00b80989aab9e5001137540024646464646666ae68cdc39aab9d5004480008cccc888848cccc00401401000c008c8c8c8cccd5cd19b8735573aa0049000119910919800801801180b1aba1500233500e015357426ae8940088c98c8068cd5ce00e80e00c09aab9e5001137540026ae854010ccd54025d728041aba150033232323333573466e1d400520042300b357426aae79400c8cccd5cd19b875002480088c84888c004010dd71aba135573ca00846666ae68cdc3a801a400042444006464c6403866ae7007c0780680640604d55cea80089baa00135742a00466a014eb8d5d09aba2500223263201633573803203002826ae8940044d5d1280089aab9e500113754002424446004008266aa002eb9d6889119118011bab00132001355016223233335573e0044a032466a03066442466002006004600c6aae754008c014d55cf280118021aba200301413574200224464646666ae68cdc3a800a400046a00e600a6ae84d55cf280191999ab9a3370ea00490011280391931900919ab9c01501401000f135573aa00226ea800448488c00800c44880048c8c8cccd5cd19b875001480188c848888c010014c01cd5d09aab9e500323333573466e1d400920042321222230020053009357426aae7940108cccd5cd19b875003480088c848888c004014c01cd5d09aab9e500523333573466e1d40112000232122223003005375c6ae84d55cf280311931900819ab9c01301200e00d00c00b135573aa00226ea80048c8c8cccd5cd19b8735573aa004900011991091980080180118029aba15002375a6ae84d5d1280111931900619ab9c00f00e00a135573ca00226ea80048c8cccd5cd19b8735573aa002900011bae357426aae7940088c98c8028cd5ce00680600409baa001232323232323333573466e1d4005200c21222222200323333573466e1d4009200a21222222200423333573466e1d400d2008233221222222233001009008375c6ae854014dd69aba135744a00a46666ae68cdc3a8022400c4664424444444660040120106eb8d5d0a8039bae357426ae89401c8cccd5cd19b875005480108cc8848888888cc018024020c030d5d0a8049bae357426ae8940248cccd5cd19b875006480088c848888888c01c020c034d5d09aab9e500b23333573466e1d401d2000232122222223005008300e357426aae7940308c98c804ccd5ce00b00a80880800780700680600589aab9d5004135573ca00626aae7940084d55cf280089baa0012323232323333573466e1d400520022333222122333001005004003375a6ae854010dd69aba15003375a6ae84d5d1280191999ab9a3370ea0049000119091180100198041aba135573ca00c464c6401866ae7003c0380280244d55cea80189aba25001135573ca00226ea80048c8c8cccd5cd19b875001480088c8488c00400cdd71aba135573ca00646666ae68cdc3a8012400046424460040066eb8d5d09aab9e500423263200933573801801600e00c26aae7540044dd500089119191999ab9a3370ea00290021091100091999ab9a3370ea00490011190911180180218031aba135573ca00846666ae68cdc3a801a400042444004464c6401466ae7003403002001c0184d55cea80089baa0012323333573466e1d40052002200623333573466e1d40092000200623263200633573801201000800626aae74dd5000a4c24400424400224002920103505431003200135500322112225335001135003220012213335005220023004002333553007120010050040011122002122122330010040031123230010012233003300200200101" +} +""" , "check-datum-is-inline-unit" /\ - "applied/check-datum-is-inline-unit.plutus" - , "include-datum-big-arg" /\ "applied/include-datum-big-arg.plutus" - , "include-datum-no-args" /\ "applied/include-datum-no-args.plutus" - , "include-datum-unit" /\ "applied/include-datum-unit.plutus" - , "one-shot-minting-big-arg" /\ "applied/one-shot-minting-big-arg.plutus" - , "one-shot-minting-no-args" /\ "applied/one-shot-minting-no-args.plutus" - , "one-shot-minting-unit" /\ "applied/one-shot-minting-unit.plutus" + """ +{ + "type": "PlutusScriptV2", + "description": "", + "cborHex": "59089059088d010000332332232323233223232323232323232323322323232323232322223232533532325335001101b133573892011d556e657870656374656420646174756d206174206f776e20696e7075740001a323253335002153335001101c2101c2101c2153335002101c21333573466ebc00800407807484074854ccd400840708407484ccd5cd19b8f00200101e01d323500122220023235001220013553353500222350022222222222223333500d2501e2501e2501e233355302d12001321233001225335002210031001002501e2350012253355335333573466e3cd400888008d4010880080b40b04ccd5cd19b873500222001350042200102d02c102c1350220031502100d21123001002162001300a0053333573466e1cd55cea80124000466442466002006004646464646464646464646464646666ae68cdc39aab9d500c480008cccccccccccc88888888888848cccccccccccc00403403002c02802402001c01801401000c008cd4054058d5d0a80619a80a80b1aba1500b33501501735742a014666aa034eb94064d5d0a804999aa80d3ae501935742a01066a02a0426ae85401cccd54068089d69aba150063232323333573466e1cd55cea801240004664424660020060046464646666ae68cdc39aab9d5002480008cc8848cc00400c008cd40b1d69aba15002302d357426ae8940088c98c80bccd5ce01901881689aab9e5001137540026ae854008c8c8c8cccd5cd19b8735573aa004900011991091980080180119a8163ad35742a004605a6ae84d5d1280111931901799ab9c03203102d135573ca00226ea8004d5d09aba2500223263202b33573805c05a05226aae7940044dd50009aba1500533501575c6ae854010ccd540680788004d5d0a801999aa80d3ae200135742a00460406ae84d5d1280111931901399ab9c02a029025135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d55cf280089baa00135742a00460206ae84d5d1280111931900c99ab9c01c01b017101a132632018335738921035054350001a135573ca00226ea800448c88c008dd6000990009aa80d111999aab9f0012501c233501b30043574200460066ae8800805c8c8c8cccd5cd19b8735573aa004900011991091980080180118069aba150023005357426ae8940088c98c8054cd5ce00c00b80989aab9e5001137540024646464646666ae68cdc39aab9d5004480008cccc888848cccc00401401000c008c8c8c8cccd5cd19b8735573aa0049000119910919800801801180b1aba1500233500e015357426ae8940088c98c8068cd5ce00e80e00c09aab9e5001137540026ae854010ccd54025d728041aba150033232323333573466e1d400520042300b357426aae79400c8cccd5cd19b875002480088c84888c004010dd71aba135573ca00846666ae68cdc3a801a400042444006464c6403866ae7007c0780680640604d55cea80089baa00135742a00466a014eb8d5d09aba2500223263201633573803203002826ae8940044d5d1280089aab9e500113754002424446004008266aa002eb9d6889119118011bab00132001355016223233335573e0044a032466a03066442466002006004600c6aae754008c014d55cf280118021aba200301413574200224464646666ae68cdc3a800a400046a00e600a6ae84d55cf280191999ab9a3370ea00490011280391931900919ab9c01501401000f135573aa00226ea800448488c00800c44880048c8c8cccd5cd19b875001480188c848888c010014c01cd5d09aab9e500323333573466e1d400920042321222230020053009357426aae7940108cccd5cd19b875003480088c848888c004014c01cd5d09aab9e500523333573466e1d40112000232122223003005375c6ae84d55cf280311931900819ab9c01301200e00d00c00b135573aa00226ea80048c8c8cccd5cd19b8735573aa004900011991091980080180118029aba15002375a6ae84d5d1280111931900619ab9c00f00e00a135573ca00226ea80048c8cccd5cd19b8735573aa002900011bae357426aae7940088c98c8028cd5ce00680600409baa001232323232323333573466e1d4005200c21222222200323333573466e1d4009200a21222222200423333573466e1d400d2008233221222222233001009008375c6ae854014dd69aba135744a00a46666ae68cdc3a8022400c4664424444444660040120106eb8d5d0a8039bae357426ae89401c8cccd5cd19b875005480108cc8848888888cc018024020c030d5d0a8049bae357426ae8940248cccd5cd19b875006480088c848888888c01c020c034d5d09aab9e500b23333573466e1d401d2000232122222223005008300e357426aae7940308c98c804ccd5ce00b00a80880800780700680600589aab9d5004135573ca00626aae7940084d55cf280089baa0012323232323333573466e1d400520022333222122333001005004003375a6ae854010dd69aba15003375a6ae84d5d1280191999ab9a3370ea0049000119091180100198041aba135573ca00c464c6401866ae7003c0380280244d55cea80189aba25001135573ca00226ea80048c8c8cccd5cd19b875001480088c8488c00400cdd71aba135573ca00646666ae68cdc3a8012400046424460040066eb8d5d09aab9e500423263200933573801801600e00c26aae7540044dd500089119191999ab9a3370ea00290021091100091999ab9a3370ea00490011190911180180218031aba135573ca00846666ae68cdc3a801a400042444004464c6401466ae7003403002001c0184d55cea80089baa0012323333573466e1d40052002200623333573466e1d40092000200623263200633573801201000800626aae74dd5000a4c2440042440022400292010350543100320013550032211222533500113500322001221333500522002300400233355300712001005004001112200212212233001004003112323001001223300330020020014c0103d879800001" +} +""" + + , "one-shot-minting-v2" /\ + """ +{ + "type": "PlutusScriptV2", + "description": "one-shot-minting", + "cborHex": "59092c59092901000033233223322323232323232323232323232323232323232323222223232323232325335533533355300b12001323212330012233350052200200200100235001220011233001225335002102310010202325335333573466e3cd400488008d4014880080880844ccd5cd19b87350012200135005220010220211021350012200235500122222222222200c101f102013263201b335738921115574786f206e6f7420636f6e73756d65640001c1533553355335323301e5023001355001222222222222008101f22135002222533500415335333573466e3c00cd401c88cccd40048c98c808ccd5ce2481024c680002420012326320233357389201024c68000242326320233357389201024c680002402502415335333573466e3c0080240940904ccd5cd19b870014800809409040904090884098407c40804c98c806ccd5ce24811357726f6e6720616d6f756e74206d696e7465640001c101c135001220023333573466e1cd55cea80224000466442466002006004646464646464646464646464646666ae68cdc39aab9d500c480008cccccccccccc88888888888848cccccccccccc00403403002c02802402001c01801401000c008cd4064068d5d0a80619a80c80d1aba1500b33501901b35742a014666aa03aeb94070d5d0a804999aa80ebae501c35742a01066a0320446ae85401cccd5407408dd69aba150063232323333573466e1cd55cea801240004664424660020060046464646666ae68cdc39aab9d5002480008cc8848cc00400c008cd40b5d69aba15002302e357426ae8940088c98c80c0cd5ce01801881709aab9e5001137540026ae854008c8c8c8cccd5cd19b8735573aa004900011991091980080180119a816bad35742a004605c6ae84d5d1280111931901819ab9c03003102e135573ca00226ea8004d5d09aba2500223263202c33573805805a05426aae7940044dd50009aba1500533501975c6ae854010ccd5407407c8004d5d0a801999aa80ebae200135742a00460426ae84d5d1280111931901419ab9c028029026135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d55cf280089baa00135742a00860226ae84d5d1280211931900d19ab9c01a01b0183010006375c00c26aae7940044dd5000990009aa80c1108911299a80089a80191000910999a802910011802001199aa9803890008028020008919118011bac001320013550182233335573e0024a034466a03260086ae84008c00cd5d1001009919191999ab9a3370e6aae7540092000233221233001003002300a35742a004600a6ae84d5d1280111931900919ab9c012013010135573ca00226ea80048c8c8c8c8cccd5cd19b8735573aa00890001199991110919998008028020018011919191999ab9a3370e6aae7540092000233221233001003002301335742a00466a01a0246ae84d5d1280111931900b99ab9c017018015135573ca00226ea8004d5d0a802199aa8043ae500735742a0066464646666ae68cdc3a800a4008464244460040086ae84d55cf280191999ab9a3370ea0049001119091118008021bae357426aae7940108cccd5cd19b875003480008488800c8c98c8064cd5ce00c80d00b80b00a89aab9d5001137540026ae854008cd4025d71aba135744a004464c6402666ae7004c0500444d5d1280089aba25001135573ca00226ea80044cd54005d73ad112232230023756002640026aa02a44646666aae7c008940608cd405ccc8848cc00400c008c018d55cea80118029aab9e500230043574400602226ae84004488c8c8cccd5cd19b875001480008c8488c00800cc014d5d09aab9e500323333573466e1d40092002212200123263201033573802002201c01a26aae7540044dd5000919191999ab9a3370ea002900311909111180200298039aba135573ca00646666ae68cdc3a8012400846424444600400a60126ae84d55cf280211999ab9a3370ea006900111909111180080298039aba135573ca00a46666ae68cdc3a8022400046424444600600a6eb8d5d09aab9e500623263201033573802002201c01a01801626aae7540044dd5000919191999ab9a3370e6aae7540092000233221233001003002300535742a0046eb4d5d09aba2500223263200c33573801801a01426aae7940044dd50009191999ab9a3370e6aae75400520002375c6ae84d55cf280111931900519ab9c00a00b00813754002464646464646666ae68cdc3a800a401842444444400646666ae68cdc3a8012401442444444400846666ae68cdc3a801a40104664424444444660020120106eb8d5d0a8029bad357426ae8940148cccd5cd19b875004480188cc8848888888cc008024020dd71aba15007375c6ae84d5d1280391999ab9a3370ea00a900211991091111111980300480418061aba15009375c6ae84d5d1280491999ab9a3370ea00c900111909111111180380418069aba135573ca01646666ae68cdc3a803a400046424444444600a010601c6ae84d55cf280611931900999ab9c01301401101000f00e00d00c00b135573aa00826aae79400c4d55cf280109aab9e5001137540024646464646666ae68cdc3a800a4004466644424466600200a0080066eb4d5d0a8021bad35742a0066eb4d5d09aba2500323333573466e1d4009200023212230020033008357426aae7940188c98c8030cd5ce00600680500489aab9d5003135744a00226aae7940044dd5000919191999ab9a3370ea002900111909118008019bae357426aae79400c8cccd5cd19b875002480008c8488c00800cdd71aba135573ca008464c6401266ae7002402801c0184d55cea80089baa00112232323333573466e1d400520042122200123333573466e1d40092002232122230030043006357426aae7940108cccd5cd19b87500348000848880088c98c8028cd5ce00500580400380309aab9d5001137540024646666ae68cdc3a800a4004401446666ae68cdc3a801240004014464c6400c66ae7001801c01000c4d55ce9baa001499240103505431001200132001355006222533500110022213500222330073330080020060010033200135500522225335001100222135002225335333573466e1c005200000a0091333008007006003133300800733500b12333001008003002006003122002122001112200212212233001004003112323001001223300330020020014c01074643544c4e46540001" +} +""" , "one-shot-minting-v2-big-arg" /\ - "applied/one-shot-minting-v2-big-arg.plutus" + """ +{ + "type": "PlutusScriptV2", + "description": "", + "cborHex": "590a0d590a0a010000333333333233223322323232323232323232323232323232323232323222223232323232325335533533355300b12001323212330012233350052200200200100235001220011233001225335002102310010202325335333573466e3cd400488008d4014880080880844ccd5cd19b87350012200135005220010220211021350012200235500122222222222200c101f102013263201b3357389201115574786f206e6f7420636f6e73756d65640001c1533553355335323301e5023001355001222222222222008101f22135002222533500415335333573466e3c00cd401c88cccd40048c98c808ccd5ce2481024c680002420012326320233357389201024c68000242326320233357389201024c680002402502415335333573466e3c0080240940904ccd5cd19b870014800809409040904090884098407c40804c98c806ccd5ce24811357726f6e6720616d6f756e74206d696e7465640001c101c135001220023333573466e1cd55cea80224000466442466002006004646464646464646464646464646666ae68cdc39aab9d500c480008cccccccccccc88888888888848cccccccccccc00403403002c02802402001c01801401000c008cd4064068d5d0a80619a80c80d1aba1500b33501901b35742a014666aa03aeb94070d5d0a804999aa80ebae501c35742a01066a0320446ae85401cccd5407408dd69aba150063232323333573466e1cd55cea801240004664424660020060046464646666ae68cdc39aab9d5002480008cc8848cc00400c008cd40b5d69aba15002302e357426ae8940088c98c80c0cd5ce01801881709aab9e5001137540026ae854008c8c8c8cccd5cd19b8735573aa004900011991091980080180119a816bad35742a004605c6ae84d5d1280111931901819ab9c03003102e135573ca00226ea8004d5d09aba2500223263202c33573805805a05426aae7940044dd50009aba1500533501975c6ae854010ccd5407407c8004d5d0a801999aa80ebae200135742a00460426ae84d5d1280111931901419ab9c028029026135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d55cf280089baa00135742a00860226ae84d5d1280211931900d19ab9c01a01b0183010006375c00c26aae7940044dd5000990009aa80c1108911299a80089a80191000910999a802910011802001199aa9803890008028020008919118011bac001320013550182233335573e0024a034466a03260086ae84008c00cd5d1001009919191999ab9a3370e6aae7540092000233221233001003002300a35742a004600a6ae84d5d1280111931900919ab9c012013010135573ca00226ea80048c8c8c8c8cccd5cd19b8735573aa00890001199991110919998008028020018011919191999ab9a3370e6aae7540092000233221233001003002301335742a00466a01a0246ae84d5d1280111931900b99ab9c017018015135573ca00226ea8004d5d0a802199aa8043ae500735742a0066464646666ae68cdc3a800a4008464244460040086ae84d55cf280191999ab9a3370ea0049001119091118008021bae357426aae7940108cccd5cd19b875003480008488800c8c98c8064cd5ce00c80d00b80b00a89aab9d5001137540026ae854008cd4025d71aba135744a004464c6402666ae7004c0500444d5d1280089aba25001135573ca00226ea80044cd54005d73ad112232230023756002640026aa02a44646666aae7c008940608cd405ccc8848cc00400c008c018d55cea80118029aab9e500230043574400602226ae84004488c8c8cccd5cd19b875001480008c8488c00800cc014d5d09aab9e500323333573466e1d40092002212200123263201033573802002201c01a26aae7540044dd5000919191999ab9a3370ea002900311909111180200298039aba135573ca00646666ae68cdc3a8012400846424444600400a60126ae84d55cf280211999ab9a3370ea006900111909111180080298039aba135573ca00a46666ae68cdc3a8022400046424444600600a6eb8d5d09aab9e500623263201033573802002201c01a01801626aae7540044dd5000919191999ab9a3370e6aae7540092000233221233001003002300535742a0046eb4d5d09aba2500223263200c33573801801a01426aae7940044dd50009191999ab9a3370e6aae75400520002375c6ae84d55cf280111931900519ab9c00a00b00813754002464646464646666ae68cdc3a800a401842444444400646666ae68cdc3a8012401442444444400846666ae68cdc3a801a40104664424444444660020120106eb8d5d0a8029bad357426ae8940148cccd5cd19b875004480188cc8848888888cc008024020dd71aba15007375c6ae84d5d1280391999ab9a3370ea00a900211991091111111980300480418061aba15009375c6ae84d5d1280491999ab9a3370ea00c900111909111111180380418069aba135573ca01646666ae68cdc3a803a400046424444444600a010601c6ae84d55cf280611931900999ab9c01301401101000f00e00d00c00b135573aa00826aae79400c4d55cf280109aab9e5001137540024646464646666ae68cdc3a800a4004466644424466600200a0080066eb4d5d0a8021bad35742a0066eb4d5d09aba2500323333573466e1d4009200023212230020033008357426aae7940188c98c8030cd5ce00600680500489aab9d5003135744a00226aae7940044dd5000919191999ab9a3370ea002900111909118008019bae357426aae79400c8cccd5cd19b875002480008c8488c00800cdd71aba135573ca008464c6401266ae7002402801c0184d55cea80089baa00112232323333573466e1d400520042122200123333573466e1d40092002232122230030043006357426aae7940108cccd5cd19b87500348000848880088c98c8028cd5ce00500580400380309aab9d5001137540024646666ae68cdc3a800a4004401446666ae68cdc3a801240004014464c6400c66ae7001801c01000c4d55ce9baa001499240103505431001200132001355006222533500110022213500222330073330080020060010033200135500522225335001100222135002225335333573466e1c005200000a0091333008007006003133300800733500b12333001008003002006003122002122001112200212212233001004003112323001001223300330020020014c01074643544c4e4654004c010107004c0103d87980004c01089fd87980424d5fff004c01465f58404d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d414dff004c0107a20507424d5f08004c0154d9055f9f079fd87980424d5f5f58404d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d414dffffff004c0114d87e9f809f01ffa0a201d8798002d87b9f02ffff0001" +} +""" , "one-shot-minting-v2-no-args" /\ - "applied/one-shot-minting-v2-no-args.plutus" - , "one-shot-minting-v2-unit" /\ "applied/one-shot-minting-v2-unit.plutus" + """ +{ + "type": "PlutusScriptV2", + "description": "", + "cborHex": "59092c59092901000033233223322323232323232323232323232323232323232323222223232323232325335533533355300b12001323212330012233350052200200200100235001220011233001225335002102310010202325335333573466e3cd400488008d4014880080880844ccd5cd19b87350012200135005220010220211021350012200235500122222222222200c101f102013263201b335738921115574786f206e6f7420636f6e73756d65640001c1533553355335323301e5023001355001222222222222008101f22135002222533500415335333573466e3c00cd401c88cccd40048c98c808ccd5ce2481024c680002420012326320233357389201024c68000242326320233357389201024c680002402502415335333573466e3c0080240940904ccd5cd19b870014800809409040904090884098407c40804c98c806ccd5ce24811357726f6e6720616d6f756e74206d696e7465640001c101c135001220023333573466e1cd55cea80224000466442466002006004646464646464646464646464646666ae68cdc39aab9d500c480008cccccccccccc88888888888848cccccccccccc00403403002c02802402001c01801401000c008cd4064068d5d0a80619a80c80d1aba1500b33501901b35742a014666aa03aeb94070d5d0a804999aa80ebae501c35742a01066a0320446ae85401cccd5407408dd69aba150063232323333573466e1cd55cea801240004664424660020060046464646666ae68cdc39aab9d5002480008cc8848cc00400c008cd40b5d69aba15002302e357426ae8940088c98c80c0cd5ce01801881709aab9e5001137540026ae854008c8c8c8cccd5cd19b8735573aa004900011991091980080180119a816bad35742a004605c6ae84d5d1280111931901819ab9c03003102e135573ca00226ea8004d5d09aba2500223263202c33573805805a05426aae7940044dd50009aba1500533501975c6ae854010ccd5407407c8004d5d0a801999aa80ebae200135742a00460426ae84d5d1280111931901419ab9c028029026135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d55cf280089baa00135742a00860226ae84d5d1280211931900d19ab9c01a01b0183010006375c00c26aae7940044dd5000990009aa80c1108911299a80089a80191000910999a802910011802001199aa9803890008028020008919118011bac001320013550182233335573e0024a034466a03260086ae84008c00cd5d1001009919191999ab9a3370e6aae7540092000233221233001003002300a35742a004600a6ae84d5d1280111931900919ab9c012013010135573ca00226ea80048c8c8c8c8cccd5cd19b8735573aa00890001199991110919998008028020018011919191999ab9a3370e6aae7540092000233221233001003002301335742a00466a01a0246ae84d5d1280111931900b99ab9c017018015135573ca00226ea8004d5d0a802199aa8043ae500735742a0066464646666ae68cdc3a800a4008464244460040086ae84d55cf280191999ab9a3370ea0049001119091118008021bae357426aae7940108cccd5cd19b875003480008488800c8c98c8064cd5ce00c80d00b80b00a89aab9d5001137540026ae854008cd4025d71aba135744a004464c6402666ae7004c0500444d5d1280089aba25001135573ca00226ea80044cd54005d73ad112232230023756002640026aa02a44646666aae7c008940608cd405ccc8848cc00400c008c018d55cea80118029aab9e500230043574400602226ae84004488c8c8cccd5cd19b875001480008c8488c00800cc014d5d09aab9e500323333573466e1d40092002212200123263201033573802002201c01a26aae7540044dd5000919191999ab9a3370ea002900311909111180200298039aba135573ca00646666ae68cdc3a8012400846424444600400a60126ae84d55cf280211999ab9a3370ea006900111909111180080298039aba135573ca00a46666ae68cdc3a8022400046424444600600a6eb8d5d09aab9e500623263201033573802002201c01a01801626aae7540044dd5000919191999ab9a3370e6aae7540092000233221233001003002300535742a0046eb4d5d09aba2500223263200c33573801801a01426aae7940044dd50009191999ab9a3370e6aae75400520002375c6ae84d55cf280111931900519ab9c00a00b00813754002464646464646666ae68cdc3a800a401842444444400646666ae68cdc3a8012401442444444400846666ae68cdc3a801a40104664424444444660020120106eb8d5d0a8029bad357426ae8940148cccd5cd19b875004480188cc8848888888cc008024020dd71aba15007375c6ae84d5d1280391999ab9a3370ea00a900211991091111111980300480418061aba15009375c6ae84d5d1280491999ab9a3370ea00c900111909111111180380418069aba135573ca01646666ae68cdc3a803a400046424444444600a010601c6ae84d55cf280611931900999ab9c01301401101000f00e00d00c00b135573aa00826aae79400c4d55cf280109aab9e5001137540024646464646666ae68cdc3a800a4004466644424466600200a0080066eb4d5d0a8021bad35742a0066eb4d5d09aba2500323333573466e1d4009200023212230020033008357426aae7940188c98c8030cd5ce00600680500489aab9d5003135744a00226aae7940044dd5000919191999ab9a3370ea002900111909118008019bae357426aae79400c8cccd5cd19b875002480008c8488c00800cdd71aba135573ca008464c6401266ae7002402801c0184d55cea80089baa00112232323333573466e1d400520042122200123333573466e1d40092002232122230030043006357426aae7940108cccd5cd19b87500348000848880088c98c8028cd5ce00500580400380309aab9d5001137540024646666ae68cdc3a800a4004401446666ae68cdc3a801240004014464c6400c66ae7001801c01000c4d55ce9baa001499240103505431001200132001355006222533500110022213500222330073330080020060010033200135500522225335001100222135002225335333573466e1c005200000a0091333008007006003133300800733500b12333001008003002006003122002122001112200212212233001004003112323001001223300330020020014c01074643544c4e46540001" +} +""" + , "one-shot-minting-v2-unit" /\ + """ +{ + "type": "PlutusScriptV2", + "description": "", + "cborHex": "590934590931010000333233223322323232323232323232323232323232323232323222223232323232325335533533355300b12001323212330012233350052200200200100235001220011233001225335002102310010202325335333573466e3cd400488008d4014880080880844ccd5cd19b87350012200135005220010220211021350012200235500122222222222200c101f102013263201b3357389201115574786f206e6f7420636f6e73756d65640001c1533553355335323301e5023001355001222222222222008101f22135002222533500415335333573466e3c00cd401c88cccd40048c98c808ccd5ce2481024c680002420012326320233357389201024c68000242326320233357389201024c680002402502415335333573466e3c0080240940904ccd5cd19b870014800809409040904090884098407c40804c98c806ccd5ce24811357726f6e6720616d6f756e74206d696e7465640001c101c135001220023333573466e1cd55cea80224000466442466002006004646464646464646464646464646666ae68cdc39aab9d500c480008cccccccccccc88888888888848cccccccccccc00403403002c02802402001c01801401000c008cd4064068d5d0a80619a80c80d1aba1500b33501901b35742a014666aa03aeb94070d5d0a804999aa80ebae501c35742a01066a0320446ae85401cccd5407408dd69aba150063232323333573466e1cd55cea801240004664424660020060046464646666ae68cdc39aab9d5002480008cc8848cc00400c008cd40b5d69aba15002302e357426ae8940088c98c80c0cd5ce01801881709aab9e5001137540026ae854008c8c8c8cccd5cd19b8735573aa004900011991091980080180119a816bad35742a004605c6ae84d5d1280111931901819ab9c03003102e135573ca00226ea8004d5d09aba2500223263202c33573805805a05426aae7940044dd50009aba1500533501975c6ae854010ccd5407407c8004d5d0a801999aa80ebae200135742a00460426ae84d5d1280111931901419ab9c028029026135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d55cf280089baa00135742a00860226ae84d5d1280211931900d19ab9c01a01b0183010006375c00c26aae7940044dd5000990009aa80c1108911299a80089a80191000910999a802910011802001199aa9803890008028020008919118011bac001320013550182233335573e0024a034466a03260086ae84008c00cd5d1001009919191999ab9a3370e6aae7540092000233221233001003002300a35742a004600a6ae84d5d1280111931900919ab9c012013010135573ca00226ea80048c8c8c8c8cccd5cd19b8735573aa00890001199991110919998008028020018011919191999ab9a3370e6aae7540092000233221233001003002301335742a00466a01a0246ae84d5d1280111931900b99ab9c017018015135573ca00226ea8004d5d0a802199aa8043ae500735742a0066464646666ae68cdc3a800a4008464244460040086ae84d55cf280191999ab9a3370ea0049001119091118008021bae357426aae7940108cccd5cd19b875003480008488800c8c98c8064cd5ce00c80d00b80b00a89aab9d5001137540026ae854008cd4025d71aba135744a004464c6402666ae7004c0500444d5d1280089aba25001135573ca00226ea80044cd54005d73ad112232230023756002640026aa02a44646666aae7c008940608cd405ccc8848cc00400c008c018d55cea80118029aab9e500230043574400602226ae84004488c8c8cccd5cd19b875001480008c8488c00800cc014d5d09aab9e500323333573466e1d40092002212200123263201033573802002201c01a26aae7540044dd5000919191999ab9a3370ea002900311909111180200298039aba135573ca00646666ae68cdc3a8012400846424444600400a60126ae84d55cf280211999ab9a3370ea006900111909111180080298039aba135573ca00a46666ae68cdc3a8022400046424444600600a6eb8d5d09aab9e500623263201033573802002201c01a01801626aae7540044dd5000919191999ab9a3370e6aae7540092000233221233001003002300535742a0046eb4d5d09aba2500223263200c33573801801a01426aae7940044dd50009191999ab9a3370e6aae75400520002375c6ae84d55cf280111931900519ab9c00a00b00813754002464646464646666ae68cdc3a800a401842444444400646666ae68cdc3a8012401442444444400846666ae68cdc3a801a40104664424444444660020120106eb8d5d0a8029bad357426ae8940148cccd5cd19b875004480188cc8848888888cc008024020dd71aba15007375c6ae84d5d1280391999ab9a3370ea00a900211991091111111980300480418061aba15009375c6ae84d5d1280491999ab9a3370ea00c900111909111111180380418069aba135573ca01646666ae68cdc3a803a400046424444444600a010601c6ae84d55cf280611931900999ab9c01301401101000f00e00d00c00b135573aa00826aae79400c4d55cf280109aab9e5001137540024646464646666ae68cdc3a800a4004466644424466600200a0080066eb4d5d0a8021bad35742a0066eb4d5d09aba2500323333573466e1d4009200023212230020033008357426aae7940188c98c8030cd5ce00600680500489aab9d5003135744a00226aae7940044dd5000919191999ab9a3370ea002900111909118008019bae357426aae79400c8cccd5cd19b875002480008c8488c00800cdd71aba135573ca008464c6401266ae7002402801c0184d55cea80089baa00112232323333573466e1d400520042122200123333573466e1d40092002232122230030043006357426aae7940108cccd5cd19b87500348000848880088c98c8028cd5ce00500580400380309aab9d5001137540024646666ae68cdc3a800a4004401446666ae68cdc3a801240004014464c6400c66ae7001801c01000c4d55ce9baa001499240103505431001200132001355006222533500110022213500222330073330080020060010033200135500522225335001100222135002225335333573466e1c005200000a0091333008007006003133300800733500b12333001008003002006003122002122001112200212212233001004003112323001001223300330020020014c01074643544c4e4654004c0103d879800001" +} +""" + + , "redeemer1-validator" /\ + """ +{ + "description": "validator that checks whether redeemer is 1", + "cborHex": "4e4d0100002223375e0046ea120021", + "type": "PlutusScriptV1" +} +""" , "redeemer1-validator-big-arg" /\ - "applied/redeemer1-validator-big-arg.plutus" + """ +{ + "type": "PlutusScriptV1", + "description": "", + "cborHex": "58f058ee01000033333332223375e0046ea120024c010107004c0103d87980004c01089fd87980424d5fff004c01465f58404d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d414dff004c0107a20507424d5f08004c0154d9055f9f079fd87980424d5f5f58404d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d414dffffff004c0114d87e9f809f01ffa0a201d8798002d87b9f02ffff0001" +} +""" , "redeemer1-validator-no-args" /\ - "applied/redeemer1-validator-no-args.plutus" - , "redeemer1-validator-unit" /\ "applied/redeemer1-validator-unit.plutus" + """ +{ + "type": "PlutusScriptV1", + "description": "", + "cborHex": "4e4d0100002223375e0046ea120021" +} +""" + , "redeemer1-validator-unit" /\ + """ +{ + "type": "PlutusScriptV1", + "description": "", + "cborHex": "565501000032223375e0046ea120024c0103d879800001" +} +""" ] main :: Effect Unit @@ -77,28 +265,29 @@ main = launchAff_ $ interpret $ suite contract :: Contract Unit contract = do - scripts <- liftAff $ parTraverse loadScript scriptFilenames - traverse_ (uncurry $ compareApplied (v1 scripts)) $ Tuple <$> v1ScriptPaths + traverse_ (uncurry $ compareApplied (v1 scriptSources)) $ Tuple + <$> v1ScriptPaths <*> params - traverse_ (uncurry $ compareApplied (v2 scripts)) $ Tuple <$> v2ScriptPaths + traverse_ (uncurry $ compareApplied (v2 scriptSources)) $ Tuple + <$> v2ScriptPaths <*> params suite :: TestPlanM (Aff Unit) Unit suite = group "Applying params to scripts test" $ do - scripts <- lift $ parTraverse loadScript scriptFilenames - traverse_ (uncurry $ testCase (v1 scripts)) $ Tuple <$> v1ScriptPaths <*> - params - traverse_ (uncurry $ testCase (v2 scripts)) $ Tuple <$> v2ScriptPaths <*> - params + traverse_ (uncurry $ testCase $ v1 scriptSources) + $ Tuple + <$> v1ScriptPaths + <*> params + traverse_ (uncurry $ testCase $ v2 scriptSources) + $ Tuple + <$> v2ScriptPaths + <*> params where testCase lang scriptName (args /\ argsName) = test ("Apply " <> argsName <> " to " <> scriptName) $ compareApplied lang scriptName (args /\ argsName) -loadScript :: String -> Aff String -loadScript = readTextFile UTF8 <<< append "./fixtures/scripts/" - compareApplied :: forall (m :: Type -> Type) . Monad m From d51471faf94a61dde7878646d97cafa5bf0ded7e Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Tue, 10 Oct 2023 12:23:41 +0400 Subject: [PATCH 45/85] Move Blockfrost API key setup to the core of the lib --- examples/index.html | 60 ------------------------------- examples/index.js | 3 +- src/Internal/Test/E2E/Route.js | 61 ++++++++++++++++++++++++++++++++ src/Internal/Test/E2E/Route.purs | 3 ++ templates/ctl-scaffold/index.js | 2 -- 5 files changed, 66 insertions(+), 63 deletions(-) diff --git a/examples/index.html b/examples/index.html index 556bfcde5a..3247c9a066 100644 --- a/examples/index.html +++ b/examples/index.html @@ -5,66 +5,6 @@ - diff --git a/examples/index.js b/examples/index.js index 2ea8c88a30..7179331842 100644 --- a/examples/index.js +++ b/examples/index.js @@ -1,8 +1,9 @@ "use strict"; -// This needs to be asynchronous to load the WASM from CSL +// This needs to be asynchronous to load the WASM from cardano-serialization-lib // // You also need to call `spago bundle-module` to generate the module that is // imported here. From the repository root, run: // spago bundle-module -m
--to output.js +// Normally it should be done via Nix (see flake.nix) or via a Makefile import("../output.js").then(m => m.main()); diff --git a/src/Internal/Test/E2E/Route.js b/src/Internal/Test/E2E/Route.js index cf7c28ae29..b848aa4000 100644 --- a/src/Internal/Test/E2E/Route.js +++ b/src/Internal/Test/E2E/Route.js @@ -2,6 +2,67 @@ export function _queryString() { return window.location.search; } +export function _setupBlockfrostApi() { + // Set up Blockfrost API key prompt and UI around it. + // This code is only needed for CTL itself. + const oldBlockfrostKey = localStorage.getItem("BLOCKFROST_API_KEY"); + + const addSpacer = () => { + const spacer = document.createElement("span"); + spacer.textContent = " "; + document.body.appendChild(spacer); + }; + + const addHtml = html => { + const div = document.createElement("div"); + div.innerHTML = html; + document.body.appendChild(div); + }; + + addHtml(`

Blockfrost setup

`); + + if (oldBlockfrostKey !== null) { + const keyIsSetEl = document.createElement("span"); + keyIsSetEl.innerHTML = + '✅ Blockfrost key is set.'; + document.body.appendChild(keyIsSetEl); + + addSpacer(); + + const setBFKeyButton = document.createElement("button"); + setBFKeyButton.textContent = "Unset"; + setBFKeyButton.onclick = () => { + localStorage.removeItem("BLOCKFROST_API_KEY"); + window.location = "/"; + }; + document.body.appendChild(setBFKeyButton); + } else { + const keyIsNotSetEl = document.createElement("span"); + keyIsNotSetEl.innerHTML = + '❌ Blockfrost key is not set.'; + document.body.appendChild(keyIsNotSetEl); + + addSpacer(); + + const setBFKeyButton = document.createElement("button"); + setBFKeyButton.textContent = "Set Blockfrost API key"; + setBFKeyButton.onclick = () => { + const key = prompt("Enter your Blockfrost API key"); + if (key !== null) { + localStorage.setItem("BLOCKFROST_API_KEY", key); + window.location = "/"; + } + }; + document.body.appendChild(setBFKeyButton); + } + + addHtml(`
If you are viewing this page via an E2E-test-suite-controlled browser, to set the Blockfrost API key permanently, close the browser and run: + 
+        npm run e2e-pack-settings
+
+ The key will be saved to your settings archive. Sharing the archive file after that implies that the key can be leaked.
`); +} + const createLink = (example, wallet) => '' + wallet + ""; diff --git a/src/Internal/Test/E2E/Route.purs b/src/Internal/Test/E2E/Route.purs index 7b44844ee6..f3bf46b10a 100644 --- a/src/Internal/Test/E2E/Route.purs +++ b/src/Internal/Test/E2E/Route.purs @@ -111,6 +111,7 @@ addLinks configMaps testMaps = do configs = Array.fromFoldable $ Map.keys configMaps tests = Array.fromFoldable $ Map.keys testMaps _addLinks configs tests + _setupBlockfrostApi -- | Serves given examples conditionally, depending on the URL query part. -- | @@ -223,3 +224,5 @@ foreign import _writeExampleHTML :: String -> Array String -> Effect Unit foreign import _addLinks :: Array E2EConfigName -> Array E2ETestName -> Effect Unit + +foreign import _setupBlockfrostApi :: Effect Unit diff --git a/templates/ctl-scaffold/index.js b/templates/ctl-scaffold/index.js index b9185a093b..c2eeb86606 100644 --- a/templates/ctl-scaffold/index.js +++ b/templates/ctl-scaffold/index.js @@ -6,5 +6,3 @@ // imported here. From the repository root, run: // spago bundle-module -m
--to output.js import("./output.js").then(m => m.main()); - -console.log("app starting"); From 2c01b2de1a4e8ecf0cff34f7e3a3e4ce36cf84cf Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Tue, 10 Oct 2023 18:34:39 +0400 Subject: [PATCH 46/85] Synchronize webpack config in the template --- .../{webpack.config.js => webpack.config.cjs} | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) rename templates/ctl-scaffold/{webpack.config.js => webpack.config.cjs} (93%) diff --git a/templates/ctl-scaffold/webpack.config.js b/templates/ctl-scaffold/webpack.config.cjs similarity index 93% rename from templates/ctl-scaffold/webpack.config.js rename to templates/ctl-scaffold/webpack.config.cjs index bc391a2526..7f4710173c 100644 --- a/templates/ctl-scaffold/webpack.config.js +++ b/templates/ctl-scaffold/webpack.config.cjs @@ -43,6 +43,9 @@ module.exports = { output: { path: path.resolve(__dirname, "dist"), filename: "bundle.js", + library: { + type: "module", + }, }, module: { @@ -78,11 +81,6 @@ module.exports = { readline: false, child_process: false, }, - alias: { - // You should update this path to the location of your compiled scripts, - // relative to `webpack.config.js` - Scripts: path.resolve(__dirname, "scripts"), - }, }, plugins: [ From 5072d03a466cd610bfafd09656c5233ec6f2db5b Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Wed, 11 Oct 2023 20:28:31 +0400 Subject: [PATCH 47/85] WIP: refactor bundling; let bundle* commands produce just the bundle --- .gitignore | 11 +---- Makefile | 2 +- dist/esbuild/index.html | 13 ------ dist/webpack/.gitkeep | 0 esbuild/bundle.js | 11 ++++- esbuild/config.js | 8 ++-- esbuild/serve.js | 20 +++++++-- flake.nix | 7 ++- nix/default.nix | 86 +++++++++++++++++++++++++++++-------- scripts/whitespace-check.sh | 2 +- webpack.config.cjs | 7 +-- 11 files changed, 107 insertions(+), 60 deletions(-) delete mode 100644 dist/esbuild/index.html delete mode 100644 dist/webpack/.gitkeep diff --git a/.gitignore b/.gitignore index 50485c0093..a8bba0b04d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,14 +15,7 @@ result-* .node .node-cfg .projectile -/dist/* -!/dist/esbuild/ -/dist/esbuild/* -!/dist/esbuild/index.html -!/dist/esbuild/wrapper.js -!/dist/webpack/ -/dist/webpack/* -!/dist/webpack/.gitkeep +/dist/ output.js .DS_Store .idea/ @@ -34,5 +27,5 @@ test-data/keys tmp node_modules plutip-server/dist-newstyle/ +plutip-server/dist/ plutip-server/.stack-work/ - diff --git a/Makefile b/Makefile index 6bd9d76785..b30082faaf 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,6 @@ preprod-node-ipc = $(shell docker volume inspect store_node-preprod-ipc | jq -r esbuild-bundle: @spago build \ - && cp -rf fixtures dist/esbuild \ && BROWSER_RUNTIME=1 node esbuild/bundle.js ${ps-entrypoint} esbuild-serve: esbuild-bundle @@ -85,3 +84,4 @@ clean: @ rm -rf .spago2nix || true @ rm -rf node_modules || true @ rm -rf output || true + @ rm -rf dist || true diff --git a/dist/esbuild/index.html b/dist/esbuild/index.html deleted file mode 100644 index e3c16ed392..0000000000 --- a/dist/esbuild/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - Examples source code is located in examples/ directory.
- - diff --git a/dist/webpack/.gitkeep b/dist/webpack/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/esbuild/bundle.js b/esbuild/bundle.js index c3a5dd652a..f8b295be2d 100755 --- a/esbuild/bundle.js +++ b/esbuild/bundle.js @@ -1,4 +1,13 @@ import * as esbuild from "esbuild"; import { buildOptions } from "./config.js"; -esbuild.build(buildOptions); +if (process.argv.length < 4) { + throw `usage: nodejs bundle.js ENTRY_POINT OUTPUT_DIR`; +} + +esbuild.build( + buildOptions({ + entryPoint: process.argv[2], + outputDir: process.argv[3], + }) +); diff --git a/esbuild/config.js b/esbuild/config.js index a53bdb2c1e..e691989524 100644 --- a/esbuild/config.js +++ b/esbuild/config.js @@ -1,9 +1,9 @@ import { wasmLoader } from "esbuild-plugin-wasm"; import { polyfillNode } from "esbuild-plugin-polyfill-node"; -export const buildOptions = { - entryPoints: [`output/${process.argv[2]}/index.js`], - outdir: "dist/esbuild", +export const buildOptions = ({ entryPoint, outputDir }) => ({ + entryPoints: [entryPoint], + outdir: outputDir, define: { BROWSER_RUNTIME: process.env.BROWSER_RUNTIME, }, @@ -24,4 +24,4 @@ export const buildOptions = { format: "esm", treeShaking: true, logLevel: "error", -}; +}); diff --git a/esbuild/serve.js b/esbuild/serve.js index 9b3637eb1f..a1ee33f791 100755 --- a/esbuild/serve.js +++ b/esbuild/serve.js @@ -1,11 +1,23 @@ import * as esbuild from "esbuild"; import { buildOptions } from "./config.js"; -const ctx = await esbuild.context(buildOptions); +if (process.argv.length < 7) { + throw `usage: nodejs serve.js PURESCRIPT_MODULE OUTPUT_DIR SERVE_DIR HOST PORT`; +} + +const ctx = await esbuild.context( + buildOptions({ + pursEntryPoint: process.argv[2], + outputDir: process.argv[3], + }) +); + const config = { - host: "127.0.0.1", - port: 4008, - servedir: "dist/esbuild", + host: process.argv[5], + port: process.argv[6], + servedir: process.argv[4], }; + console.log("serving:", config); + await ctx.serve(config); diff --git a/flake.nix b/flake.nix index 85a25d2457..20086d9a3a 100644 --- a/flake.nix +++ b/flake.nix @@ -157,9 +157,12 @@ in rec { packages = { - ctl-example-bundle-web = project.bundlePursProject { + ctl-example-bundle-web = project.bundlePursProjectEsbuild { + main = "Ctl.Examples.ByUrl"; + }; + + ctl-example-bundle-web-webpack = project.bundlePursProjectWebpack { main = "Ctl.Examples.ByUrl"; - entrypoint = "examples/index.js"; }; ctl-runtime = pkgs.arion.build { diff --git a/nix/default.nix b/nix/default.nix index 3adc1d8a64..973dd7480a 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -10,10 +10,6 @@ # this in explicitly, even if it can be derived from the `src` argument. By # doing so, you will prevent frequent rebuilds of your generated `node_modules` , packageLock ? "${src}/package-lock.json" - # If warnings generated from project source files will trigger a build error -, strictComp ? true - # Warnings from `purs` to silence during compilation, independent of `strictComp` -, censorCodes ? [ "UserDefinedWarning" ] # The version of node to use across all project components , nodejs ? pkgs.nodejs-18_x # Autogenerated Nix from `spago2nix generate` @@ -177,6 +173,12 @@ let # Generated `node_modules` in the Nix store. Can be passed to have better # control over individual project components , nodeModules ? projectNodeModules + # If warnings generated from project source files will trigger a build error. + # Controls `--strict` purescript-psa flag + , strictComp ? true + # Warnings from `purs` to silence during compilation, independent of `strictComp` + # Controls `--censor-codes` purescript-psa flag + , censorCodes ? [ "UserDefinedWarning" ] , ... }: pkgs.stdenv.mkDerivation { @@ -291,13 +293,12 @@ let # Passed through to the `buildInputs` of the derivation. Use this to add # additional packages to the test environment , buildInputs ? [ ] + , bundledPursProject ? (bundlePursProjectWebpack { + main = testMain; + }) , ... }@args: let - bundledPursProject = bundlePursProject { - main = "Ctl.Examples.ByUrl"; - entrypoint = "examples/index.js"; - }; # We need fonts if we are going to use chromium etc_fonts = let @@ -374,7 +375,7 @@ let export OGMIOS_PORT=1345 export E2E_EXTRA_BROWSER_ARGS="--disable-web-security" - python -m http.server 4008 --directory ${bundledPursProject}/dist/esbuild & + python -m http.server 4008 --directory ${bundledPursProject} & until curl -S http://127.0.0.1:4008/index.html &>/dev/null; do echo "Trying to connect to webserver..."; sleep 0.1; @@ -388,16 +389,60 @@ let '' ; - # Bundles a Purescript project using Webpack, typically for the browser - bundlePursProject = + # Bundles a Purescript project using esbuild, typically for the browser + bundlePursProjectEsbuild = { # Can be used to override the name given to the resulting derivation name ? "${projectName}-bundle-" + (if browserRuntime then "web" else "nodejs") # The main Purescript module , main ? "Main" + # Whether this bundle is being produced for a browser environment or not + , browserRuntime ? true + , esbuildBundleScript ? "esbuild/bundle.js" + # Generated `node_modules` in the Nix store. Can be passed to have better + # control over individual project components + , nodeModules ? projectNodeModules + , ... + }: pkgs.runCommand "${name}" + { + buildInputs = [ + nodejs + nodeModules + project + ]; + nativeBuildInputs = [ + purs + pkgs.easy-ps.spago + ]; + } + '' + export HOME="$TMP" + export NODE_PATH="${nodeModules}/lib/node_modules" + ln -sfn $NODE_PATH node_modules + export PATH="${nodeModules}/bin:$PATH" + ${pkgs.lib.optionalString browserRuntime "export BROWSER_RUNTIME=1"} + chmod -R +rw . + cp -r ${project}/* . + node ${esbuildBundleScript} ./output/${main}/index.js dist/ + mkdir $out + mv dist/* $out + ''; + + # Bundles a Purescript project using Webpack, typically for the browser + bundlePursProjectWebpack = + { + # Can be used to override the name given to the resulting derivation + name ? "${projectName}-bundle-" + + (if browserRuntime then "web" else "nodejs") + # The main Purescript module + , main + # The entry point function in the main PureScript module + , psEntryPoint ? "main" # If this bundle is being produced for a browser environment or not , browserRuntime ? true + # Path to the Webpack config to use + , webpackConfig ? "webpack.config.cjs" # The name of the bundled JS module that `spago bundle-module` will produce , bundledModuleName ? "output.js" # Generated `node_modules` in the Nix store. Can be passed to have better @@ -409,11 +454,11 @@ let }: pkgs.runCommand "${name}" { buildInputs = [ + ]; + nativeBuildInputs = [ nodejs nodeModules project - ]; - nativeBuildInputs = [ purs pkgs.easy-ps.spago ]; @@ -421,15 +466,17 @@ let '' export HOME="$TMP" export NODE_PATH="${nodeModules}/lib/node_modules" - ln -sfn $NODE_PATH node_modules export PATH="${nodeModules}/bin:$PATH" ${pkgs.lib.optionalString browserRuntime "export BROWSER_RUNTIME=1"} cp -r ${project}/* . - chmod -R +rwx . - node esbuild/bundle.js ${main} - cp -r fixtures dist/esbuild + chmod -R +rw . + mkdir -p ./dist + echo 'import("./output/${main}/index.js").then(m => m.${psEntryPoint}());' > entrypoint.js + ${pkgs.lib.optionalString includeBundledModule "cp ${bundledModuleName} ./dist"} + webpack --mode=production -c ${webpackConfig} -o ./dist \ + --entry ./entrypoint.js mkdir $out - mv dist $out + mv ./dist/* $out ''; pursDocsSearchNpm = @@ -566,7 +613,8 @@ let in { inherit - buildPursProject runPursTest runPlutipTest runE2ETest bundlePursProject + buildPursProject runPursTest runPlutipTest runE2ETest + bundlePursProjectEsbuild bundlePursProjectWebpack buildPursDocs buildSearchablePursDocs launchSearchablePursDocs purs nodejs mkNodeModules; devShell = shellFor shell; diff --git a/scripts/whitespace-check.sh b/scripts/whitespace-check.sh index ced258a00c..5439ba834b 100755 --- a/scripts/whitespace-check.sh +++ b/scripts/whitespace-check.sh @@ -11,7 +11,7 @@ files=" .tidyrc.json LICENSE Makefile -webpack.config.js +webpack.config.cjs package.json doc/*.md examples/ diff --git a/webpack.config.cjs b/webpack.config.cjs index 7495185acd..6b15248275 100644 --- a/webpack.config.cjs +++ b/webpack.config.cjs @@ -42,7 +42,7 @@ module.exports = env => { output: { path: path.resolve(__dirname, "dist/webpack"), - filename: "bundle.js", + filename: "index.js", library: { type: "module", } @@ -91,11 +91,6 @@ module.exports = env => { new webpack.LoaderOptionsPlugin({ debug: true, }), - new HtmlWebpackPlugin({ - title: "cardano-transaction-lib-examples", - template: "./examples/index.html", - inject: false, // See stackoverflow.com/a/38292765/3067181 - }), new webpack.ProvidePlugin({ Buffer: ["buffer", "Buffer"], }), From 3565be1f50407a85c11430f20164b70db7f5dc2a Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Wed, 11 Oct 2023 20:29:03 +0400 Subject: [PATCH 48/85] Only enable blockfrost examples if blockfrost key is set --- examples/ByUrl.purs | 119 +++++++++++++++++++++++--------------------- 1 file changed, 61 insertions(+), 58 deletions(-) diff --git a/examples/ByUrl.purs b/examples/ByUrl.purs index 8f00edce06..e4f75e7e1f 100644 --- a/examples/ByUrl.purs +++ b/examples/ByUrl.purs @@ -78,64 +78,67 @@ main = do mbApiKey <- getBlockfrostApiKey let walletsWithBlockfrost = - wallets `Map.union` Map.fromFoldable - [ "blockfrost-nami-preview" - /\ (mkBlockfrostPreviewConfig mbApiKey) - { walletSpec = Just ConnectToNami } - /\ Nothing - , "blockfrost-gero-preview" - /\ (mkBlockfrostPreviewConfig mbApiKey) - { walletSpec = Just ConnectToGero } - /\ Nothing - , "blockfrost-eternl-preview" - /\ (mkBlockfrostPreviewConfig mbApiKey) - { walletSpec = Just ConnectToEternl } - /\ Nothing - , "blockfrost-lode-preview" - /\ (mkBlockfrostPreviewConfig mbApiKey) - { walletSpec = Just ConnectToLode } - /\ Nothing - , "blockfrost-flint-preview" - /\ (mkBlockfrostPreviewConfig mbApiKey) - { walletSpec = Just ConnectToFlint } - /\ Nothing - , "blockfrost-nufi-preview" - /\ (mkBlockfrostPreviewConfig mbApiKey) - { walletSpec = Just ConnectToNuFi } - /\ Nothing - , "blockfrost-lace-preview" - /\ (mkBlockfrostPreviewConfig mbApiKey) - { walletSpec = Just ConnectToLace } - /\ Nothing - , "blockfrost-nami-preprod" - /\ (mkBlockfrostPreprodConfig mbApiKey) - { walletSpec = Just ConnectToNami } - /\ Nothing - , "blockfrost-gero-preprod" - /\ (mkBlockfrostPreprodConfig mbApiKey) - { walletSpec = Just ConnectToGero } - /\ Nothing - , "blockfrost-eternl-preprod" - /\ (mkBlockfrostPreprodConfig mbApiKey) - { walletSpec = Just ConnectToEternl } - /\ Nothing - , "blockfrost-lode-preprod" - /\ (mkBlockfrostPreprodConfig mbApiKey) - { walletSpec = Just ConnectToLode } - /\ Nothing - , "blockfrost-flint-preprod" - /\ (mkBlockfrostPreprodConfig mbApiKey) - { walletSpec = Just ConnectToFlint } - /\ Nothing - , "blockfrost-nufi-preprod" - /\ (mkBlockfrostPreprodConfig mbApiKey) - { walletSpec = Just ConnectToNuFi } - /\ Nothing - , "blockfrost-lace-preprod" - /\ (mkBlockfrostPreprodConfig mbApiKey) - { walletSpec = Just ConnectToLace } - /\ Nothing - ] + wallets `Map.union` + if isNothing mbApiKey then Map.empty + else + Map.fromFoldable + [ "blockfrost-nami-preview" + /\ (mkBlockfrostPreviewConfig mbApiKey) + { walletSpec = Just ConnectToNami } + /\ Nothing + , "blockfrost-gero-preview" + /\ (mkBlockfrostPreviewConfig mbApiKey) + { walletSpec = Just ConnectToGero } + /\ Nothing + , "blockfrost-eternl-preview" + /\ (mkBlockfrostPreviewConfig mbApiKey) + { walletSpec = Just ConnectToEternl } + /\ Nothing + , "blockfrost-lode-preview" + /\ (mkBlockfrostPreviewConfig mbApiKey) + { walletSpec = Just ConnectToLode } + /\ Nothing + , "blockfrost-flint-preview" + /\ (mkBlockfrostPreviewConfig mbApiKey) + { walletSpec = Just ConnectToFlint } + /\ Nothing + , "blockfrost-nufi-preview" + /\ (mkBlockfrostPreviewConfig mbApiKey) + { walletSpec = Just ConnectToNuFi } + /\ Nothing + , "blockfrost-lace-preview" + /\ (mkBlockfrostPreviewConfig mbApiKey) + { walletSpec = Just ConnectToLace } + /\ Nothing + , "blockfrost-nami-preprod" + /\ (mkBlockfrostPreprodConfig mbApiKey) + { walletSpec = Just ConnectToNami } + /\ Nothing + , "blockfrost-gero-preprod" + /\ (mkBlockfrostPreprodConfig mbApiKey) + { walletSpec = Just ConnectToGero } + /\ Nothing + , "blockfrost-eternl-preprod" + /\ (mkBlockfrostPreprodConfig mbApiKey) + { walletSpec = Just ConnectToEternl } + /\ Nothing + , "blockfrost-lode-preprod" + /\ (mkBlockfrostPreprodConfig mbApiKey) + { walletSpec = Just ConnectToLode } + /\ Nothing + , "blockfrost-flint-preprod" + /\ (mkBlockfrostPreprodConfig mbApiKey) + { walletSpec = Just ConnectToFlint } + /\ Nothing + , "blockfrost-nufi-preprod" + /\ (mkBlockfrostPreprodConfig mbApiKey) + { walletSpec = Just ConnectToNuFi } + /\ Nothing + , "blockfrost-lace-preprod" + /\ (mkBlockfrostPreprodConfig mbApiKey) + { walletSpec = Just ConnectToLace } + /\ Nothing + ] addLinks walletsWithBlockfrost examples route walletsWithBlockfrost examples From 3c7c67d7bfa89b638e90612a94cfc0df99d48279 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Thu, 12 Oct 2023 21:30:51 +0400 Subject: [PATCH 49/85] Separate building of deps and sources in nix --- nix/default.nix | 65 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 60 insertions(+), 5 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index 973dd7480a..6fafd0d866 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -162,6 +162,50 @@ let ln -s ${data-drv} ./${dataDir} ''; + # Compiles the dependencies of a Purescript project and copies the `output` + # and `.spago` directories into the Nix store. + # Intended to be used in `buildPursProject` to not recompile the entire + # package set every time. + buildPursDependencies = + { + # Can be used to override the name given to the resulting derivation + name ? "${projectName}-ps-deps" + # If warnings generated from project source files will trigger a build error. + # Controls `--strict` purescript-psa flag + , strictComp ? true + # Warnings from `purs` to silence during compilation, independent of `strictComp` + # Controls `--censor-codes` purescript-psa flag + , censorCodes ? [ "UserDefinedWarning" ] + , ... + }: + pkgs.stdenv.mkDerivation { + inherit name; + buildInputs = [ + spagoPkgs.installSpagoStyle + pkgs.easy-ps.psa + ]; + nativeBuildInputs = [ + purs + pkgs.easy-ps.spago + ]; + # Make the derivation independent of the source files. + # `src` is not needed + unpackPhase = "true"; + buildPhase = '' + install-spago-style + psa ${pkgs.lib.optionalString strictComp "--strict" } \ + --censor-lib \ + --is-lib=.spago ".spago/*/*/src/**/*.purs" \ + --censor-codes=${builtins.concatStringsSep "," censorCodes} \ + -gsourcemaps,js + ''; + installPhase = '' + mkdir $out + mv output $out/ + mv .spago $out/ + ''; + }; + # Compiles your Purescript project and copies the `output` directory into the # Nix store. Also copies the local sources to be made available later as `purs` # does not include any external files to its `output` (if we attempted to refer @@ -179,6 +223,9 @@ let # Warnings from `purs` to silence during compilation, independent of `strictComp` # Controls `--censor-codes` purescript-psa flag , censorCodes ? [ "UserDefinedWarning" ] + , pursDependencies ? buildPursDependencies { + inherit name strictComp censorCodes; + } , ... }: pkgs.stdenv.mkDerivation { @@ -197,16 +244,24 @@ let export NODE_PATH="${nodeModules}/lib/node_modules" ln -sfn $NODE_PATH node_modules export PATH="${nodeModules}/bin:$PATH" - cp -r $src . ${linkExtraSources} ${linkData} - install-spago-style + + # copy the dependency build artifacts and sources + # preserve the modification date so that we don't rebuild them + mkdir -p output .spago + cp -rp ${pursDependencies}/.spago/* .spago + cp -rp ${pursDependencies}/output/* output + + # add write permissions for the PS compiler to use + # `output/cache-db.json` + chmod -R +w output/ ''; buildPhase = '' psa ${pkgs.lib.optionalString strictComp "--strict" } \ --censor-lib \ --is-lib=.spago ".spago/*/*/src/**/*.purs" ${pkgs.lib.optionalString hasExtraSources ''--is-lib=./${extraSourcesDir} "${extraSourcesDir}/*/**/*.purs"''} \ - --censor-codes=${builtins.concatStringsSep "," censorCodes} "./**/*.purs" \ + --censor-codes=${builtins.concatStringsSep "," censorCodes} "$src/**/*.purs" \ -gsourcemaps,js ''; # We also need to copy all of `src` here, since compiled modules in `output` @@ -215,7 +270,7 @@ let # module) installPhase = '' mkdir $out - mv output $out/ + cp -r output/* $out/ cp -r $src/* $out/ ${pkgs.lib.optionalString hasExtraSources ''cp -r ./${extraSourcesDir} $out/''} ${pkgs.lib.optionalString hasData ''cp -r ./${dataDir} $out/''} @@ -613,7 +668,7 @@ let in { inherit - buildPursProject runPursTest runPlutipTest runE2ETest + buildPursProject buildPursDependencies runPursTest runPlutipTest runE2ETest bundlePursProjectEsbuild bundlePursProjectWebpack buildPursDocs buildSearchablePursDocs launchSearchablePursDocs purs nodejs mkNodeModules; From 1604657c1303117d7043feaedceaab104c6b5312 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Thu, 12 Oct 2023 22:16:48 +0400 Subject: [PATCH 50/85] Move compilers to nativeBuildInputs --- nix/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index 6fafd0d866..8da24e310a 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -18,7 +18,10 @@ , extraSources ? [ ] , extraSourcesDir ? ".extras" # Data directory to add to the build and provide in the `devShell` as `dataDir` + # E.g. [ { name = "my-data"; path = ./. ; }] + # will be available at `data/my-data` in the `buildPursProject`s output, , data ? [ ] + # A directory to store `data` entries in. , dataDir ? "data" # Configuration that will be used to generate a `devShell` for the project , shell ? { } @@ -181,10 +184,10 @@ let pkgs.stdenv.mkDerivation { inherit name; buildInputs = [ - spagoPkgs.installSpagoStyle - pkgs.easy-ps.psa ]; nativeBuildInputs = [ + spagoPkgs.installSpagoStyle + pkgs.easy-ps.psa purs pkgs.easy-ps.spago ]; @@ -232,10 +235,10 @@ let inherit name src; buildInputs = [ nodeModules - spagoPkgs.installSpagoStyle - pkgs.easy-ps.psa ]; nativeBuildInputs = [ + spagoPkgs.installSpagoStyle + pkgs.easy-ps.psa purs pkgs.easy-ps.spago ]; @@ -270,8 +273,7 @@ let # module) installPhase = '' mkdir $out - cp -r output/* $out/ - cp -r $src/* $out/ + cp -r output $out/ ${pkgs.lib.optionalString hasExtraSources ''cp -r ./${extraSourcesDir} $out/''} ${pkgs.lib.optionalString hasData ''cp -r ./${dataDir} $out/''} ''; From 29695e65039aaad2d8924800c616ea4ba3ccd8b5 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Fri, 13 Oct 2023 18:27:03 +0400 Subject: [PATCH 51/85] Rewrite the bundling system (Nix & Makefile) --- Makefile | 50 +++++++++++++------- esbuild/bundle.js | 4 +- esbuild/config.js | 4 +- esbuild/serve.js | 11 ++--- examples/index.html | 13 ------ examples/index.js | 9 ---- flake.nix | 9 ++-- nix/default.nix | 110 +++++++++++++++++++++++++++++++++----------- webpack.config.cjs | 5 +- 9 files changed, 134 insertions(+), 81 deletions(-) delete mode 100644 examples/index.html delete mode 100644 examples/index.js diff --git a/Makefile b/Makefile index b30082faaf..1b507d4963 100644 --- a/Makefile +++ b/Makefile @@ -1,31 +1,49 @@ SHELL := bash .ONESHELL: -.PHONY: esbuild-bundle esbuild-serve webpack-bundle webpack-serve check-format format query-testnet-tip clean check-explicit-exports +.PHONY: esbuild-bundle esbuild-serve webpack-bundle webpack-serve check-format format query-testnet-tip clean check-explicit-exports spago-build create-bundle-entrypoint create-html-entrypoint .SHELLFLAGS := -eu -o pipefail -c - +serve-port := 4008 ps-sources := $(shell fd --no-ignore-parent -epurs) nix-sources := $(shell fd --no-ignore-parent -enix --exclude='spago*') js-sources := $(shell fd --no-ignore-parent -ejs) -ps-entrypoint := Ctl.Examples.ByUrl # points to one of the example PureScript modules in examples/ +# points to one of the example PureScript modules in examples/ +ps-entrypoint := Ctl.Examples.ByUrl +ps-entrypoint-function := main preview-node-ipc = $(shell docker volume inspect store_node-preview-ipc | jq -r '.[0].Mountpoint') preprod-node-ipc = $(shell docker volume inspect store_node-preprod-ipc | jq -r '.[0].Mountpoint') -esbuild-bundle: - @spago build \ - && BROWSER_RUNTIME=1 node esbuild/bundle.js ${ps-entrypoint} +spago-build: + @spago build + +create-bundle-entrypoint: + @mkdir -p dist/ + @echo 'import("../output/${ps-entrypoint}/index.js").then(m => m.${ps-entrypoint-function}());' > ./dist/entrypoint.js + +create-html-entrypoint: + @mkdir -p dist/ + @cat << EOF > dist/index.html + + + + + EOF + +esbuild-bundle: spago-build create-bundle-entrypoint + @mkdir -p dist/ + @BROWSER_RUNTIME=1 node esbuild/bundle.js ./dist/entrypoint.js dist/index.js + +esbuild-serve: spago-build create-bundle-entrypoint create-html-entrypoint -esbuild-serve: esbuild-bundle - BROWSER_RUNTIME=1 node esbuild/serve.js ${ps-entrypoint} + BROWSER_RUNTIME=1 node esbuild/serve.js ./dist/entrypoint.js dist/index.js dist/ ${serve-port} -webpack-bundle: - @spago build \ - && rm -rf dist/webpack/* \ - && cp -rf fixtures/* dist/webpack \ - && BROWSER_RUNTIME=1 webpack --mode=production --env entry=./output/${ps-entrypoint}/index.js +webpack-bundle: spago-build create-bundle-entrypoint + BROWSER_RUNTIME=1 webpack --mode=production \ + -o dist/ --env entry=./dist/entrypoint.js -webpack-serve: - @spago build \ - && BROWSER_RUNTIME=1 webpack-dev-server --progress --env entry=./output/${ps-entrypoint}/index.js +webpack-serve: spago-build create-bundle-entrypoint create-html-entrypoint + BROWSER_RUNTIME=1 webpack-dev-server --progress \ + --port ${serve-port} \ + -o dist/ --env entry=./dist/entrypoint.js .ONESHELL: check-explicit-exports: diff --git a/esbuild/bundle.js b/esbuild/bundle.js index f8b295be2d..8b114bcfda 100755 --- a/esbuild/bundle.js +++ b/esbuild/bundle.js @@ -2,12 +2,12 @@ import * as esbuild from "esbuild"; import { buildOptions } from "./config.js"; if (process.argv.length < 4) { - throw `usage: nodejs bundle.js ENTRY_POINT OUTPUT_DIR`; + throw `usage: nodejs bundle.js ENTRY_POINT OUTPUT_FILENAME`; } esbuild.build( buildOptions({ entryPoint: process.argv[2], - outputDir: process.argv[3], + outfile: process.argv[3], }) ); diff --git a/esbuild/config.js b/esbuild/config.js index e691989524..c3294b5f8e 100644 --- a/esbuild/config.js +++ b/esbuild/config.js @@ -1,9 +1,9 @@ import { wasmLoader } from "esbuild-plugin-wasm"; import { polyfillNode } from "esbuild-plugin-polyfill-node"; -export const buildOptions = ({ entryPoint, outputDir }) => ({ +export const buildOptions = ({ entryPoint, outfile }) => ({ entryPoints: [entryPoint], - outdir: outputDir, + outfile: outfile, define: { BROWSER_RUNTIME: process.env.BROWSER_RUNTIME, }, diff --git a/esbuild/serve.js b/esbuild/serve.js index a1ee33f791..c079f1cc8e 100755 --- a/esbuild/serve.js +++ b/esbuild/serve.js @@ -1,20 +1,19 @@ import * as esbuild from "esbuild"; import { buildOptions } from "./config.js"; -if (process.argv.length < 7) { - throw `usage: nodejs serve.js PURESCRIPT_MODULE OUTPUT_DIR SERVE_DIR HOST PORT`; +if (process.argv.length < 6) { + throw `usage: nodejs serve.js ENTRY_POINT OUTPUT_FILE SERVE_DIR PORT`; } const ctx = await esbuild.context( buildOptions({ - pursEntryPoint: process.argv[2], - outputDir: process.argv[3], + entryPoint: process.argv[2], + outfile: process.argv[3], }) ); const config = { - host: process.argv[5], - port: process.argv[6], + port: parseInt(process.argv[5]), servedir: process.argv[4], }; diff --git a/examples/index.html b/examples/index.html deleted file mode 100644 index 3247c9a066..0000000000 --- a/examples/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - Examples source code is located in examples/ directory.
- - diff --git a/examples/index.js b/examples/index.js deleted file mode 100644 index 7179331842..0000000000 --- a/examples/index.js +++ /dev/null @@ -1,9 +0,0 @@ -"use strict"; - -// This needs to be asynchronous to load the WASM from cardano-serialization-lib -// -// You also need to call `spago bundle-module` to generate the module that is -// imported here. From the repository root, run: -// spago bundle-module -m
--to output.js -// Normally it should be done via Nix (see flake.nix) or via a Makefile -import("../output.js").then(m => m.main()); diff --git a/flake.nix b/flake.nix index 20086d9a3a..dfe7ccffd4 100644 --- a/flake.nix +++ b/flake.nix @@ -157,7 +157,9 @@ in rec { packages = { - ctl-example-bundle-web = project.bundlePursProjectEsbuild { + ctl-purs-project = project.buildPursProject { }; + + ctl-example-bundle-web-esbuild = project.bundlePursProjectEsbuild { main = "Ctl.Examples.ByUrl"; }; @@ -178,14 +180,13 @@ checks = { ctl-e2e-test = project.runE2ETest { name = "ctl-e2e-test"; - testMain = "Test.Ctl.E2E"; - env = { OGMIOS_FIXTURES = "${ogmiosFixtures}"; }; + runnerMain = "Test.Ctl.E2E"; + testMain = "Ctl.Examples.ByUrl"; buildInputs = [ inputs.kupo-nixos.packages.${pkgs.system}.kupo ]; }; ctl-plutip-test = project.runPlutipTest { name = "ctl-plutip-test"; testMain = "Test.Ctl.Plutip"; - env = { OGMIOS_FIXTURES = "${ogmiosFixtures}"; }; }; ctl-staking-test = project.runPlutipTest { name = "ctl-staking-test"; diff --git a/nix/default.nix b/nix/default.nix index 8da24e310a..ba209eb760 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -279,13 +279,13 @@ let ''; }; - project = buildPursProject { }; - # Runs a test written in Purescript using NodeJS. runPursTest = { - # The name of the main Purescript module - testMain ? "Test.Main" + # The main Purescript module + testMain + # The entry point function in the main PureScript module + , psEntryPoint ? "main" # Can be used to override the name of the resulting derivation , name ? "${projectName}-check" # Generated `node_modules` in the Nix store. Can be passed to have better @@ -296,21 +296,30 @@ let # Passed through to the `buildInputs` of the derivation. Use this to add # additional packages to the test environment , buildInputs ? [ ] + , builtProject ? buildPursProject { main = testMain; } , ... }: pkgs.runCommand "${name}" ( { - buildInputs = [ project nodeModules ] ++ buildInputs; + inherit src; + nativeBuildInputs = [ builtProject nodeModules ] ++ buildInputs; NODE_PATH = "${nodeModules}/lib/node_modules"; } // env ) - # spago will attempt to download things, which will fail in the - # sandbox, so we can just use node instead - # (idea taken from `plutus-playground-client`) '' - cp -r ${project}/* . + # Copy the purescript project files + cp -r ${builtProject}/* . + + # The tests may depend on sources + cp -r $src/* . + + # Provide NPM dependencies to the test suite scripts ln -sfn $NODE_PATH node_modules - ${nodejs}/bin/node --enable-source-maps -e 'import("./output/${testMain}/index.js").then(m => m.main())' + + # Call the main module and execute the entry point function + ${nodejs}/bin/node --enable-source-maps -e 'import("./output/${testMain}/index.js").then(m => m.${psEntryPoint}())' + + # Create output file to tell Nix we succeeded touch $out ''; @@ -338,8 +347,18 @@ let runE2ETest = { - # The name of the main Purescript module - testMain ? "Test.Ctl.E2E" + # The name of the main Purescript module for the runner + runnerMain + # Entry point function of the `runnerMain` module + , runnerPsEntryPoint ? "main" + # The name of the test module that will be bundled and served via a + # webserver + , testMain + # Environment file with E2E test definitions, relative to `src` + , envFile ? "test/e2e-ci.env" + # A file with empty settings for chromium, relative to `src` + , emptySettingsFile ? "test-data/empty-settings.tar.gz" + , testTimeout ? 200 # Can be used to override the name of the resulting derivation , name ? "${projectName}-e2e" # Generated `node_modules` in the Nix store. Can be passed to have better @@ -353,6 +372,9 @@ let , bundledPursProject ? (bundlePursProjectWebpack { main = testMain; }) + , builtRunnerProject ? (buildPursProject { + main = runnerMain; + }) , ... }@args: let @@ -403,8 +425,10 @@ let in pkgs.runCommand "${name}" ({ - buildInputs = with pkgs; [ - project + inherit src; + nativeBuildInputs = with pkgs; [ + builtRunnerProject + bundledPursProject nodeModules ogmios kupo @@ -421,27 +445,48 @@ let '' chmod -R +rw . - source ${project}/test/e2e-ci.env + # Load the test definitions from file + source $src/${envFile} - export E2E_SETTINGS_ARCHIVE="${project}/test-data/empty-settings.tar.gz" + export E2E_SETTINGS_ARCHIVE="$src/${emptySettingsFile}" export E2E_CHROME_USER_DATA="./test-data/chrome-user-data" - export E2E_TEST_TIMEOUT=200 + export E2E_TEST_TIMEOUT=${toString testTimeout} export E2E_BROWSER=${chromium}/bin/chromium # use custom bwrap-ed chromium export E2E_NO_HEADLESS=false export PLUTIP_PORT=8087 export OGMIOS_PORT=1345 export E2E_EXTRA_BROWSER_ARGS="--disable-web-security" - python -m http.server 4008 --directory ${bundledPursProject} & + # Move bundle files to the served dir + mkdir -p serve + cp -r ${bundledPursProject}/* serve/ + + # Create an HTML that just serves entry point to the bundle + cat << EOF > serve/index.html + + + + + EOF + + # Launch a webserver and wait for the content to become available + python -m http.server 4008 --directory serve 2>/dev/null & until curl -S http://127.0.0.1:4008/index.html &>/dev/null; do echo "Trying to connect to webserver..."; sleep 0.1; done; - mkdir project - cp -r ${project}/* project ln -sfn $NODE_PATH node_modules - ${nodejs}/bin/node --enable-source-maps -e 'import("./project/output/${testMain}/index.js").then(m => m.main())' e2e-test run + + cp -r ${builtRunnerProject}/output . + cp -r $src/* . + chmod -R +rw . + + ${nodejs}/bin/node \ + --enable-source-maps \ + -e 'import("./output/${runnerMain}/index.js").then(m => m.${runnerPsEntryPoint}())' \ + e2e-test run + mkdir $out '' ; @@ -453,24 +498,28 @@ let name ? "${projectName}-bundle-" + (if browserRuntime then "web" else "nodejs") # The main Purescript module - , main ? "Main" + , main + # The entry point function in the main PureScript module + , psEntryPoint ? "main" # Whether this bundle is being produced for a browser environment or not , browserRuntime ? true , esbuildBundleScript ? "esbuild/bundle.js" # Generated `node_modules` in the Nix store. Can be passed to have better # control over individual project components , nodeModules ? projectNodeModules + , builtProject ? buildPursProject { inherit main; } , ... }: pkgs.runCommand "${name}" { + inherit src; buildInputs = [ nodejs nodeModules - project ]; nativeBuildInputs = [ purs pkgs.easy-ps.spago + builtProject ]; } '' @@ -480,8 +529,10 @@ let export PATH="${nodeModules}/bin:$PATH" ${pkgs.lib.optionalString browserRuntime "export BROWSER_RUNTIME=1"} chmod -R +rw . - cp -r ${project}/* . - node ${esbuildBundleScript} ./output/${main}/index.js dist/ + cp -r ${builtProject}/* . + cp -r $src/* . + echo 'import("./output/${main}/index.js").then(m => m.${psEntryPoint}());' > entrypoint.js + node ${esbuildBundleScript} ./entrypoint.js dist/index.js mkdir $out mv dist/* $out ''; @@ -507,15 +558,17 @@ let , nodeModules ? projectNodeModules # If the spago bundle-module output should be included in the derivation , includeBundledModule ? false + , builtProject ? buildPursProject { inherit main; } , ... }: pkgs.runCommand "${name}" { + inherit src; buildInputs = [ ]; nativeBuildInputs = [ nodejs nodeModules - project + builtProject purs pkgs.easy-ps.spago ]; @@ -525,7 +578,8 @@ let export NODE_PATH="${nodeModules}/lib/node_modules" export PATH="${nodeModules}/bin:$PATH" ${pkgs.lib.optionalString browserRuntime "export BROWSER_RUNTIME=1"} - cp -r ${project}/* . + cp -r ${builtProject}/* . + cp -r $src/* . chmod -R +rw . mkdir -p ./dist echo 'import("./output/${main}/index.js").then(m => m.${psEntryPoint}());' > entrypoint.js @@ -675,6 +729,6 @@ in buildPursDocs buildSearchablePursDocs launchSearchablePursDocs purs nodejs mkNodeModules; devShell = shellFor shell; - compiled = project; + compiled = buildPursProject { }; nodeModules = projectNodeModules; } diff --git a/webpack.config.cjs b/webpack.config.cjs index 6b15248275..01ac0e104a 100644 --- a/webpack.config.cjs +++ b/webpack.config.cjs @@ -23,6 +23,9 @@ module.exports = env => { stats: { errorDetails: true }, devServer: { + static: { + directory: path.join(__dirname, 'dist'), + }, client: { overlay: false }, @@ -41,7 +44,7 @@ module.exports = env => { entry: env.entry, output: { - path: path.resolve(__dirname, "dist/webpack"), + path: path.resolve(__dirname, "dist"), filename: "index.js", library: { type: "module", From eb8e7e8e833216dc6ef13b6a0788d43c3d280e9f Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Fri, 13 Oct 2023 18:27:55 +0400 Subject: [PATCH 52/85] Fix internal module name (Ctl.Internal.Test.E2E.Route) --- src/Contract/Test/E2E.purs | 2 +- src/Internal/Test/E2E/Route.purs | 2 +- test/E2E/Route.purs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Contract/Test/E2E.purs b/src/Contract/Test/E2E.purs index e9acb4c897..7f8582ba8e 100644 --- a/src/Contract/Test/E2E.purs +++ b/src/Contract/Test/E2E.purs @@ -2,7 +2,7 @@ module Contract.Test.E2E ( module X ) where -import Ctl.Internal.E2E.Route (E2EConfigName, E2ETestName, addLinks, route) as X import Ctl.Internal.Test.E2E.Feedback.Hooks (e2eFeedbackHooks) as X import Ctl.Internal.Test.E2E.Options (parseCliArgs) as X +import Ctl.Internal.Test.E2E.Route (E2EConfigName, E2ETestName, addLinks, route) as X import Ctl.Internal.Test.E2E.Runner (runE2ECommand, runE2ETests) as X diff --git a/src/Internal/Test/E2E/Route.purs b/src/Internal/Test/E2E/Route.purs index f3bf46b10a..6bb113bf6d 100644 --- a/src/Internal/Test/E2E/Route.purs +++ b/src/Internal/Test/E2E/Route.purs @@ -1,4 +1,4 @@ -module Ctl.Internal.E2E.Route +module Ctl.Internal.Test.E2E.Route ( E2ETestName , E2EConfigName , route diff --git a/test/E2E/Route.purs b/test/E2E/Route.purs index 856295b08f..8d20e41669 100644 --- a/test/E2E/Route.purs +++ b/test/E2E/Route.purs @@ -2,7 +2,7 @@ module Test.Ctl.E2E.Route where import Prelude -import Ctl.Internal.E2E.Route (parseRoute) +import Ctl.Internal.Test.E2E.Route (parseRoute) import Ctl.Internal.Test.TestPlanM (TestPlanM) import Data.Either (isRight) import Effect.Aff (Aff) From 0825b1be0c833d4504ceaa271c17ccd8f04b5e18 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Fri, 13 Oct 2023 19:51:09 +0400 Subject: [PATCH 53/85] Remove html-webpack-plugin dependency --- package-lock.json | 533 --------------------------------------------- package.json | 1 - webpack.config.cjs | 1 - 3 files changed, 535 deletions(-) diff --git a/package-lock.json b/package-lock.json index efff18a3ec..209e8241c4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,7 +37,6 @@ "esbuild": "0.18.11", "esbuild-plugin-polyfill-node": "^0.3.0", "esbuild-plugin-wasm": "^1.1.0", - "html-webpack-plugin": "5.5.3", "node-polyfill-webpack-plugin": "2.0.1", "webpack": "5.88.1", "webpack-cli": "5.1.4", @@ -659,12 +658,6 @@ "@types/send": "*" } }, - "node_modules/@types/html-minifier-terser": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", - "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==", - "dev": true - }, "node_modules/@types/http-errors": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz", @@ -1132,15 +1125,6 @@ "ansi-html": "bin/ansi-html" } }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/anymatch": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", @@ -1417,12 +1401,6 @@ "multicast-dns": "^7.2.5" } }, - "node_modules/boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", - "dev": true - }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -1653,16 +1631,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/camel-case": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", - "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", - "dev": true, - "dependencies": { - "pascal-case": "^3.1.2", - "tslib": "^2.0.3" - } - }, "node_modules/caniuse-lite": { "version": "1.0.30001519", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz", @@ -1774,18 +1742,6 @@ "safe-buffer": "^5.0.1" } }, - "node_modules/clean-css": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz", - "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==", - "dev": true, - "dependencies": { - "source-map": "~0.6.0" - }, - "engines": { - "node": ">= 10.0" - } - }, "node_modules/clone-deep": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", @@ -1806,15 +1762,6 @@ "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", "dev": true }, - "node_modules/commander": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", - "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", - "dev": true, - "engines": { - "node": ">= 12" - } - }, "node_modules/compressible": { "version": "2.0.18", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", @@ -2021,34 +1968,6 @@ "node": "*" } }, - "node_modules/css-select": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", - "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", - "dev": true, - "dependencies": { - "boolbase": "^1.0.0", - "css-what": "^6.0.1", - "domhandler": "^4.3.1", - "domutils": "^2.8.0", - "nth-check": "^2.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/fb55" - } - }, - "node_modules/css-what": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", - "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", - "dev": true, - "engines": { - "node": ">= 6" - }, - "funding": { - "url": "https://github.com/sponsors/fb55" - } - }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -2194,15 +2113,6 @@ "doctoc": "doctoc.js" } }, - "node_modules/dom-converter": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz", - "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==", - "dev": true, - "dependencies": { - "utila": "~0.4" - } - }, "node_modules/dom-serializer": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", @@ -2279,16 +2189,6 @@ "url": "https://github.com/fb55/domutils?sponsor=1" } }, - "node_modules/dot-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", - "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", - "dev": true, - "dependencies": { - "no-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -3120,15 +3020,6 @@ "minimalistic-assert": "^1.0.1" } }, - "node_modules/he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true, - "bin": { - "he": "bin/he" - } - }, "node_modules/hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", @@ -3198,50 +3089,6 @@ } ] }, - "node_modules/html-minifier-terser": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", - "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==", - "dev": true, - "dependencies": { - "camel-case": "^4.1.2", - "clean-css": "^5.2.2", - "commander": "^8.3.0", - "he": "^1.2.0", - "param-case": "^3.0.4", - "relateurl": "^0.2.7", - "terser": "^5.10.0" - }, - "bin": { - "html-minifier-terser": "cli.js" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/html-webpack-plugin": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz", - "integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==", - "dev": true, - "dependencies": { - "@types/html-minifier-terser": "^6.0.0", - "html-minifier-terser": "^6.0.2", - "lodash": "^4.17.21", - "pretty-error": "^4.0.0", - "tapable": "^2.0.0" - }, - "engines": { - "node": ">=10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/html-webpack-plugin" - }, - "peerDependencies": { - "webpack": "^5.20.0" - } - }, "node_modules/htmlparser2": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz", @@ -3807,12 +3654,6 @@ "node": ">=8" } }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, "node_modules/longest-streak": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz", @@ -3823,15 +3664,6 @@ "url": "https://github.com/sponsors/wooorm" } }, - "node_modules/lower-case": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", - "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", - "dev": true, - "dependencies": { - "tslib": "^2.0.3" - } - }, "node_modules/markdown-table": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz", @@ -4327,16 +4159,6 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, - "node_modules/no-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", - "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", - "dev": true, - "dependencies": { - "lower-case": "^2.0.2", - "tslib": "^2.0.3" - } - }, "node_modules/node-fetch": { "version": "2.6.7", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", @@ -4441,18 +4263,6 @@ "node": ">=8" } }, - "node_modules/nth-check": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", - "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", - "dev": true, - "dependencies": { - "boolbase": "^1.0.0" - }, - "funding": { - "url": "https://github.com/fb55/nth-check?sponsor=1" - } - }, "node_modules/object-inspect": { "version": "1.12.3", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", @@ -4612,16 +4422,6 @@ "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", "dev": true }, - "node_modules/param-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", - "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==", - "dev": true, - "dependencies": { - "dot-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, "node_modules/parse-asn1": { "version": "5.1.6", "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", @@ -4662,16 +4462,6 @@ "node": ">= 0.8" } }, - "node_modules/pascal-case": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", - "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", - "dev": true, - "dependencies": { - "no-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, "node_modules/path-browserify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", @@ -4765,16 +4555,6 @@ "node": ">=8" } }, - "node_modules/pretty-error": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz", - "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==", - "dev": true, - "dependencies": { - "lodash": "^4.17.20", - "renderkid": "^3.0.0" - } - }, "node_modules/process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", @@ -5026,15 +4806,6 @@ "resolved": "https://registry.npmjs.org/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz", "integrity": "sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng==" }, - "node_modules/relateurl": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", - "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, "node_modules/remark-footnotes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/remark-footnotes/-/remark-footnotes-3.0.0.tgz", @@ -5090,47 +4861,6 @@ "url": "https://opencollective.com/unified" } }, - "node_modules/renderkid": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz", - "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==", - "dev": true, - "dependencies": { - "css-select": "^4.1.3", - "dom-converter": "^0.2.0", - "htmlparser2": "^6.1.0", - "lodash": "^4.17.21", - "strip-ansi": "^6.0.1" - } - }, - "node_modules/renderkid/node_modules/entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, - "node_modules/renderkid/node_modules/htmlparser2": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", - "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", - "dev": true, - "funding": [ - "https://github.com/fb55/htmlparser2?sponsor=1", - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ], - "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", - "domutils": "^2.5.2", - "entities": "^2.0.0" - } - }, "node_modules/repeat-string": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", @@ -5662,18 +5392,6 @@ "safe-buffer": "~5.2.0" } }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", @@ -5884,12 +5602,6 @@ "url": "https://github.com/sponsors/wooorm" } }, - "node_modules/tslib": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", - "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", - "dev": true - }, "node_modules/tty-browserify": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz", @@ -6107,12 +5819,6 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, - "node_modules/utila": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz", - "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==", - "dev": true - }, "node_modules/utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", @@ -7063,12 +6769,6 @@ "@types/send": "*" } }, - "@types/html-minifier-terser": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", - "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==", - "dev": true - }, "@types/http-errors": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz", @@ -7474,12 +7174,6 @@ "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==", "dev": true }, - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, "anymatch": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", @@ -7696,12 +7390,6 @@ "multicast-dns": "^7.2.5" } }, - "boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", - "dev": true - }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -7881,16 +7569,6 @@ "get-intrinsic": "^1.0.2" } }, - "camel-case": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", - "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", - "dev": true, - "requires": { - "pascal-case": "^3.1.2", - "tslib": "^2.0.3" - } - }, "caniuse-lite": { "version": "1.0.30001519", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz", @@ -7958,15 +7636,6 @@ "safe-buffer": "^5.0.1" } }, - "clean-css": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz", - "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==", - "dev": true, - "requires": { - "source-map": "~0.6.0" - } - }, "clone-deep": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", @@ -7984,12 +7653,6 @@ "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", "dev": true }, - "commander": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", - "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", - "dev": true - }, "compressible": { "version": "2.0.18", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", @@ -8176,25 +7839,6 @@ "randomfill": "^1.0.3" } }, - "css-select": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", - "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", - "dev": true, - "requires": { - "boolbase": "^1.0.0", - "css-what": "^6.0.1", - "domhandler": "^4.3.1", - "domutils": "^2.8.0", - "nth-check": "^2.0.1" - } - }, - "css-what": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", - "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", - "dev": true - }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -8309,15 +7953,6 @@ "update-section": "^0.3.3" } }, - "dom-converter": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz", - "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==", - "dev": true, - "requires": { - "utila": "~0.4" - } - }, "dom-serializer": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", @@ -8369,16 +8004,6 @@ "domhandler": "^4.2.0" } }, - "dot-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", - "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", - "dev": true, - "requires": { - "no-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -9022,12 +8647,6 @@ "minimalistic-assert": "^1.0.1" } }, - "he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true - }, "hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", @@ -9089,34 +8708,6 @@ "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==", "dev": true }, - "html-minifier-terser": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", - "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==", - "dev": true, - "requires": { - "camel-case": "^4.1.2", - "clean-css": "^5.2.2", - "commander": "^8.3.0", - "he": "^1.2.0", - "param-case": "^3.0.4", - "relateurl": "^0.2.7", - "terser": "^5.10.0" - } - }, - "html-webpack-plugin": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz", - "integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==", - "dev": true, - "requires": { - "@types/html-minifier-terser": "^6.0.0", - "html-minifier-terser": "^6.0.2", - "lodash": "^4.17.21", - "pretty-error": "^4.0.0", - "tapable": "^2.0.0" - } - }, "htmlparser2": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz", @@ -9492,27 +9083,12 @@ "p-locate": "^4.1.0" } }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, "longest-streak": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz", "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==", "dev": true }, - "lower-case": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", - "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", - "dev": true, - "requires": { - "tslib": "^2.0.3" - } - }, "markdown-table": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz", @@ -9878,16 +9454,6 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, - "no-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", - "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", - "dev": true, - "requires": { - "lower-case": "^2.0.2", - "tslib": "^2.0.3" - } - }, "node-fetch": { "version": "2.6.7", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", @@ -9961,15 +9527,6 @@ "path-key": "^3.0.0" } }, - "nth-check": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", - "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", - "dev": true, - "requires": { - "boolbase": "^1.0.0" - } - }, "object-inspect": { "version": "1.12.3", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", @@ -10084,16 +9641,6 @@ "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", "dev": true }, - "param-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", - "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==", - "dev": true, - "requires": { - "dot-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, "parse-asn1": { "version": "5.1.6", "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", @@ -10127,16 +9674,6 @@ "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", "dev": true }, - "pascal-case": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", - "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", - "dev": true, - "requires": { - "no-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, "path-browserify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", @@ -10209,16 +9746,6 @@ "find-up": "^4.0.0" } }, - "pretty-error": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz", - "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==", - "dev": true, - "requires": { - "lodash": "^4.17.20", - "renderkid": "^3.0.0" - } - }, "process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", @@ -10419,12 +9946,6 @@ "resolved": "https://registry.npmjs.org/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz", "integrity": "sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng==" }, - "relateurl": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", - "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==", - "dev": true - }, "remark-footnotes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/remark-footnotes/-/remark-footnotes-3.0.0.tgz", @@ -10464,39 +9985,6 @@ "mdast-util-from-markdown": "^0.8.0" } }, - "renderkid": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz", - "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==", - "dev": true, - "requires": { - "css-select": "^4.1.3", - "dom-converter": "^0.2.0", - "htmlparser2": "^6.1.0", - "lodash": "^4.17.21", - "strip-ansi": "^6.0.1" - }, - "dependencies": { - "entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true - }, - "htmlparser2": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", - "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", - "dev": true, - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", - "domutils": "^2.5.2", - "entities": "^2.0.0" - } - } - } - }, "repeat-string": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", @@ -10935,15 +10423,6 @@ "safe-buffer": "~5.2.0" } }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - }, "strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", @@ -11091,12 +10570,6 @@ "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==", "dev": true }, - "tslib": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", - "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", - "dev": true - }, "tty-browserify": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz", @@ -11256,12 +10729,6 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, - "utila": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz", - "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==", - "dev": true - }, "utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", diff --git a/package.json b/package.json index 0d036440b6..ddc811b7e3 100755 --- a/package.json +++ b/package.json @@ -62,7 +62,6 @@ "esbuild": "0.18.11", "esbuild-plugin-polyfill-node": "^0.3.0", "esbuild-plugin-wasm": "^1.1.0", - "html-webpack-plugin": "5.5.3", "node-polyfill-webpack-plugin": "2.0.1", "webpack": "5.88.1", "webpack-cli": "5.1.4", diff --git a/webpack.config.cjs b/webpack.config.cjs index 01ac0e104a..52eedb1a78 100644 --- a/webpack.config.cjs +++ b/webpack.config.cjs @@ -2,7 +2,6 @@ const path = require("path"); const webpack = require("webpack"); -const HtmlWebpackPlugin = require("html-webpack-plugin"); const NodePolyfillPlugin = require("node-polyfill-webpack-plugin"); module.exports = env => { From bf1de1950aac903757350e46577ea91191806eb5 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Fri, 13 Oct 2023 20:02:53 +0400 Subject: [PATCH 54/85] Simplify esbuild script in nix --- nix/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index ba209eb760..7caafe49e3 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -528,13 +528,12 @@ let ln -sfn $NODE_PATH node_modules export PATH="${nodeModules}/bin:$PATH" ${pkgs.lib.optionalString browserRuntime "export BROWSER_RUNTIME=1"} - chmod -R +rw . cp -r ${builtProject}/* . cp -r $src/* . + chmod -R +rw . echo 'import("./output/${main}/index.js").then(m => m.${psEntryPoint}());' > entrypoint.js - node ${esbuildBundleScript} ./entrypoint.js dist/index.js mkdir $out - mv dist/* $out + node ${esbuildBundleScript} ./entrypoint.js $out/index.js ''; # Bundles a Purescript project using Webpack, typically for the browser From 8014c940cf69516c0a00048eec79b2ba95fd94f3 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Fri, 13 Oct 2023 20:07:57 +0400 Subject: [PATCH 55/85] Simplify webpack build script in nix --- nix/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index 7caafe49e3..ae72f1d614 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -583,10 +583,9 @@ let mkdir -p ./dist echo 'import("./output/${main}/index.js").then(m => m.${psEntryPoint}());' > entrypoint.js ${pkgs.lib.optionalString includeBundledModule "cp ${bundledModuleName} ./dist"} - webpack --mode=production -c ${webpackConfig} -o ./dist \ - --entry ./entrypoint.js mkdir $out - mv ./dist/* $out + webpack --mode=production -c ${webpackConfig} -o $out/ \ + --entry ./entrypoint.js ''; pursDocsSearchNpm = From d568417a482e34b1eb9c39313ef2e729a3ad3c68 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Fri, 13 Oct 2023 20:32:21 +0400 Subject: [PATCH 56/85] Synchronize webpack & esbuild setup in the template --- templates/ctl-scaffold/esbuild/bundle.js | 11 +- templates/ctl-scaffold/esbuild/config.js | 10 +- templates/ctl-scaffold/esbuild/serve.js | 25 +++- templates/ctl-scaffold/flake.lock | 8 +- templates/ctl-scaffold/flake.nix | 14 +- templates/ctl-scaffold/index.html | 71 --------- templates/ctl-scaffold/index.js | 8 - templates/ctl-scaffold/package.json | 1 - templates/ctl-scaffold/packages.dhall | 2 +- templates/ctl-scaffold/spago-packages.nix | 6 +- templates/ctl-scaffold/webpack.config.cjs | 172 ++++++++++------------ webpack.config.cjs | 13 -- 12 files changed, 132 insertions(+), 209 deletions(-) delete mode 100644 templates/ctl-scaffold/index.html delete mode 100644 templates/ctl-scaffold/index.js diff --git a/templates/ctl-scaffold/esbuild/bundle.js b/templates/ctl-scaffold/esbuild/bundle.js index c3a5dd652a..8b114bcfda 100644 --- a/templates/ctl-scaffold/esbuild/bundle.js +++ b/templates/ctl-scaffold/esbuild/bundle.js @@ -1,4 +1,13 @@ import * as esbuild from "esbuild"; import { buildOptions } from "./config.js"; -esbuild.build(buildOptions); +if (process.argv.length < 4) { + throw `usage: nodejs bundle.js ENTRY_POINT OUTPUT_FILENAME`; +} + +esbuild.build( + buildOptions({ + entryPoint: process.argv[2], + outfile: process.argv[3], + }) +); diff --git a/templates/ctl-scaffold/esbuild/config.js b/templates/ctl-scaffold/esbuild/config.js index ca6f2e5420..c3294b5f8e 100755 --- a/templates/ctl-scaffold/esbuild/config.js +++ b/templates/ctl-scaffold/esbuild/config.js @@ -1,9 +1,9 @@ import { wasmLoader } from "esbuild-plugin-wasm"; import { polyfillNode } from "esbuild-plugin-polyfill-node"; -export const buildOptions = { - entryPoints: [`output/${process.argv[2]}/index.js`], - outdir: "dist/esbuild", +export const buildOptions = ({ entryPoint, outfile }) => ({ + entryPoints: [entryPoint], + outfile: outfile, define: { BROWSER_RUNTIME: process.env.BROWSER_RUNTIME, }, @@ -23,5 +23,5 @@ export const buildOptions = { platform: "browser", format: "esm", treeShaking: true, - logLevel: "warning", -}; + logLevel: "error", +}); diff --git a/templates/ctl-scaffold/esbuild/serve.js b/templates/ctl-scaffold/esbuild/serve.js index 8b4220c435..c079f1cc8e 100644 --- a/templates/ctl-scaffold/esbuild/serve.js +++ b/templates/ctl-scaffold/esbuild/serve.js @@ -1,9 +1,22 @@ import * as esbuild from "esbuild"; import { buildOptions } from "./config.js"; -const ctx = await esbuild.context(buildOptions); -await ctx.serve({ - host: "127.0.0.1", - port: 4008, - servedir: "dist/esbuild", -}); +if (process.argv.length < 6) { + throw `usage: nodejs serve.js ENTRY_POINT OUTPUT_FILE SERVE_DIR PORT`; +} + +const ctx = await esbuild.context( + buildOptions({ + entryPoint: process.argv[2], + outfile: process.argv[3], + }) +); + +const config = { + port: parseInt(process.argv[5]), + servedir: process.argv[4], +}; + +console.log("serving:", config); + +await ctx.serve(config); diff --git a/templates/ctl-scaffold/flake.lock b/templates/ctl-scaffold/flake.lock index 4d3c688e68..17da8409cd 100644 --- a/templates/ctl-scaffold/flake.lock +++ b/templates/ctl-scaffold/flake.lock @@ -2757,17 +2757,17 @@ ] }, "locked": { - "lastModified": 1691599815, - "narHash": "sha256-i7t+KgDAMCaYqqF+BdBAsV1B4/9gFr11Yd9RpxF10JQ=", + "lastModified": 1697213277, + "narHash": "sha256-vEfiNwLI4ngh1RYfEfHfU4H6PO6DkCBzQMFG8Ynv49Q=", "owner": "Plutonomicon", "repo": "cardano-transaction-lib", - "rev": "325665b19859bbf3e48e296e9aa717673f5f3d79", + "rev": "8014c940cf69516c0a00048eec79b2ba95fd94f3", "type": "github" }, "original": { "owner": "Plutonomicon", "repo": "cardano-transaction-lib", - "rev": "325665b19859bbf3e48e296e9aa717673f5f3d79", + "rev": "8014c940cf69516c0a00048eec79b2ba95fd94f3", "type": "github" } }, diff --git a/templates/ctl-scaffold/flake.nix b/templates/ctl-scaffold/flake.nix index cf1d5cfb0a..482b486482 100644 --- a/templates/ctl-scaffold/flake.nix +++ b/templates/ctl-scaffold/flake.nix @@ -10,7 +10,7 @@ type = "github"; owner = "Plutonomicon"; repo = "cardano-transaction-lib"; - rev = "325665b19859bbf3e48e296e9aa717673f5f3d79"; + rev = "8014c940cf69516c0a00048eec79b2ba95fd94f3"; }; # To use the same version of `nixpkgs` as we do nixpkgs.follows = "ctl/nixpkgs"; @@ -118,13 +118,19 @@ in { default = self.packages.${system}.ctl-scaffold-bundle-web; - ctl-scaffold-bundle-web = (psProjectFor pkgs).bundlePursProject { + + ctl-scaffold-bundle-web-esbuild = (psProjectFor pkgs).bundlePursProjectEsbuild { + main = "Scaffold.Main"; + }; + + ctl-scaffold-bundle-web-webpack = (psProjectFor pkgs).bundlePursProjectWebpack { main = "Scaffold.Main"; - entrypoint = "index.js"; }; + ctl-scaffold-runtime = pkgs.buildCtlRuntime runtimeConfig; }); + # `launchCtlRuntime` will generate a Nix expression from the provided # config, build it into a JSON file, and then run it with Arion # @@ -186,4 +192,6 @@ default = (psProjectFor pkgs).devShell; }); }; + + nixConfig.bash-prompt = "[\\[\\e[0;1m\\]\\[\\033[33m\\]$(git rev-parse --abbrev-ref HEAD) \\[\\e[0;32m\\]\\w\\[\\e[0m\\]]\\[\\e[0m\\]$ \\[\\e[0m\\]"; } diff --git a/templates/ctl-scaffold/index.html b/templates/ctl-scaffold/index.html deleted file mode 100644 index b8c10982c0..0000000000 --- a/templates/ctl-scaffold/index.html +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - diff --git a/templates/ctl-scaffold/index.js b/templates/ctl-scaffold/index.js deleted file mode 100644 index c2eeb86606..0000000000 --- a/templates/ctl-scaffold/index.js +++ /dev/null @@ -1,8 +0,0 @@ -"use strict"; - -// This needs to be asynchronous to load the WASM from CSL -// -// You also need to call `spago bundle-module` to generate the module that is -// imported here. From the repository root, run: -// spago bundle-module -m
--to output.js -import("./output.js").then(m => m.main()); diff --git a/templates/ctl-scaffold/package.json b/templates/ctl-scaffold/package.json index e6ad497878..34d1ad9c67 100644 --- a/templates/ctl-scaffold/package.json +++ b/templates/ctl-scaffold/package.json @@ -52,7 +52,6 @@ "esbuild": "0.18.11", "esbuild-plugin-polyfill-node": "^0.3.0", "esbuild-plugin-wasm": "^1.1.0", - "html-webpack-plugin": "5.5.3", "node-polyfill-webpack-plugin": "2.0.1", "webpack": "5.88.1", "webpack-cli": "5.1.4", diff --git a/templates/ctl-scaffold/packages.dhall b/templates/ctl-scaffold/packages.dhall index 765b35fc48..f18969cfc4 100644 --- a/templates/ctl-scaffold/packages.dhall +++ b/templates/ctl-scaffold/packages.dhall @@ -342,7 +342,7 @@ let additions = , "web-storage" ] , repo = "https://github.com/Plutonomicon/cardano-transaction-lib.git" - , version = "325665b19859bbf3e48e296e9aa717673f5f3d79" + , version = "8014c940cf69516c0a00048eec79b2ba95fd94f3" } } diff --git a/templates/ctl-scaffold/spago-packages.nix b/templates/ctl-scaffold/spago-packages.nix index ddecaa01d4..4f3b7e2ef9 100644 --- a/templates/ctl-scaffold/spago-packages.nix +++ b/templates/ctl-scaffold/spago-packages.nix @@ -211,11 +211,11 @@ let "cardano-transaction-lib" = pkgs.stdenv.mkDerivation { name = "cardano-transaction-lib"; - version = "325665b19859bbf3e48e296e9aa717673f5f3d79"; + version = "8014c940cf69516c0a00048eec79b2ba95fd94f3"; src = pkgs.fetchgit { url = "https://github.com/Plutonomicon/cardano-transaction-lib.git"; - rev = "325665b19859bbf3e48e296e9aa717673f5f3d79"; - sha256 = "156hfl8sflfzc5svs5k0zzil2pdi8380azm1mac2cc6000m7xfwb"; + rev = "8014c940cf69516c0a00048eec79b2ba95fd94f3"; + sha256 = "1m73xy4z2in181rj1443xqygm0akvzqi27qnslhpiqn808vy4ixw"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; diff --git a/templates/ctl-scaffold/webpack.config.cjs b/templates/ctl-scaffold/webpack.config.cjs index 7f4710173c..00c39dead9 100644 --- a/templates/ctl-scaffold/webpack.config.cjs +++ b/templates/ctl-scaffold/webpack.config.cjs @@ -2,107 +2,93 @@ const path = require("path"); const webpack = require("webpack"); -const HtmlWebpackPlugin = require("html-webpack-plugin"); const NodePolyfillPlugin = require("node-polyfill-webpack-plugin"); -module.exports = { - mode: "development", +module.exports = env => { + return { + mode: "development", - experiments: { - asyncWebAssembly: false, - layers: false, - lazyCompilation: false, - outputModule: true, - syncWebAssembly: true, - topLevelAwait: true, - }, + experiments: { + asyncWebAssembly: false, + layers: false, + lazyCompilation: false, + outputModule: true, + syncWebAssembly: true, + topLevelAwait: true, + }, - devtool: "eval-source-map", + devtool: "eval-source-map", - stats: { errorDetails: true }, + stats: { errorDetails: true }, - devServer: { - client: { - overlay: false, - }, - port: 4008, - proxy: { - "/kupo": { - // `KUPO_HOST` env variable must be set to the base URL of the Kupo - // service, otherwise all requests to Kupo will fail. - target: process.env.KUPO_HOST || "http://localhost:1442", - changeOrigin: true, - pathRewrite: { "^/kupo": "" }, - }, - }, - }, + devServer: { + static: { + directory: path.join(__dirname, 'dist'), + }, + client: { + overlay: false + }, + port: 4008, + proxy: { + "/kupo": { + // `KUPO_HOST` env variable must be set to the base URL of the Kupo + // service, otherwise all requests to Kupo will fail. + target: process.env.KUPO_HOST || "http://localhost:1442", + changeOrigin: true, + pathRewrite: { "^/kupo": "" }, + }, + }, + }, - // we can add more entrypoints as needed - entry: "./index.js", + // we can add more entrypoints as needed + entry: env.entry, - output: { - path: path.resolve(__dirname, "dist"), - filename: "bundle.js", - library: { - type: "module", - }, - }, + output: { + path: path.resolve(__dirname, "dist"), + filename: "index.js", + library: { + type: "module", + }, + }, - module: { - rules: [ - { - test: /\.(png|jpg|gif)$/i, - type: "asset", - }, - { - test: /\.plutus$/i, - type: "asset/source", - }, - ], - }, + resolve: { + // We use node_modules provided by Nix shell via an environment variable + modules: [process.env.NODE_PATH], + extensions: [".js"], + fallback: { + buffer: require.resolve("buffer/"), + http: false, + url: false, + stream: false, + crypto: false, + https: false, + net: false, + tls: false, + zlib: false, + os: false, + path: false, + fs: false, + readline: false, + child_process: false, + }, + }, - resolve: { - // We use node_modules provided by Nix shell via an environment variable - modules: [process.env.NODE_PATH], - extensions: [".js"], - fallback: { - buffer: require.resolve("buffer/"), - http: false, - url: false, - stream: false, - crypto: false, - https: false, - net: false, - tls: false, - zlib: false, - os: false, - path: false, - fs: false, - readline: false, - child_process: false, - }, - }, - - plugins: [ - new webpack.DefinePlugin({ - BROWSER_RUNTIME: !!process.env.BROWSER_RUNTIME, - }), - new NodePolyfillPlugin(), - new webpack.LoaderOptionsPlugin({ - debug: true, - }), - new HtmlWebpackPlugin({ - title: "ctl-scaffold", - template: "./index.html", - inject: false, // See stackoverflow.com/a/38292765/3067181 - }), - new webpack.ProvidePlugin({ - Buffer: ["buffer", "Buffer"], - }), - // ContextReplacementPlugin is used just to suppress a webpack warning: - // "Critical dependency: the request of a dependency is an expression" - // See https://stackoverflow.com/a/59235546/17365145 - new webpack.ContextReplacementPlugin(/cardano-serialization-lib-browser/), - new webpack.ContextReplacementPlugin(/cardano-serialization-lib-nodejs/), - ], + plugins: [ + new webpack.DefinePlugin({ + BROWSER_RUNTIME: !!process.env.BROWSER_RUNTIME, + }), + new NodePolyfillPlugin(), + new webpack.LoaderOptionsPlugin({ + debug: true, + }), + new webpack.ProvidePlugin({ + Buffer: ["buffer", "Buffer"], + }), + // ContextReplacementPlugin is used just to suppress a webpack warning: + // "Critical dependency: the request of a dependency is an expression" + // See https://stackoverflow.com/a/59235546/17365145 + new webpack.ContextReplacementPlugin(/cardano-serialization-lib-browser/), + new webpack.ContextReplacementPlugin(/cardano-serialization-lib-nodejs/), + ], + }; }; diff --git a/webpack.config.cjs b/webpack.config.cjs index 52eedb1a78..61c2e77fb9 100644 --- a/webpack.config.cjs +++ b/webpack.config.cjs @@ -50,19 +50,6 @@ module.exports = env => { } }, - module: { - rules: [ - { - test: /\.(png|jpg|gif)$/i, - type: "asset", - }, - { - test: /\.plutus$/i, - type: "asset/source", - }, - ], - }, - resolve: { // We use node_modules provided by Nix shell via an environment variable modules: [process.env.NODE_PATH], From 19be30b100344291e505e04c17c7125f6573449b Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Fri, 13 Oct 2023 20:49:24 +0400 Subject: [PATCH 57/85] Update template's Makefile --- Makefile | 3 +- templates/ctl-scaffold/Makefile | 67 +++++++++++++++---- .../ctl-scaffold/dist/esbuild/index.html | 11 --- .../ctl-scaffold/dist/esbuild/wrapper.js | 6 -- 4 files changed, 57 insertions(+), 30 deletions(-) delete mode 100644 templates/ctl-scaffold/dist/esbuild/index.html delete mode 100644 templates/ctl-scaffold/dist/esbuild/wrapper.js diff --git a/Makefile b/Makefile index 1b507d4963..09bddd630b 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SHELL := bash .ONESHELL: .PHONY: esbuild-bundle esbuild-serve webpack-bundle webpack-serve check-format format query-testnet-tip clean check-explicit-exports spago-build create-bundle-entrypoint create-html-entrypoint .SHELLFLAGS := -eu -o pipefail -c -serve-port := 4008 + ps-sources := $(shell fd --no-ignore-parent -epurs) nix-sources := $(shell fd --no-ignore-parent -enix --exclude='spago*') js-sources := $(shell fd --no-ignore-parent -ejs) @@ -11,6 +11,7 @@ ps-entrypoint := Ctl.Examples.ByUrl ps-entrypoint-function := main preview-node-ipc = $(shell docker volume inspect store_node-preview-ipc | jq -r '.[0].Mountpoint') preprod-node-ipc = $(shell docker volume inspect store_node-preprod-ipc | jq -r '.[0].Mountpoint') +serve-port := 4008 spago-build: @spago build diff --git a/templates/ctl-scaffold/Makefile b/templates/ctl-scaffold/Makefile index 84208ebb55..0e4ba027fb 100644 --- a/templates/ctl-scaffold/Makefile +++ b/templates/ctl-scaffold/Makefile @@ -1,21 +1,51 @@ SHELL := bash +.PHONY: esbuild-bundle esbuild-serve .ONESHELL: .SHELLFLAGS := -eu -o pipefail -c -ps-sources := $$(fd -epurs) -ps-entrypoint := Scaffold.Main -e2e-entrypoint := Scaffold.Test.E2E.Serve -ps-bundle = spago bundle-module -m ${ps-entrypoint} --to output.js -esbuild-bundle: - @spago build && BROWSER_RUNTIME=1 node esbuild/bundle.js ${ps-entrypoint} +ps-sources := $(shell fd --no-ignore-parent -epurs) +nix-sources := $(shell fd --no-ignore-parent -enix --exclude='spago*') +js-sources := $(shell fd --no-ignore-parent -ejs) +# points to one of the example PureScript modules in examples/ +ps-entrypoint := Scaffold.Test.E2E.Serve +ps-entrypoint-function := main +preview-node-ipc = $(shell docker volume inspect store_node-preview-ipc | jq -r '.[0].Mountpoint') +preprod-node-ipc = $(shell docker volume inspect store_node-preprod-ipc | jq -r '.[0].Mountpoint') +serve-port := 4008 -esbuild-serve: - @spago build \ - && cd dist/esbuild \ - && ln -sfn ../../scripts scripts \ - && cd ../.. \ - && BROWSER_RUNTIME=1 node esbuild/serve.js ${ps-entrypoint} +spago-build: + @spago build + +create-bundle-entrypoint: + @mkdir -p dist/ + @echo 'import("../output/${ps-entrypoint}/index.js").then(m => m.${ps-entrypoint-function}());' > ./dist/entrypoint.js + +create-html-entrypoint: + @mkdir -p dist/ + @cat << EOF > dist/index.html + + + + + EOF + +esbuild-bundle: spago-build create-bundle-entrypoint + @mkdir -p dist/ + @BROWSER_RUNTIME=1 node esbuild/bundle.js ./dist/entrypoint.js dist/index.js + +esbuild-serve: spago-build create-bundle-entrypoint create-html-entrypoint + + BROWSER_RUNTIME=1 node esbuild/serve.js ./dist/entrypoint.js dist/index.js dist/ ${serve-port} + +webpack-bundle: spago-build create-bundle-entrypoint + BROWSER_RUNTIME=1 webpack --mode=production \ + -o dist/ --env entry=./dist/entrypoint.js + +webpack-serve: spago-build create-bundle-entrypoint create-html-entrypoint + BROWSER_RUNTIME=1 webpack-dev-server --progress \ + --port ${serve-port} \ + -o dist/ --env entry=./dist/entrypoint.js run-dev: @${ps-bundle} && BROWSER_RUNTIME=1 webpack-dev-server --progress @@ -29,6 +59,19 @@ run-build: check-format: @purs-tidy check ${ps-sources} + @prettier --loglevel warn -c ${js-sources} + @eslint --quiet ${js-sources} --parser-options 'sourceType: module' format: @purs-tidy format-in-place ${ps-sources} + prettier -w ${js-sources} + +clean: + @ rm -r .psc-ide-port || true + @ rm -rf .psci_modules || true + @ rm -rf .spago || true + @ rm -rf generated-docs || true + @ rm -rf .spago2nix || true + @ rm -rf node_modules || true + @ rm -rf output || true + @ rm -rf dist || true diff --git a/templates/ctl-scaffold/dist/esbuild/index.html b/templates/ctl-scaffold/dist/esbuild/index.html deleted file mode 100644 index 7c9b27620b..0000000000 --- a/templates/ctl-scaffold/dist/esbuild/index.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - Examples source code is located in examples/ directory.
- - diff --git a/templates/ctl-scaffold/dist/esbuild/wrapper.js b/templates/ctl-scaffold/dist/esbuild/wrapper.js deleted file mode 100644 index 9f0811035f..0000000000 --- a/templates/ctl-scaffold/dist/esbuild/wrapper.js +++ /dev/null @@ -1,6 +0,0 @@ -"use strict"; - -import * as m from "./index.js"; - -m.main(); -console.log("app starting"); From d2fe25d0c0a30023e70cc04a354d6359a1ee05f5 Mon Sep 17 00:00:00 2001 From: Koz Ross Date: Tue, 17 Oct 2023 10:15:04 +1300 Subject: [PATCH 58/85] Use JS.BigInt --- examples/AdditionalUtxos.purs | 2 +- examples/AlwaysMints.purs | 2 +- examples/AlwaysSucceeds.purs | 2 +- examples/BalanceTxConstraints.purs | 2 +- examples/ChangeGeneration.purs | 2 +- examples/ContractTestUtils.purs | 4 +-- examples/ExUnits.purs | 4 +-- examples/IncludeDatum.purs | 2 +- .../KeyWallet/Internal/Pkh2PkhContract.purs | 4 +-- examples/Lose7Ada.purs | 2 +- examples/MintsMultipleTokens.purs | 2 +- examples/MultipleRedeemers.purs | 2 +- examples/NativeScriptMints.purs | 4 +-- examples/OneShotMinting.purs | 2 +- examples/PaysWithDatum.purs | 2 +- examples/Pkh2Pkh.purs | 2 +- examples/PlutusV2/InlineDatum.purs | 2 +- examples/PlutusV2/ReferenceInputs.purs | 2 +- .../PlutusV2/ReferenceInputsAndScripts.purs | 2 +- examples/PlutusV2/ReferenceScripts.purs | 2 +- examples/SatisfiesAnyOf.purs | 2 +- examples/SignMultiple.purs | 2 +- examples/TxChaining.purs | 2 +- examples/Utxos.purs | 2 +- packages.dhall | 13 ++++++-- spago-packages.nix | 30 +++++++++---------- spago.dhall | 2 +- src/Contract/Plutarch/Types.purs | 2 +- src/Contract/Test/Assert.purs | 2 +- src/Contract/Time.purs | 2 +- src/Contract/Transaction.purs | 2 +- src/Internal/BalanceTx/BalanceTx.purs | 4 +-- src/Internal/BalanceTx/CoinSelection.purs | 9 ++++-- src/Internal/BalanceTx/Collateral.purs | 2 +- src/Internal/BalanceTx/Collateral/Select.purs | 4 +-- src/Internal/BalanceTx/Constraints.purs | 2 +- src/Internal/BalanceTx/Error.purs | 2 +- src/Internal/BalanceTx/ExUnitsAndMinFee.purs | 2 +- src/Internal/BalanceTx/RedeemerIndex.purs | 2 +- src/Internal/BalanceTx/UtxoMinAda.purs | 2 +- src/Internal/Cardano/Types/Transaction.purs | 2 +- src/Internal/Cardano/Types/Value.purs | 4 +-- src/Internal/CoinSelection/UtxoIndex.purs | 4 +-- src/Internal/Contract/WaitUntilSlot.purs | 2 +- src/Internal/Contract/Wallet.purs | 2 +- src/Internal/Deserialization/BigInt.purs | 2 +- src/Internal/Deserialization/Transaction.purs | 4 +-- src/Internal/Equipartition.purs | 4 +-- src/Internal/FromData.purs | 2 +- src/Internal/Helpers.purs | 4 +-- src/Internal/Metadata/Cip25/Common.purs | 4 +-- src/Internal/Metadata/Cip25/V2.purs | 2 +- src/Internal/Metadata/FromMetadata.purs | 2 +- src/Internal/Metadata/ToMetadata.purs | 2 +- src/Internal/Partition.purs | 4 +-- src/Internal/Plutip/Server.purs | 2 +- src/Internal/Plutus/Types/Value.purs | 4 +-- src/Internal/ProcessConstraints/Error.purs | 2 +- src/Internal/QueryM/Kupo.purs | 2 +- src/Internal/QueryM/Ogmios.purs | 4 +-- src/Internal/Serialization/BigInt.purs | 2 +- src/Internal/Serialization/PlutusData.purs | 2 +- src/Internal/Service/Blockfrost.purs | 4 +-- src/Internal/Test/E2E/Runner.purs | 2 +- src/Internal/Test/KeyDir.purs | 4 +-- src/Internal/Test/UtxoDistribution.purs | 2 +- src/Internal/ToData.purs | 4 +-- src/Internal/Types/BigNum.purs | 4 +-- src/Internal/Types/Epoch.purs | 2 +- src/Internal/Types/EraSummaries.purs | 2 +- src/Internal/Types/Int.purs | 2 +- src/Internal/Types/Interval.purs | 4 +-- src/Internal/Types/NatRatio.purs | 2 +- src/Internal/Types/Natural.purs | 4 +-- src/Internal/Types/PlutusData.purs | 4 +-- src/Internal/Types/Rational.purs | 4 +-- src/Internal/Types/SystemStart.purs | 4 +-- src/Internal/Types/TokenName.purs | 2 +- src/Internal/Types/TransactionMetadata.purs | 2 +- src/Internal/Types/TxConstraints.purs | 2 +- src/Internal/Wallet/Cip30.purs | 2 +- templates/ctl-scaffold/packages.dhall | 15 ++++++++-- templates/ctl-scaffold/spago-packages.nix | 30 +++++++++---------- templates/ctl-scaffold/spago.dhall | 2 +- templates/ctl-scaffold/test/Main.purs | 2 +- test/ApplyArgs.purs | 2 +- test/BalanceTx/ChangeGeneration.purs | 2 +- test/BalanceTx/Collateral.purs | 2 +- test/BalanceTx/Time.purs | 2 +- test/Blockfrost.purs | 2 +- .../GenerateFixtures/NativeScript.purs | 2 +- .../GenerateFixtures/ScriptInfo.purs | 2 +- test/CoinSelection/CoinSelection.purs | 2 +- test/Data.purs | 4 +-- test/Data/Interval.purs | 4 +-- test/Deserialization.purs | 2 +- test/Fixtures.purs | 2 +- test/Hashing.purs | 2 +- test/Partition.purs | 4 +-- test/Plutip/Contract.purs | 2 +- test/Plutip/Contract/Assert.purs | 2 +- test/Plutip/Contract/OgmiosMempool.purs | 2 +- test/Plutip/ExUnits.purs | 2 +- test/Plutip/Staking.purs | 2 +- test/Plutip/UtxoDistribution.purs | 4 +-- test/Plutus/Conversion/Value.purs | 2 +- test/Plutus/Time.purs | 2 +- test/Serialization.purs | 2 +- test/Transaction.purs | 2 +- test/Types/Interval.purs | 2 +- 110 files changed, 192 insertions(+), 171 deletions(-) diff --git a/examples/AdditionalUtxos.purs b/examples/AdditionalUtxos.purs index 49338d0b9b..53e4e102e6 100644 --- a/examples/AdditionalUtxos.purs +++ b/examples/AdditionalUtxos.purs @@ -41,8 +41,8 @@ import Contract.Value (Value) import Contract.Value (lovelaceValueOf) as Value import Ctl.Examples.PlutusV2.Scripts.AlwaysSucceeds (alwaysSucceedsScriptV2) import Data.Array (fromFoldable) as Array -import Data.BigInt (fromInt) as BigInt import Data.Map (difference, filter, keys) as Map +import JS.BigInt (fromInt) as BigInt import Test.QuickCheck (arbitrary) import Test.QuickCheck.Gen (randomSampleOne) diff --git a/examples/AlwaysMints.purs b/examples/AlwaysMints.purs index 1afaff7d33..f8fddc2be2 100644 --- a/examples/AlwaysMints.purs +++ b/examples/AlwaysMints.purs @@ -21,7 +21,7 @@ import Contract.Transaction (awaitTxConfirmed, submitTxFromConstraints) import Contract.TxConstraints as Constraints import Contract.Value as Value import Ctl.Examples.Helpers (mkCurrencySymbol, mkTokenName) as Helpers -import Data.BigInt as BigInt +import JS.BigInt as BigInt main :: Effect Unit main = example testnetNamiConfig diff --git a/examples/AlwaysSucceeds.purs b/examples/AlwaysSucceeds.purs index 1d8de7cd12..26f1677de8 100644 --- a/examples/AlwaysSucceeds.purs +++ b/examples/AlwaysSucceeds.purs @@ -35,9 +35,9 @@ import Contract.Value as Value import Contract.Wallet (ownStakePubKeyHashes) import Control.Monad.Error.Class (liftMaybe) import Data.Array (head) -import Data.BigInt as BigInt import Data.Lens (view) import Effect.Exception (error) +import JS.BigInt as BigInt main :: Effect Unit main = example testnetNamiConfig diff --git a/examples/BalanceTxConstraints.purs b/examples/BalanceTxConstraints.purs index 8a90da6cb1..b06f9bb85e 100644 --- a/examples/BalanceTxConstraints.purs +++ b/examples/BalanceTxConstraints.purs @@ -50,9 +50,9 @@ import Ctl.Examples.AlwaysMints (alwaysMintsPolicy) import Ctl.Examples.Helpers (mkCurrencySymbol, mkTokenName) as Helpers import Data.Array (head) import Data.Array (sort) as Array -import Data.BigInt (BigInt, fromInt) import Data.Map (keys, member) as Map import Data.Set (findMin) as Set +import JS.BigInt (BigInt, fromInt) newtype ContractParams = ContractParams { aliceKeyWallet :: KeyWallet diff --git a/examples/ChangeGeneration.purs b/examples/ChangeGeneration.purs index 7f38681c12..d91ba18232 100644 --- a/examples/ChangeGeneration.purs +++ b/examples/ChangeGeneration.purs @@ -27,11 +27,11 @@ import Contract.Value as Value import Contract.Wallet (ownPaymentPubKeyHashes, ownStakePubKeyHashes) import Ctl.Examples.AlwaysSucceeds as AlwaysSucceeds import Data.Array (fold, length, replicate, take, zip) -import Data.BigInt (fromInt) as BigInt import Data.Lens (to, (^.)) import Data.Maybe (Maybe(Just, Nothing)) import Data.Newtype (unwrap) import Data.Tuple (Tuple(Tuple)) +import JS.BigInt (fromInt) as BigInt import Test.Spec.Assertions (shouldEqual) -- | A contract that creates `outputsToScript` number of outputs at a script address, diff --git a/examples/ContractTestUtils.purs b/examples/ContractTestUtils.purs index e6353fe057..76e8382d1f 100644 --- a/examples/ContractTestUtils.purs +++ b/examples/ContractTestUtils.purs @@ -64,10 +64,10 @@ import Contract.Wallet ) import Ctl.Examples.Helpers (mustPayToPubKeyStakeAddress) as Helpers import Data.Array (head) -import Data.BigInt (BigInt) -import Data.BigInt as BigInt import Data.Lens (view) import Effect.Exception (throw) +import JS.BigInt (BigInt) +import JS.BigInt as BigInt type ContractParams = { receiverPkh :: PaymentPubKeyHash diff --git a/examples/ExUnits.purs b/examples/ExUnits.purs index 6050400cda..6340d689f1 100644 --- a/examples/ExUnits.purs +++ b/examples/ExUnits.purs @@ -33,10 +33,10 @@ import Contract.Value as Value import Contract.Wallet (ownStakePubKeyHashes) import Control.Monad.Error.Class (liftMaybe) import Data.Array (head) -import Data.BigInt (BigInt) -import Data.BigInt as BigInt import Data.Lens (view) import Effect.Exception (error) +import JS.BigInt (BigInt) +import JS.BigInt as BigInt main :: Effect Unit main = example testnetNamiConfig diff --git a/examples/IncludeDatum.purs b/examples/IncludeDatum.purs index 7faf3675d3..5a21a40944 100644 --- a/examples/IncludeDatum.purs +++ b/examples/IncludeDatum.purs @@ -33,9 +33,9 @@ import Contract.Utxos (utxosAt) import Contract.Value as Value import Control.Monad.Error.Class (liftMaybe) import Data.Array (head) -import Data.BigInt as BigInt import Data.Lens (view) import Effect.Exception (error) +import JS.BigInt as BigInt main :: Effect Unit main = example testnetNamiConfig diff --git a/examples/KeyWallet/Internal/Pkh2PkhContract.purs b/examples/KeyWallet/Internal/Pkh2PkhContract.purs index 8040bb5a0e..53bb3d9b33 100644 --- a/examples/KeyWallet/Internal/Pkh2PkhContract.purs +++ b/examples/KeyWallet/Internal/Pkh2PkhContract.purs @@ -22,13 +22,13 @@ import Ctl.Examples.KeyWallet.Internal.Pkh2PkhHtmlForm import Ctl.Internal.Deserialization.Keys (privateKeyFromBytes) import Ctl.Internal.Serialization.Hash (ed25519KeyHashFromBech32) import Ctl.Internal.Types.RawBytes (hexToRawBytes) -import Data.BigInt (BigInt) -import Data.BigInt (fromString) as BigInt import Data.Log.Formatter.Pretty (prettyFormatter) import Data.Log.Level (LogLevel) import Data.Log.Message (Message) import Effect.Class (class MonadEffect) import Effect.Exception (Error, error, message) +import JS.BigInt (BigInt) +import JS.BigInt (fromString) as BigInt runKeyWalletContract_ :: (PaymentPubKeyHash -> BigInt -> Unlock -> Contract Unit) -> Effect Unit diff --git a/examples/Lose7Ada.purs b/examples/Lose7Ada.purs index ca13311c5d..43cbd25b9f 100644 --- a/examples/Lose7Ada.purs +++ b/examples/Lose7Ada.purs @@ -36,11 +36,11 @@ import Contract.Utxos (utxosAt) import Contract.Value as Value import Contract.Wallet (getWalletBalance) import Control.Monad.Error.Class (liftMaybe) -import Data.BigInt as BigInt import Data.Foldable (fold) import Data.Functor ((<$>)) import Data.Map as Map import Effect.Exception (error) +import JS.BigInt as BigInt import Test.Spec.Assertions (shouldEqual) main :: Effect Unit diff --git a/examples/MintsMultipleTokens.purs b/examples/MintsMultipleTokens.purs index e4cc9ea4f7..eb731b40d8 100644 --- a/examples/MintsMultipleTokens.purs +++ b/examples/MintsMultipleTokens.purs @@ -30,8 +30,8 @@ import Ctl.Examples.Helpers ( mkCurrencySymbol , mkTokenName ) as Helpers -import Data.BigInt (fromInt) as BigInt import Effect.Exception (error) +import JS.BigInt (fromInt) as BigInt main :: Effect Unit main = example testnetNamiConfig diff --git a/examples/MultipleRedeemers.purs b/examples/MultipleRedeemers.purs index 3ab3c9f842..f5bef4b0bc 100644 --- a/examples/MultipleRedeemers.purs +++ b/examples/MultipleRedeemers.purs @@ -37,11 +37,11 @@ import Ctl.Examples.PlutusV2.ReferenceInputsAndScripts ( mintAlwaysMintsV2ToTheScript ) import Ctl.Examples.PlutusV2.Scripts.AlwaysMints (alwaysMintsPolicyV2) -import Data.BigInt as BigInt import Data.List as List import Data.Map as Map import Data.Traversable (sequence) import Effect.Exception (error) +import JS.BigInt as BigInt contract :: Contract Unit contract = do diff --git a/examples/NativeScriptMints.purs b/examples/NativeScriptMints.purs index a9e8aa1f82..eb3cc0d0d6 100644 --- a/examples/NativeScriptMints.purs +++ b/examples/NativeScriptMints.purs @@ -29,8 +29,8 @@ import Ctl.Examples.Helpers , mustPayToPubKeyStakeAddress ) as Helpers import Data.Array (head) -import Data.BigInt (BigInt) -import Data.BigInt as BigInt +import JS.BigInt (BigInt) +import JS.BigInt as BigInt main :: Effect Unit main = example testnetNamiConfig diff --git a/examples/OneShotMinting.purs b/examples/OneShotMinting.purs index a4cb3aacbd..b37bb08e28 100644 --- a/examples/OneShotMinting.purs +++ b/examples/OneShotMinting.purs @@ -51,9 +51,9 @@ import Control.Monad.Error.Class (liftMaybe) import Control.Monad.Trans.Class (lift) import Ctl.Examples.Helpers (mkCurrencySymbol, mkTokenName) as Helpers import Data.Array (head, singleton) as Array -import Data.BigInt (BigInt) import Data.Map (toUnfoldable) as Map import Effect.Exception (error, throw) +import JS.BigInt (BigInt) main :: Effect Unit main = example testnetNamiConfig diff --git a/examples/PaysWithDatum.purs b/examples/PaysWithDatum.purs index 70262fe816..1cc9efded2 100644 --- a/examples/PaysWithDatum.purs +++ b/examples/PaysWithDatum.purs @@ -49,7 +49,7 @@ import Contract.Wallet import Control.Monad.Trans.Class (lift) import Ctl.Examples.Helpers (mustPayToPubKeyStakeAddressWithDatum) import Data.Array (head) -import Data.BigInt (fromInt) as BigInt +import JS.BigInt (fromInt) as BigInt type ContractResult = { address :: Address diff --git a/examples/Pkh2Pkh.purs b/examples/Pkh2Pkh.purs index d3b2d643eb..85b3752d72 100644 --- a/examples/Pkh2Pkh.purs +++ b/examples/Pkh2Pkh.purs @@ -17,7 +17,7 @@ import Contract.TxConstraints as Constraints import Contract.Value as Value import Contract.Wallet (ownPaymentPubKeyHashes, ownStakePubKeyHashes) import Data.Array (head) -import Data.BigInt as BigInt +import JS.BigInt as BigInt main :: Effect Unit main = example testnetNamiConfig diff --git a/examples/PlutusV2/InlineDatum.purs b/examples/PlutusV2/InlineDatum.purs index 13022978ca..d2f2eca5ff 100644 --- a/examples/PlutusV2/InlineDatum.purs +++ b/examples/PlutusV2/InlineDatum.purs @@ -38,9 +38,9 @@ import Contract.TxConstraints as Constraints import Contract.Utxos (utxosAt) import Contract.Value as Value import Control.Monad.Error.Class (liftMaybe) -import Data.BigInt as BigInt import Data.Map as Map import Effect.Exception (error) +import JS.BigInt as BigInt import Test.Spec.Assertions (shouldEqual) main :: Effect Unit diff --git a/examples/PlutusV2/ReferenceInputs.purs b/examples/PlutusV2/ReferenceInputs.purs index 9909e2aef9..0725d52aaf 100644 --- a/examples/PlutusV2/ReferenceInputs.purs +++ b/examples/PlutusV2/ReferenceInputs.purs @@ -40,10 +40,10 @@ import Contract.Wallet import Control.Monad.Trans.Class (lift) import Ctl.Examples.Helpers (mustPayToPubKeyStakeAddress) as Helpers import Data.Array (head) as Array -import Data.BigInt (fromInt) as BigInt import Data.Lens.Getter ((^.)) import Data.Map (member, toUnfoldable) as Map import Data.Set (member) as Set +import JS.BigInt (fromInt) as BigInt main :: Effect Unit main = example testnetNamiConfig diff --git a/examples/PlutusV2/ReferenceInputsAndScripts.purs b/examples/PlutusV2/ReferenceInputsAndScripts.purs index 054d73b081..b0a453bf91 100644 --- a/examples/PlutusV2/ReferenceInputsAndScripts.purs +++ b/examples/PlutusV2/ReferenceInputsAndScripts.purs @@ -62,8 +62,8 @@ import Ctl.Examples.PlutusV2.Scripts.AlwaysMints ) import Ctl.Examples.PlutusV2.Scripts.AlwaysSucceeds (alwaysSucceedsScriptV2) import Data.Array (head) -import Data.BigInt (fromInt) as BigInt import Data.Map (toUnfoldable) as Map +import JS.BigInt (fromInt) as BigInt main :: Effect Unit main = example testnetNamiConfig diff --git a/examples/PlutusV2/ReferenceScripts.purs b/examples/PlutusV2/ReferenceScripts.purs index 73d726a0e9..a52783f7ac 100644 --- a/examples/PlutusV2/ReferenceScripts.purs +++ b/examples/PlutusV2/ReferenceScripts.purs @@ -33,8 +33,8 @@ import Contract.Value (lovelaceValueOf) as Value import Contract.Wallet (ownStakePubKeyHashes) import Ctl.Examples.PlutusV2.Scripts.AlwaysSucceeds (alwaysSucceedsScriptV2) import Data.Array (head) -import Data.BigInt (fromInt) as BigInt import Data.Map (toUnfoldable) as Map +import JS.BigInt (fromInt) as BigInt main :: Effect Unit main = example testnetNamiConfig diff --git a/examples/SatisfiesAnyOf.purs b/examples/SatisfiesAnyOf.purs index 5763ba240a..7443c0868a 100644 --- a/examples/SatisfiesAnyOf.purs +++ b/examples/SatisfiesAnyOf.purs @@ -22,7 +22,7 @@ import Contract.PlutusData import Contract.ScriptLookups as Lookups import Contract.TxConstraints (TxConstraints) import Contract.TxConstraints as Constraints -import Data.BigInt as BigInt +import JS.BigInt as BigInt main :: Effect Unit main = example testnetNamiConfig diff --git a/examples/SignMultiple.purs b/examples/SignMultiple.purs index 60e776ddc9..c8c08a15b5 100644 --- a/examples/SignMultiple.purs +++ b/examples/SignMultiple.purs @@ -36,11 +36,11 @@ import Contract.Wallet ) import Control.Monad.Reader (asks) import Data.Array (head) -import Data.BigInt as BigInt import Data.Map (Map, filter) import Data.Set (Set) import Data.UInt (UInt) import Effect.Ref as Ref +import JS.BigInt as BigInt getLockedInputs :: Contract (Map TransactionHash (Set UInt)) diff --git a/examples/TxChaining.purs b/examples/TxChaining.purs index 07bea450e8..77300022b2 100644 --- a/examples/TxChaining.purs +++ b/examples/TxChaining.purs @@ -31,7 +31,7 @@ import Contract.TxConstraints as Constraints import Contract.Value as Value import Contract.Wallet (ownPaymentPubKeyHashes) import Data.Array (head) -import Data.BigInt as BigInt +import JS.BigInt as BigInt main :: Effect Unit main = example testnetNamiConfig diff --git a/examples/Utxos.purs b/examples/Utxos.purs index fb46be87b9..8b782c7110 100644 --- a/examples/Utxos.purs +++ b/examples/Utxos.purs @@ -35,9 +35,9 @@ import Contract.Wallet import Ctl.Examples.Helpers (mkCurrencySymbol, mkTokenName) as Helpers import Ctl.Examples.PlutusV2.OneShotMinting (oneShotMintingPolicyScriptV2) import Data.Array (head) as Array -import Data.BigInt (fromInt) as BigInt import Data.Log.Tag (tag) import Data.Map (toUnfoldable) as Map +import JS.BigInt (fromInt) as BigInt import Test.QuickCheck.Arbitrary (arbitrary) import Test.QuickCheck.Gen (randomSampleOne) diff --git a/packages.dhall b/packages.dhall index 59d1f7eb24..bb7e263fba 100644 --- a/packages.dhall +++ b/packages.dhall @@ -117,7 +117,7 @@ let additions = , "argonaut-core" , "arrays" , "bifunctors" - , "bigints" + , "js-bigints" , "bignumber" , "const" , "control" @@ -145,7 +145,7 @@ let additions = , "untagged-union" ] , repo = "https://github.com/mlabs-haskell/purescript-aeson.git" - , version = "e411566cf5e3adf05ea9ae866705886cfba4bfa6" + , version = "1da04ea8ff3656a4954b3ae2414da2d6a73ade82" } , bignumber = { dependencies = @@ -249,6 +249,15 @@ let additions = "https://github.com/mlabs-haskell/purescript-noble-secp256k1.git" , version = "a3c0f67e9fdb0086016d7aebfad35d09a08b4ecd" } + , js-bigints = + { dependencies = + [ "integers" + , "maybe" + , "prelude" + ] + , repo = "https://github.com/purescript-contrib/purescript-js-bigints" + , version = "36a7d8ac75a7230043ae511f3145f9ed130954a9" + } } in upstream // additions diff --git a/spago-packages.nix b/spago-packages.nix index ad8fec5935..8fc9f46bd2 100644 --- a/spago-packages.nix +++ b/spago-packages.nix @@ -7,11 +7,11 @@ let "aeson" = pkgs.stdenv.mkDerivation { name = "aeson"; - version = "e411566cf5e3adf05ea9ae866705886cfba4bfa6"; + version = "1da04ea8ff3656a4954b3ae2414da2d6a73ade82"; src = pkgs.fetchgit { url = "https://github.com/mlabs-haskell/purescript-aeson.git"; - rev = "e411566cf5e3adf05ea9ae866705886cfba4bfa6"; - sha256 = "01wqbd9pz1pmz1f0z5w4gwaswbdnkr9md7fihg4d91vs690zf792"; + rev = "1da04ea8ff3656a4954b3ae2414da2d6a73ade82"; + sha256 = "1brh39w3krjscnpsda5yk171yiq0ykf148bzapl1w21qc4g9ifpr"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -185,18 +185,6 @@ let installPhase = "ln -s $src $out"; }; - "bigints" = pkgs.stdenv.mkDerivation { - name = "bigints"; - version = "v7.0.1"; - src = pkgs.fetchgit { - url = "https://github.com/purescript-contrib/purescript-bigints.git"; - rev = "e73f55b866e437c7bf04c7d262de7c205c47bbca"; - sha256 = "0msh5sv6g0k69fi0qv4xi1g89bfwai099f0ycjb8a69mnjq8x21n"; - }; - phases = "installPhase"; - installPhase = "ln -s $src $out"; - }; - "bignumber" = pkgs.stdenv.mkDerivation { name = "bignumber"; version = "760d11b41ece31b8cdd3c53349c5c2fd48d3ff89"; @@ -617,6 +605,18 @@ let installPhase = "ln -s $src $out"; }; + "js-bigints" = pkgs.stdenv.mkDerivation { + name = "js-bigints"; + version = "36a7d8ac75a7230043ae511f3145f9ed130954a9"; + src = pkgs.fetchgit { + url = "https://github.com/purescript-contrib/purescript-js-bigints"; + rev = "36a7d8ac75a7230043ae511f3145f9ed130954a9"; + sha256 = "0q3j7jl6ga63ygw2hmfigxjq8nbj56p3bn94x7vnhnhq7996bkpd"; + }; + phases = "installPhase"; + installPhase = "ln -s $src $out"; + }; + "js-date" = pkgs.stdenv.mkDerivation { name = "js-date"; version = "v8.0.0"; diff --git a/spago.dhall b/spago.dhall index 74edc759b1..fa0ef5f27a 100644 --- a/spago.dhall +++ b/spago.dhall @@ -15,7 +15,7 @@ You can edit this file as you like. , "arrays" , "avar" , "bifunctors" - , "bigints" + , "js-bigints" , "bignumber" , "checked-exceptions" , "console" diff --git a/src/Contract/Plutarch/Types.purs b/src/Contract/Plutarch/Types.purs index e7959a9750..68cd2fbf49 100644 --- a/src/Contract/Plutarch/Types.purs +++ b/src/Contract/Plutarch/Types.purs @@ -23,7 +23,7 @@ import Contract.PlutusData , class ToData , PlutusData(List, Integer) ) -import Data.BigInt (BigInt) +import JS.BigInt (BigInt) newtype PRational = PRational R.Rational diff --git a/src/Contract/Test/Assert.purs b/src/Contract/Test/Assert.purs index 3cf104e40b..1577e0e1e9 100644 --- a/src/Contract/Test/Assert.purs +++ b/src/Contract/Test/Assert.purs @@ -100,7 +100,6 @@ import Ctl.Internal.Plutus.Types.Transaction import Ctl.Internal.Types.ByteArray (byteArrayToHex) import Data.Array (foldr) import Data.Array (fromFoldable, length, mapWithIndex, partition) as Array -import Data.BigInt (BigInt) import Data.Either (Either, either, hush) import Data.Foldable (fold, foldMap, null, sum) import Data.Generic.Rep (class Generic) @@ -118,6 +117,7 @@ import Effect.Class (liftEffect) import Effect.Exception (Error, error, message, throw, try) import Effect.Ref (Ref) import Effect.Ref as Ref +import JS.BigInt (BigInt) import Type.Proxy (Proxy(Proxy)) -- | Monad allowing for accumulation of assertion failures. diff --git a/src/Contract/Time.purs b/src/Contract/Time.purs index d80564c291..fed74f8f28 100644 --- a/src/Contract/Time.purs +++ b/src/Contract/Time.purs @@ -106,7 +106,6 @@ import Ctl.Internal.Types.Interval import Ctl.Internal.Types.SystemStart (SystemStart) import Ctl.Internal.Types.SystemStart (SystemStart(SystemStart)) as ExportSystemStart import Data.Array as Array -import Data.BigInt as BigInt import Data.Foldable (find) import Data.Maybe (Maybe(Just, Nothing)) import Data.Newtype (unwrap) @@ -114,6 +113,7 @@ import Data.UInt as UInt import Effect.Aff (delay) import Effect.Aff.Class (liftAff) import Effect.Exception (error) +import JS.BigInt as BigInt -- | Get a summary of the current era. getCurrentEra :: Contract EraSummary diff --git a/src/Contract/Transaction.purs b/src/Contract/Transaction.purs index 6256dde898..e621e82f53 100644 --- a/src/Contract/Transaction.purs +++ b/src/Contract/Transaction.purs @@ -236,7 +236,6 @@ import Ctl.Internal.Types.VRFKeyHash ) as X import Data.Array.NonEmpty as NonEmptyArray import Data.Bifunctor (lmap) -import Data.BigInt (BigInt) import Data.Either (Either) import Data.Foldable (foldl, length) import Data.Generic.Rep (class Generic) @@ -253,6 +252,7 @@ import Effect.Aff (bracket, error) import Effect.Aff.Class (liftAff) import Effect.Class (liftEffect) import Effect.Exception (try) +import JS.BigInt (BigInt) -- | Signs a transaction with potential failure. signTransaction diff --git a/src/Internal/BalanceTx/BalanceTx.purs b/src/Internal/BalanceTx/BalanceTx.purs index 2de3a43400..5345a280db 100644 --- a/src/Internal/BalanceTx/BalanceTx.purs +++ b/src/Internal/BalanceTx/BalanceTx.purs @@ -155,8 +155,6 @@ import Data.Array.NonEmpty ) as NEArray import Data.Array.NonEmpty as NEA import Data.Bifunctor (lmap) -import Data.BigInt (BigInt) -import Data.BigInt (toString) as BigInt import Data.Either (Either, hush, note) import Data.Foldable (fold, foldMap, foldr, length, null, sum) import Data.Function (on) @@ -175,6 +173,8 @@ import Data.Tuple (fst) import Data.Tuple.Nested (type (/\), (/\)) import Effect.Aff.Class (liftAff) import Effect.Class (liftEffect) +import JS.BigInt (BigInt) +import JS.BigInt (toString) as BigInt -- | Balances an unbalanced transaction using the specified balancer -- | constraints. diff --git a/src/Internal/BalanceTx/CoinSelection.purs b/src/Internal/BalanceTx/CoinSelection.purs index ede499faf6..5762b2957f 100644 --- a/src/Internal/BalanceTx/CoinSelection.purs +++ b/src/Internal/BalanceTx/CoinSelection.purs @@ -60,8 +60,6 @@ import Ctl.Internal.Types.Transaction (TransactionInput) import Data.Array (snoc, uncons) as Array import Data.Array.NonEmpty (NonEmptyArray) import Data.Array.NonEmpty (cons', fromArray, singleton, uncons) as NEArray -import Data.BigInt (BigInt) -import Data.BigInt (abs, fromInt, toString) as BigInt import Data.Foldable (foldMap) as Foldable import Data.Function (applyFlipped) import Data.Generic.Rep (class Generic) @@ -79,6 +77,8 @@ import Data.Show.Generic (genericShow) import Data.Tuple (fst) as Tuple import Data.Tuple.Nested (type (/\), (/\)) import Effect.Class (class MonadEffect) +import JS.BigInt (BigInt) +import JS.BigInt (fromInt, toString) as BigInt import Test.QuickCheck.Arbitrary (class Arbitrary) import Test.QuickCheck.Gen (elements) as Arbitrary import Type.Proxy (Proxy(Proxy)) @@ -374,7 +374,10 @@ runSelectionStep lens state distanceFromTarget :: SelectionState -> BigInt distanceFromTarget = - BigInt.abs <<< sub targetQuantity <<< lens.currentQuantity + bigIntAbs <<< sub targetQuantity <<< lens.currentQuantity + + bigIntAbs :: BigInt -> BigInt + bigIntAbs x = if x < zero then negate x else x targetMultiplier :: Int targetMultiplier = diff --git a/src/Internal/BalanceTx/Collateral.purs b/src/Internal/BalanceTx/Collateral.purs index f7eccf29e5..e210562cc1 100644 --- a/src/Internal/BalanceTx/Collateral.purs +++ b/src/Internal/BalanceTx/Collateral.purs @@ -30,7 +30,6 @@ import Ctl.Internal.Cardano.Types.Value (getNonAdaAsset, mkValue, valueToCoin') import Ctl.Internal.Serialization.Address (Address) import Ctl.Internal.Types.BigNum (maxValue, toBigInt) as BigNum import Ctl.Internal.Types.OutputDatum (OutputDatum(NoOutputDatum)) -import Data.BigInt (BigInt) import Data.Either (Either(Left, Right), note) import Data.Foldable (foldMap, foldl) import Data.Lens.Setter ((?~)) @@ -38,6 +37,7 @@ import Data.Maybe (Maybe(Nothing)) import Data.Newtype (unwrap, wrap) import Data.Ord.Max (Max(Max)) import Effect.Class (liftEffect) +import JS.BigInt (BigInt) addTxCollateral :: Array TransactionUnspentOutput -> Transaction -> Transaction addTxCollateral collateral transaction = diff --git a/src/Internal/BalanceTx/Collateral/Select.purs b/src/Internal/BalanceTx/Collateral/Select.purs index ad091d077c..992471d0a3 100644 --- a/src/Internal/BalanceTx/Collateral/Select.purs +++ b/src/Internal/BalanceTx/Collateral/Select.purs @@ -19,8 +19,6 @@ import Ctl.Internal.Cardano.Types.Value (NonAdaAsset) import Ctl.Internal.Cardano.Types.Value (getNonAdaAsset, valueToCoin') as Value import Ctl.Internal.Types.ProtocolParameters (CoinsPerUtxoUnit) import Ctl.Internal.Types.Transaction (TransactionInput) -import Data.BigInt (BigInt) -import Data.BigInt (fromInt) as BigInt import Data.Foldable (foldMap, foldl) import Data.Function (on) import Data.List (List(Nil, Cons)) @@ -34,6 +32,8 @@ import Data.Tuple (Tuple(Tuple)) import Data.Tuple (fst, snd) as Tuple import Data.Tuple.Nested (type (/\), (/\)) import Effect (Effect) +import JS.BigInt (BigInt) +import JS.BigInt (fromInt) as BigInt minRequiredCollateral :: BigInt minRequiredCollateral = BigInt.fromInt 5_000_000 diff --git a/src/Internal/BalanceTx/Constraints.purs b/src/Internal/BalanceTx/Constraints.purs index f50e01ae4d..0517d5f43a 100644 --- a/src/Internal/BalanceTx/Constraints.purs +++ b/src/Internal/BalanceTx/Constraints.purs @@ -38,7 +38,6 @@ import Ctl.Internal.Serialization.Address (Address, NetworkId) import Ctl.Internal.Types.OutputDatum (OutputDatum) import Ctl.Internal.Types.Transaction (TransactionInput) import Data.Array (singleton) as Array -import Data.BigInt (BigInt) import Data.Function (applyFlipped) import Data.Lens (Lens') import Data.Lens.Iso.Newtype (_Newtype) @@ -49,6 +48,7 @@ import Data.Maybe (Maybe(Nothing)) import Data.Newtype (class Newtype, over2, unwrap, wrap) import Data.Set (Set) import Data.Set (singleton) as Set +import JS.BigInt (BigInt) import Type.Proxy (Proxy(Proxy)) newtype BalanceTxConstraints = BalanceTxConstraints diff --git a/src/Internal/BalanceTx/Error.purs b/src/Internal/BalanceTx/Error.purs index 0a0386db1b..ad08d96e57 100644 --- a/src/Internal/BalanceTx/Error.purs +++ b/src/Internal/BalanceTx/Error.purs @@ -51,7 +51,6 @@ import Ctl.Internal.Types.Natural (toBigInt) as Natural import Ctl.Internal.Types.Transaction (TransactionInput) import Data.Array (catMaybes, filter, uncons) as Array import Data.Bifunctor (bimap) -import Data.BigInt (toString) as BigInt import Data.Either (Either(Left, Right), either, isLeft) import Data.Foldable (find, foldMap, foldl, length) import Data.FoldableWithIndex (foldMapWithIndex) @@ -66,6 +65,7 @@ import Data.String (Pattern(Pattern)) import Data.String.CodePoints (length) as String import Data.String.Common (joinWith, split) as String import Data.String.Utils (padEnd) +import JS.BigInt (toString) as BigInt -- | Errors conditions that may possibly arise during transaction balancing data BalanceTxError diff --git a/src/Internal/BalanceTx/ExUnitsAndMinFee.purs b/src/Internal/BalanceTx/ExUnitsAndMinFee.purs index a5f3040fca..64ce404a74 100644 --- a/src/Internal/BalanceTx/ExUnitsAndMinFee.purs +++ b/src/Internal/BalanceTx/ExUnitsAndMinFee.purs @@ -61,7 +61,6 @@ import Ctl.Internal.Types.Transaction (TransactionInput) import Data.Array (catMaybes) import Data.Array (fromFoldable, notElem) as Array import Data.Bifunctor (bimap) -import Data.BigInt (BigInt) import Data.Either (Either(Left, Right), note) import Data.Foldable (foldMap) import Data.Lens.Getter ((^.)) @@ -76,6 +75,7 @@ import Data.Tuple (snd) import Data.Tuple.Nested (type (/\), (/\)) import Effect.Aff.Class (liftAff) import Effect.Class (liftEffect) +import JS.BigInt (BigInt) evalTxExecutionUnits :: Transaction diff --git a/src/Internal/BalanceTx/RedeemerIndex.purs b/src/Internal/BalanceTx/RedeemerIndex.purs index ff7bbc3b0f..3308e1db7e 100644 --- a/src/Internal/BalanceTx/RedeemerIndex.purs +++ b/src/Internal/BalanceTx/RedeemerIndex.purs @@ -37,7 +37,6 @@ import Ctl.Internal.Types.RewardAddress (RewardAddress) import Ctl.Internal.Types.Scripts (MintingPolicyHash) import Ctl.Internal.Types.Transaction (TransactionInput) import Data.Array (findIndex) -import Data.BigInt as BigInt import Data.Either (Either, note) import Data.Foldable (fold) import Data.Generic.Rep (class Generic) @@ -48,6 +47,7 @@ import Data.Newtype (class Newtype, unwrap) import Data.Set as Set import Data.Show.Generic (genericShow) import Data.Traversable (for) +import JS.BigInt as BigInt attachRedeemers :: Array Redeemer -> Transaction -> Transaction attachRedeemers redeemers = _witnessSet <<< _redeemers .~ Just redeemers diff --git a/src/Internal/BalanceTx/UtxoMinAda.purs b/src/Internal/BalanceTx/UtxoMinAda.purs index 8258f3017e..e1d37dba34 100644 --- a/src/Internal/BalanceTx/UtxoMinAda.purs +++ b/src/Internal/BalanceTx/UtxoMinAda.purs @@ -22,10 +22,10 @@ import Ctl.Internal.Types.BigNum import Ctl.Internal.Types.ProtocolParameters ( CoinsPerUtxoUnit(CoinsPerUtxoWord, CoinsPerUtxoByte) ) -import Data.BigInt (BigInt) import Data.Maybe (Maybe, fromJust) import Effect (Effect) import Effect.Exception (error) +import JS.BigInt (BigInt) import Partial.Unsafe (unsafePartial) foreign import minAdaForOutput diff --git a/src/Internal/Cardano/Types/Transaction.purs b/src/Internal/Cardano/Types/Transaction.purs index ece8eac6f3..0a92ad9dd3 100644 --- a/src/Internal/Cardano/Types/Transaction.purs +++ b/src/Internal/Cardano/Types/Transaction.purs @@ -147,7 +147,6 @@ import Ctl.Internal.Types.Transaction (TransactionInput(TransactionInput)) import Ctl.Internal.Types.TransactionMetadata (GeneralTransactionMetadata) import Ctl.Internal.Types.VRFKeyHash (VRFKeyHash) import Data.Array (union) -import Data.BigInt (BigInt) import Data.Either (Either(Left), note) import Data.Generic.Rep (class Generic) import Data.Lens (lens') @@ -169,6 +168,7 @@ import Data.Tuple (Tuple(Tuple)) import Data.Tuple.Nested (type (/\), (/\)) import Data.UInt (UInt) import Data.UInt as UInt +import JS.BigInt (BigInt) import Partial.Unsafe (unsafePartial) import Type.Proxy (Proxy(Proxy)) diff --git a/src/Internal/Cardano/Types/Value.purs b/src/Internal/Cardano/Types/Value.purs index 1143621e28..9c994678c7 100644 --- a/src/Internal/Cardano/Types/Value.purs +++ b/src/Internal/Cardano/Types/Value.purs @@ -102,8 +102,6 @@ import Data.Array (fromFoldable) as Array import Data.Array.NonEmpty (NonEmptyArray) import Data.Array.NonEmpty (replicate, singleton, zipWith) as NEArray import Data.Bifunctor (bimap) -import Data.BigInt (BigInt, fromInt, toNumber) -import Data.BigInt as BigInt import Data.Bitraversable (bitraverse, ltraverse) import Data.Either (Either(Left), note) import Data.Foldable (any, fold, foldl, length) @@ -127,6 +125,8 @@ import Data.These (These(Both, That, This)) import Data.Traversable (class Traversable, traverse) import Data.Tuple (fst) import Data.Tuple.Nested (type (/\), (/\)) +import JS.BigInt (BigInt, fromInt, toNumber) +import JS.BigInt as BigInt import Partial.Unsafe (unsafePartial) import Test.QuickCheck.Arbitrary (class Arbitrary, arbitrary) import Test.QuickCheck.Gen (Gen, chooseInt, suchThat, vectorOf) diff --git a/src/Internal/CoinSelection/UtxoIndex.purs b/src/Internal/CoinSelection/UtxoIndex.purs index cbfe56a707..3ee70c1fe2 100644 --- a/src/Internal/CoinSelection/UtxoIndex.purs +++ b/src/Internal/CoinSelection/UtxoIndex.purs @@ -38,8 +38,6 @@ import Data.Array (all, foldl) as Array import Data.Array ((!!)) import Data.Array.NonEmpty (cons') import Data.Bifunctor (bimap) -import Data.BigInt (BigInt) -import Data.BigInt (fromInt) as BigInt import Data.Foldable (all, length) as Foldable import Data.Foldable (foldl) import Data.Function (on) @@ -72,6 +70,8 @@ import Data.Show.Generic (genericShow) import Data.Tuple.Nested (type (/\), (/\)) import Effect.Class (class MonadEffect, liftEffect) import Effect.Random (randomInt) as Random +import JS.BigInt (BigInt) +import JS.BigInt (fromInt) as BigInt import Test.QuickCheck.Arbitrary (class Arbitrary, arbitrary) import Test.QuickCheck.Gen (oneOf) import Type.Proxy (Proxy(Proxy)) diff --git a/src/Internal/Contract/WaitUntilSlot.purs b/src/Internal/Contract/WaitUntilSlot.purs index b52778dcdf..149dd70064 100644 --- a/src/Internal/Contract/WaitUntilSlot.purs +++ b/src/Internal/Contract/WaitUntilSlot.purs @@ -29,7 +29,6 @@ import Ctl.Internal.Types.Natural as Natural import Ctl.Internal.Types.SystemStart (SystemStart) import Data.Array (length, mapMaybe) import Data.Bifunctor (lmap) -import Data.BigInt as BigInt import Data.DateTime.Instant (unInstant) import Data.Either (Either(Right, Left), either) import Data.Foldable (maximum) @@ -42,6 +41,7 @@ import Effect.Aff.Class (liftAff) import Effect.Class (liftEffect) import Effect.Exception (error, throw) import Effect.Now (now) +import JS.BigInt as BigInt -- | The returned slot will be no less than the slot provided as argument. waitUntilSlot :: Slot -> Contract Chain.Tip diff --git a/src/Internal/Contract/Wallet.purs b/src/Internal/Contract/Wallet.purs index f9651c496f..90be1902bc 100644 --- a/src/Internal/Contract/Wallet.purs +++ b/src/Internal/Contract/Wallet.purs @@ -44,7 +44,6 @@ import Ctl.Internal.Wallet (Wallet, actionBasedOnWallet) import Ctl.Internal.Wallet.Cip30 (DataSignature) import Data.Array (cons, foldMap, foldr) import Data.Array as Array -import Data.BigInt as BigInt import Data.Either (hush) import Data.Foldable (fold, foldl) import Data.Function (on) @@ -57,6 +56,7 @@ import Data.UInt as UInt import Effect.Aff.Class (liftAff) import Effect.Class (liftEffect) import Effect.Exception (error, throw) +import JS.BigInt as BigInt getUnusedAddresses :: Contract (Array Address) getUnusedAddresses = fold <$> do diff --git a/src/Internal/Deserialization/BigInt.purs b/src/Internal/Deserialization/BigInt.purs index 68b61e0137..370a99d9c6 100644 --- a/src/Internal/Deserialization/BigInt.purs +++ b/src/Internal/Deserialization/BigInt.purs @@ -5,8 +5,8 @@ module Ctl.Internal.Deserialization.BigInt import Prelude import Ctl.Internal.Serialization.Types (BigInt) -import Data.BigInt as BigInt import Data.Maybe (Maybe) +import JS.BigInt as BigInt convertBigInt :: BigInt -> Maybe BigInt.BigInt convertBigInt = BigInt.fromString <<< _BigInt_to_str diff --git a/src/Internal/Deserialization/Transaction.purs b/src/Internal/Deserialization/Transaction.purs index 44dfde2e2d..f17faa2a33 100644 --- a/src/Internal/Deserialization/Transaction.purs +++ b/src/Internal/Deserialization/Transaction.purs @@ -194,8 +194,6 @@ import Ctl.Internal.Types.TransactionMetadata ) import Ctl.Internal.Types.VRFKeyHash (VRFKeyHash(VRFKeyHash)) import Data.Bifunctor (bimap, lmap) -import Data.BigInt (BigInt) -import Data.BigInt as BigInt import Data.Bitraversable (bitraverse) import Data.Either (Either) import Data.Map as M @@ -208,6 +206,8 @@ import Data.Tuple.Nested (type (/\)) import Data.UInt (UInt) import Data.UInt as UInt import Data.Variant (Variant) +import JS.BigInt (BigInt) +import JS.BigInt as BigInt import Type.Row (type (+)) -- | Deserializes CBOR encoded transaction to a CTL's native type. diff --git a/src/Internal/Equipartition.purs b/src/Internal/Equipartition.purs index 9e22c80531..f78c0c389d 100644 --- a/src/Internal/Equipartition.purs +++ b/src/Internal/Equipartition.purs @@ -8,9 +8,9 @@ import Prelude import Data.Array (replicate) import Data.Array.NonEmpty (NonEmptyArray) import Data.Array.NonEmpty (appendArray, replicate, singleton) as NEArray -import Data.BigInt (BigInt) -import Data.BigInt (fromInt, toInt) as BigInt import Data.Maybe (fromJust) +import JS.BigInt (BigInt) +import JS.BigInt (fromInt, toInt) as BigInt import Partial.Unsafe (unsafePartial) -- | Represents types whose values can be equally divided into several parts. diff --git a/src/Internal/FromData.purs b/src/Internal/FromData.purs index 6098b6356e..fa4d284e29 100644 --- a/src/Internal/FromData.purs +++ b/src/Internal/FromData.purs @@ -41,7 +41,6 @@ import Ctl.Internal.Types.RawBytes (RawBytes) import Data.Array (uncons) import Data.Array as Array import Data.ArrayBuffer.Types (Uint8Array) -import Data.BigInt (BigInt) import Data.Either (Either(Left, Right), hush, note) import Data.Generic.Rep as G import Data.List (List) @@ -56,6 +55,7 @@ import Data.Traversable (traverse) import Data.Tuple (Tuple(Tuple)) import Data.UInt (UInt) import Data.Unfoldable (class Unfoldable) +import JS.BigInt (BigInt) import Noble.Secp256k1.ECDSA ( ECDSASignature , MessageHash diff --git a/src/Internal/Helpers.purs b/src/Internal/Helpers.purs index 63e1f00ad6..6414833653 100644 --- a/src/Internal/Helpers.purs +++ b/src/Internal/Helpers.purs @@ -39,8 +39,6 @@ import Aeson (class EncodeAeson, Aeson, encodeAeson, toString) import Control.Monad.Error.Class (class MonadError, throwError) import Data.Array (union) import Data.Bifunctor (bimap) -import Data.BigInt (BigInt) -import Data.BigInt as BigInt import Data.Bitraversable (ltraverse) import Data.Either (Either(Right), either) import Data.Function (on) @@ -66,6 +64,8 @@ import Effect.Class (class MonadEffect) import Effect.Class.Console (log) import Effect.Exception (throw) import Foreign.Object as Obj +import JS.BigInt (BigInt) +import JS.BigInt as BigInt import Partial.Unsafe (unsafePartial) import Prim.TypeError (class Warn, Text) diff --git a/src/Internal/Metadata/Cip25/Common.purs b/src/Internal/Metadata/Cip25/Common.purs index 92d4cc29c8..09b1c5eebc 100644 --- a/src/Internal/Metadata/Cip25/Common.purs +++ b/src/Internal/Metadata/Cip25/Common.purs @@ -36,13 +36,13 @@ import Ctl.Internal.Metadata.ToMetadata (class ToMetadata, toMetadata) import Ctl.Internal.Plutus.Types.AssocMap as AssocMap import Ctl.Internal.ToData (class ToData, toData) import Ctl.Internal.Types.TokenName (TokenName, getTokenName, mkTokenName) -import Data.BigInt (BigInt) -import Data.BigInt as BigInt import Data.Either (note) import Data.Generic.Rep (class Generic) import Data.Newtype (class Newtype, unwrap, wrap) import Data.Show.Generic (genericShow) import Data.Tuple.Nested ((/\)) +import JS.BigInt (BigInt) +import JS.BigInt as BigInt nftMetadataLabel :: BigInt nftMetadataLabel = BigInt.fromInt 721 diff --git a/src/Internal/Metadata/Cip25/V2.purs b/src/Internal/Metadata/Cip25/V2.purs index 81f136491e..7cdeefbbd0 100644 --- a/src/Internal/Metadata/Cip25/V2.purs +++ b/src/Internal/Metadata/Cip25/V2.purs @@ -64,7 +64,6 @@ import Ctl.Internal.Types.TransactionMetadata import Data.Array (catMaybes, concat, groupBy) import Data.Array.NonEmpty (NonEmptyArray, toArray) import Data.Array.NonEmpty (head) as NonEmpty -import Data.BigInt (fromInt, toString) as BigInt import Data.Either (Either(Left), note) import Data.Function (on) import Data.Generic.Rep (class Generic) @@ -77,6 +76,7 @@ import Data.Traversable (fold, for, sequence, traverse) import Data.Tuple (Tuple) import Data.Tuple.Nested ((/\)) import Foreign.Object (Object, toUnfoldable) as FO +import JS.BigInt (fromInt, toString) as BigInt import Partial.Unsafe (unsafePartial) -- | ``` diff --git a/src/Internal/Metadata/FromMetadata.purs b/src/Internal/Metadata/FromMetadata.purs index 0502159392..6f115b1e8c 100644 --- a/src/Internal/Metadata/FromMetadata.purs +++ b/src/Internal/Metadata/FromMetadata.purs @@ -8,11 +8,11 @@ import Ctl.Internal.Types.TransactionMetadata ( TransactionMetadatum(MetadataList, Int, Bytes, Text) ) import Data.Array (toUnfoldable, uncons) as Array -import Data.BigInt (BigInt) import Data.Maybe (Maybe(Just, Nothing)) import Data.NonEmpty (NonEmpty, (:|)) import Data.Traversable (traverse) import Data.Unfoldable (class Unfoldable) +import JS.BigInt (BigInt) -------------------------------------------------------------------------------- -- FromMetadata diff --git a/src/Internal/Metadata/ToMetadata.purs b/src/Internal/Metadata/ToMetadata.purs index 9b96597134..b8dd0bf333 100644 --- a/src/Internal/Metadata/ToMetadata.purs +++ b/src/Internal/Metadata/ToMetadata.purs @@ -10,12 +10,12 @@ import Ctl.Internal.Types.Int (Int, fromBigInt) as Int import Ctl.Internal.Types.TransactionMetadata ( TransactionMetadatum(MetadataMap, MetadataList, Int, Bytes, Text) ) -import Data.BigInt (BigInt) import Data.Map (Map) import Data.Map (fromFoldable, toUnfoldable) as Map import Data.Maybe (fromJust) import Data.Profunctor.Strong ((***)) import Data.Tuple (Tuple) +import JS.BigInt (BigInt) import Partial.Unsafe (unsafePartial) -------------------------------------------------------------------------------- diff --git a/src/Internal/Partition.purs b/src/Internal/Partition.purs index 134b8ca9f8..16c4ad80e5 100644 --- a/src/Internal/Partition.purs +++ b/src/Internal/Partition.purs @@ -19,8 +19,6 @@ import Data.Array.NonEmpty , zip , zipWith ) as NEArray -import Data.BigInt (BigInt) -import Data.BigInt (fromInt, toInt) as BigInt import Data.Foldable (any, length, sum) import Data.Function (on) import Data.Maybe (Maybe(Just, Nothing), fromJust) @@ -28,6 +26,8 @@ import Data.Newtype (class Newtype, unwrap) import Data.Ordering (invert) as Ordering import Data.Tuple (fst, snd) import Data.Tuple.Nested (type (/\), (/\)) +import JS.BigInt (BigInt) +import JS.BigInt (fromInt, toInt) as BigInt import Partial.Unsafe (unsafePartial) class Partition (a :: Type) where diff --git a/src/Internal/Plutip/Server.purs b/src/Internal/Plutip/Server.purs index c7a5010521..0b24c22daa 100644 --- a/src/Internal/Plutip/Server.purs +++ b/src/Internal/Plutip/Server.purs @@ -78,7 +78,6 @@ import Ctl.Internal.Types.UsedTxOuts (newUsedTxOuts) import Ctl.Internal.Wallet.Key (PrivatePaymentKey(PrivatePaymentKey)) import Data.Array as Array import Data.Bifunctor (lmap) -import Data.BigInt as BigInt import Data.Either (Either(Left, Right), either, isLeft) import Data.Foldable (sum) import Data.HTTP.Method as Method @@ -107,6 +106,7 @@ import Effect.Class (liftEffect) import Effect.Exception (error, message, throw) import Effect.Ref (Ref) import Effect.Ref as Ref +import JS.BigInt as BigInt import Mote (bracket) as Mote import Mote.Description (Description(Group, Test)) import Mote.Monad (MoteT(MoteT), mapTest) diff --git a/src/Internal/Plutus/Types/Value.purs b/src/Internal/Plutus/Types/Value.purs index 9e94960551..3e3c31a00f 100644 --- a/src/Internal/Plutus/Types/Value.purs +++ b/src/Internal/Plutus/Types/Value.purs @@ -57,8 +57,6 @@ import Ctl.Internal.ToData (class ToData) import Ctl.Internal.Types.ByteArray (ByteArray) import Ctl.Internal.Types.TokenName (TokenName, adaToken, mkTokenName) import Data.Array (concatMap, filter, replicate) -import Data.BigInt (BigInt) -import Data.BigInt as BigInt import Data.Either (Either(Left)) import Data.Foldable (all, fold) import Data.Generic.Rep (class Generic) @@ -69,6 +67,8 @@ import Data.These (These(Both, That, This), these) import Data.Traversable (sequence) import Data.Tuple (fst) import Data.Tuple.Nested (type (/\), (/\)) +import JS.BigInt (BigInt) +import JS.BigInt as BigInt import Test.QuickCheck.Arbitrary (class Arbitrary, arbitrary) import Test.QuickCheck.Gen (Gen, chooseInt) diff --git a/src/Internal/ProcessConstraints/Error.purs b/src/Internal/ProcessConstraints/Error.purs index 5f9f5f57b5..9d41e0a68d 100644 --- a/src/Internal/ProcessConstraints/Error.purs +++ b/src/Internal/ProcessConstraints/Error.purs @@ -19,10 +19,10 @@ import Ctl.Internal.Types.Scripts ) import Ctl.Internal.Types.TokenName (TokenName) import Ctl.Internal.Types.Transaction (TransactionInput) -import Data.BigInt (BigInt) import Data.Generic.Rep (class Generic) import Data.Maybe (Maybe) import Data.Show.Generic (genericShow) +import JS.BigInt (BigInt) data MkUnbalancedTxError = CannotConvertPaymentPubKeyHash PaymentPubKeyHash diff --git a/src/Internal/QueryM/Kupo.purs b/src/Internal/QueryM/Kupo.purs index bb05ca609d..85395945ba 100644 --- a/src/Internal/QueryM/Kupo.purs +++ b/src/Internal/QueryM/Kupo.purs @@ -88,7 +88,6 @@ import Ctl.Internal.Types.TransactionMetadata (GeneralTransactionMetadata) import Data.Array (uncons) import Data.Array as Array import Data.Bifunctor (lmap) -import Data.BigInt (BigInt) import Data.Either (Either(Left, Right), note) import Data.Foldable (fold) import Data.Generic.Rep (class Generic) @@ -109,6 +108,7 @@ import Effect.Aff (Aff, delay) import Effect.Aff.Class (liftAff) import Foreign.Object (Object) import Foreign.Object (toUnfoldable) as Object +import JS.BigInt (BigInt) -------------------------------------------------------------------------------- -- Requests diff --git a/src/Internal/QueryM/Ogmios.purs b/src/Internal/QueryM/Ogmios.purs index 6058faa204..6c733e4dcc 100644 --- a/src/Internal/QueryM/Ogmios.purs +++ b/src/Internal/QueryM/Ogmios.purs @@ -184,8 +184,6 @@ import Ctl.Internal.Types.VRFKeyHash (VRFKeyHash(VRFKeyHash)) import Data.Array (catMaybes, index) import Data.Array (head, length, replicate) as Array import Data.Bifunctor (lmap) -import Data.BigInt (BigInt) -import Data.BigInt as BigInt import Data.Either (Either(Left, Right), either, note) import Data.Foldable (fold, foldl) import Data.Generic.Rep (class Generic) @@ -214,6 +212,8 @@ import Data.UInt as UInt import Foreign.Object (Object) import Foreign.Object (singleton, toUnfoldable) as ForeignObject import Foreign.Object as Object +import JS.BigInt (BigInt) +import JS.BigInt as BigInt import Partial.Unsafe (unsafePartial) import Untagged.TypeCheck (class HasRuntimeType) import Untagged.Union (type (|+|), toEither1) diff --git a/src/Internal/Serialization/BigInt.purs b/src/Internal/Serialization/BigInt.purs index 00dcfc3e0a..8a0418ce9b 100644 --- a/src/Internal/Serialization/BigInt.purs +++ b/src/Internal/Serialization/BigInt.purs @@ -6,8 +6,8 @@ import Prelude import Ctl.Internal.FfiHelpers (MaybeFfiHelper, maybeFfiHelper) import Ctl.Internal.Serialization.Types (BigInt) -import Data.BigInt as BigInt import Data.Maybe (Maybe) +import JS.BigInt as BigInt convertBigInt :: BigInt.BigInt -> Maybe BigInt convertBigInt = _BigInt_from_str maybeFfiHelper <<< BigInt.toString diff --git a/src/Internal/Serialization/PlutusData.purs b/src/Internal/Serialization/PlutusData.purs index b607fc2069..e15a4bd44a 100644 --- a/src/Internal/Serialization/PlutusData.purs +++ b/src/Internal/Serialization/PlutusData.purs @@ -21,10 +21,10 @@ import Ctl.Internal.Serialization.Types import Ctl.Internal.Types.BigNum (BigNum) import Ctl.Internal.Types.ByteArray (ByteArray) import Ctl.Internal.Types.PlutusData as T -import Data.BigInt as BigInt import Data.Maybe (Maybe, fromJust) import Data.Tuple (Tuple, fst, snd) import Data.Tuple.Nested (type (/\), (/\)) +import JS.BigInt as BigInt import Partial.Unsafe (unsafePartial) convertPlutusData :: T.PlutusData -> PlutusData diff --git a/src/Internal/Service/Blockfrost.purs b/src/Internal/Service/Blockfrost.purs index 987d8db14c..81ffa2cbe1 100644 --- a/src/Internal/Service/Blockfrost.purs +++ b/src/Internal/Service/Blockfrost.purs @@ -211,8 +211,6 @@ import Ctl.Internal.Types.TransactionMetadata ) import Data.Array (find, length) as Array import Data.Bifunctor (lmap) -import Data.BigInt (BigInt) -import Data.BigInt (fromString, toNumber) as BigInt import Data.BigNumber (BigNumber, toFraction) import Data.BigNumber as BigNumber import Data.DateTime.Instant (instant, toDateTime) @@ -241,6 +239,8 @@ import Effect.Aff.Class (liftAff) import Effect.Class (liftEffect) import Effect.Exception (error) import Foreign.Object (Object) +import JS.BigInt (BigInt) +import JS.BigInt (fromString, toNumber) as BigInt -------------------------------------------------------------------------------- -- BlockfrostServiceM diff --git a/src/Internal/Test/E2E/Runner.purs b/src/Internal/Test/E2E/Runner.purs index c14aec7ae6..26a659b9cd 100644 --- a/src/Internal/Test/E2E/Runner.purs +++ b/src/Internal/Test/E2E/Runner.purs @@ -81,7 +81,6 @@ import Ctl.Internal.Wallet.Key ) import Data.Array (catMaybes, mapMaybe, nub) import Data.Array as Array -import Data.BigInt as BigInt import Data.Either (Either(Left, Right), isLeft) import Data.Foldable (fold) import Data.HTTP.Method (Method(GET)) @@ -114,6 +113,7 @@ import Effect.Class (liftEffect) import Effect.Console (log) import Effect.Exception (Error, error, throw) import Effect.Ref as Ref +import JS.BigInt as BigInt import Mote (group, test) import Node.Buffer (fromArrayBuffer) import Node.ChildProcess diff --git a/src/Internal/Test/KeyDir.purs b/src/Internal/Test/KeyDir.purs index 04718dd50f..9575f9d01d 100644 --- a/src/Internal/Test/KeyDir.purs +++ b/src/Internal/Test/KeyDir.purs @@ -76,8 +76,6 @@ import Ctl.Internal.Types.TxConstraints import Ctl.Internal.Wallet (KeyWallet) import Data.Array (catMaybes) import Data.Array as Array -import Data.BigInt (BigInt) -import Data.BigInt as BigInt import Data.Either (Either(Right, Left), hush) import Data.Foldable (fold, sum) import Data.Lens ((^.)) @@ -104,6 +102,8 @@ import Effect.Class (liftEffect) import Effect.Class.Console (info) import Effect.Exception (error, throw) import Effect.Ref as Ref +import JS.BigInt (BigInt) +import JS.BigInt as BigInt import Mote.Monad (mapTest) import Node.Encoding (Encoding(UTF8)) import Node.FS.Aff (mkdir, readTextFile, readdir, writeTextFile) diff --git a/src/Internal/Test/UtxoDistribution.purs b/src/Internal/Test/UtxoDistribution.purs index 3647112adf..73a365c80c 100644 --- a/src/Internal/Test/UtxoDistribution.purs +++ b/src/Internal/Test/UtxoDistribution.purs @@ -52,7 +52,6 @@ import Ctl.Internal.Wallet.Key ) import Data.Array (head) import Data.Array as Array -import Data.BigInt (BigInt) import Data.FoldableWithIndex (foldMapWithIndex) import Data.List (List, (:)) import Data.Map as Map @@ -63,6 +62,7 @@ import Data.Tuple (Tuple) import Data.Tuple.Nested (type (/\), (/\)) import Effect.Class (liftEffect) import Effect.Ref as Ref +import JS.BigInt (BigInt) import Type.Prelude (Proxy(Proxy)) -- | UTxO amount in Lovelaces diff --git a/src/Internal/ToData.purs b/src/Internal/ToData.purs index 722f1d6fe0..b1799f0d17 100644 --- a/src/Internal/ToData.purs +++ b/src/Internal/ToData.purs @@ -35,8 +35,6 @@ import Ctl.Internal.Types.RawBytes (RawBytes) import Data.Array (cons, sortWith) import Data.Array as Array import Data.ArrayBuffer.Types (Uint8Array) -import Data.BigInt (BigInt) -import Data.BigInt as BigInt import Data.Either (Either(Left, Right)) import Data.Foldable (class Foldable) import Data.Generic.Rep as G @@ -49,6 +47,8 @@ import Data.Symbol (class IsSymbol) import Data.TextEncoder (encodeUtf8) import Data.Tuple (Tuple(Tuple), fst, snd) import Data.UInt (UInt) +import JS.BigInt (BigInt) +import JS.BigInt as BigInt import Noble.Secp256k1.ECDSA ( ECDSAPublicKey , ECDSASignature diff --git a/src/Internal/Types/BigNum.purs b/src/Internal/Types/BigNum.purs index d2e28d38b7..e5a75d039e 100644 --- a/src/Internal/Types/BigNum.purs +++ b/src/Internal/Types/BigNum.purs @@ -24,13 +24,13 @@ import Aeson (JsonDecodeError(TypeMismatch)) as Aeson import Ctl.Internal.Deserialization.Error (FromCslRepError, fromCslRepError) import Ctl.Internal.Error (E, noteE) import Ctl.Internal.FfiHelpers (MaybeFfiHelper, maybeFfiHelper) -import Data.BigInt (BigInt) -import Data.BigInt (fromString, toString) as BigInt import Data.Either (note) import Data.Int (fromString) as Int import Data.Maybe (Maybe, fromJust) import Data.UInt (UInt) import Data.UInt (fromInt, fromString, toString) as UInt +import JS.BigInt (BigInt) +import JS.BigInt (fromString, toString) as BigInt import Partial.Unsafe (unsafePartial) import Type.Row (type (+)) diff --git a/src/Internal/Types/Epoch.purs b/src/Internal/Types/Epoch.purs index 4b01d1a12e..fed438326d 100644 --- a/src/Internal/Types/Epoch.purs +++ b/src/Internal/Types/Epoch.purs @@ -4,9 +4,9 @@ import Prelude import Aeson (class DecodeAeson, class EncodeAeson) import Ctl.Internal.Helpers (showWithParens) -import Data.BigInt (BigInt) import Data.Generic.Rep (class Generic) import Data.Newtype (class Newtype) +import JS.BigInt (BigInt) -- | An epoch number or length with greater precision for Ogmios than -- | `Cardano.Types.Epoch`. [ 0 .. 18446744073709552000 ] diff --git a/src/Internal/Types/EraSummaries.purs b/src/Internal/Types/EraSummaries.purs index 04aa5f6864..e1d11c076e 100644 --- a/src/Internal/Types/EraSummaries.purs +++ b/src/Internal/Types/EraSummaries.purs @@ -22,11 +22,11 @@ import Ctl.Internal.Helpers (showWithParens) import Ctl.Internal.Serialization.Address (Slot) import Ctl.Internal.Service.Helpers (aesonObject) import Ctl.Internal.Types.Epoch (Epoch) -import Data.BigInt (BigInt) import Data.Generic.Rep (class Generic) import Data.Maybe (Maybe) import Data.Newtype (class Newtype, wrap) import Data.Show.Generic (genericShow) +import JS.BigInt (BigInt) import Partial.Unsafe (unsafePartial) -------------------------------------------------------------------------------- diff --git a/src/Internal/Types/Int.purs b/src/Internal/Types/Int.purs index d3e875ebe8..5d9fceb7c5 100644 --- a/src/Internal/Types/Int.purs +++ b/src/Internal/Types/Int.purs @@ -22,10 +22,10 @@ import Aeson import Control.Alternative ((<|>)) import Ctl.Internal.Types.BigNum (BigNum) import Ctl.Internal.Types.BigNum (fromBigInt, fromInt) as BigNum -import Data.BigInt as BigInt import Data.Either (note) import Data.Function (on) import Data.Maybe (Maybe, fromJust) +import JS.BigInt as BigInt import Partial.Unsafe (unsafePartial) import Prim as Prim diff --git a/src/Internal/Types/Interval.purs b/src/Internal/Types/Interval.purs index ad78852c6f..9a957d5eba 100644 --- a/src/Internal/Types/Interval.purs +++ b/src/Internal/Types/Interval.purs @@ -120,8 +120,6 @@ import Data.Array (find, head, index, length) import Data.Array.NonEmpty (singleton) as NEArray import Data.Array.NonEmpty ((:)) import Data.Bifunctor (bimap, lmap) -import Data.BigInt (BigInt) -import Data.BigInt (fromInt, fromNumber, fromString, toNumber) as BigInt import Data.Either (Either(Left, Right), note) import Data.Generic.Rep (class Generic) import Data.Lattice @@ -137,6 +135,8 @@ import Data.Show.Generic (genericShow) import Data.Tuple (uncurry) import Data.Tuple.Nested (type (/\), (/\)) import Foreign.Object (Object) +import JS.BigInt (BigInt) +import JS.BigInt (fromInt, fromNumber, fromString, toNumber) as BigInt import Partial.Unsafe (unsafePartial) import Prim.TypeError (class Warn, Text) import Test.QuickCheck (class Arbitrary, arbitrary) diff --git a/src/Internal/Types/NatRatio.purs b/src/Internal/Types/NatRatio.purs index 4b41a7ca2e..a55a300d34 100644 --- a/src/Internal/Types/NatRatio.purs +++ b/src/Internal/Types/NatRatio.purs @@ -23,8 +23,8 @@ import Ctl.Internal.Types.Rational , numerator , (%) ) as Rational -import Data.BigInt (BigInt) import Data.Maybe (Maybe(Nothing)) +import JS.BigInt (BigInt) -- | `NatRatio` is a newtype over `Rational` with smart constructors to create a -- | `NatRatio` safely. Therefore, the data constructor is not exported. diff --git a/src/Internal/Types/Natural.purs b/src/Internal/Types/Natural.purs index 8228b81135..ac94710c01 100644 --- a/src/Internal/Types/Natural.purs +++ b/src/Internal/Types/Natural.purs @@ -20,11 +20,11 @@ import Ctl.Internal.Metadata.FromMetadata (class FromMetadata) import Ctl.Internal.Metadata.ToMetadata (class ToMetadata) import Ctl.Internal.ToData (class ToData, toData) import Ctl.Internal.Types.PlutusData (PlutusData(Integer)) -import Data.BigInt (BigInt) -import Data.BigInt (fromInt, fromString) as BigInt import Data.Either (Either(Left), note) import Data.Function (on) import Data.Maybe (Maybe(Nothing, Just), fromMaybe) +import JS.BigInt (BigInt) +import JS.BigInt (fromInt, fromString) as BigInt newtype Natural = Natural BigInt diff --git a/src/Internal/Types/PlutusData.purs b/src/Internal/Types/PlutusData.purs index 6283b6b2f9..d9a67c594e 100644 --- a/src/Internal/Types/PlutusData.purs +++ b/src/Internal/Types/PlutusData.purs @@ -24,8 +24,6 @@ import Control.Alt ((<|>)) import Ctl.Internal.Types.BigNum (BigNum) import Ctl.Internal.Types.BigNum as BigNum import Ctl.Internal.Types.ByteArray (ByteArray, byteArrayToHex, hexToByteArray) -import Data.BigInt (BigInt) -import Data.BigInt as BigInt import Data.Either (Either(Left)) import Data.Generic.Rep (class Generic) import Data.Log.Tag (TagSet, tag, tagSetTag) @@ -35,6 +33,8 @@ import Data.Show.Generic (genericShow) import Data.Traversable (for) import Data.Tuple (Tuple) import Data.Tuple.Nested ((/\)) +import JS.BigInt (BigInt) +import JS.BigInt as BigInt -- Doesn't distinguish "BuiltinData" and "Data" like Plutus: data PlutusData diff --git a/src/Internal/Types/Rational.purs b/src/Internal/Types/Rational.purs index 1024b38f74..4b7d940c2b 100644 --- a/src/Internal/Types/Rational.purs +++ b/src/Internal/Types/Rational.purs @@ -26,12 +26,12 @@ import Ctl.Internal.Types.BigNum as BigNum import Ctl.Internal.Types.Natural (Natural) import Ctl.Internal.Types.Natural (fromBigInt', toBigInt) as Nat import Ctl.Internal.Types.PlutusData (PlutusData(Constr, Integer)) -import Data.BigInt (BigInt) -import Data.BigInt (fromInt) as BigInt import Data.Either (Either(Left)) import Data.Maybe (Maybe(Just, Nothing), maybe) import Data.Ratio (Ratio) import Data.Ratio (denominator, numerator, (%)) as Ratio +import JS.BigInt (BigInt) +import JS.BigInt (fromInt) as BigInt -- | `Rational` is a newtype over `Ratio` with a smart constructor `reduce` -- | that allows to create a `Rational` safely. The constructor is not exposed. diff --git a/src/Internal/Types/SystemStart.purs b/src/Internal/Types/SystemStart.purs index c1b8895c51..80e37b524d 100644 --- a/src/Internal/Types/SystemStart.purs +++ b/src/Internal/Types/SystemStart.purs @@ -9,8 +9,6 @@ module Ctl.Internal.Types.SystemStart import Prelude import Control.Alt ((<|>)) -import Data.BigInt (BigInt) -import Data.BigInt (fromNumber) as BigInt import Data.DateTime (DateTime) import Data.DateTime.Instant (fromDateTime, unInstant) import Data.Either (Either, hush) @@ -20,6 +18,8 @@ import Data.Maybe (Maybe, fromJust) import Data.Newtype (class Newtype, unwrap, wrap) import Data.Show.Generic (genericShow) import Data.String (length, take) as String +import JS.BigInt (BigInt) +import JS.BigInt (fromNumber) as BigInt import Partial.Unsafe (unsafePartial) newtype SystemStart = SystemStart DateTime diff --git a/src/Internal/Types/TokenName.purs b/src/Internal/Types/TokenName.purs index 1219262cc2..86593a9d3b 100644 --- a/src/Internal/Types/TokenName.purs +++ b/src/Internal/Types/TokenName.purs @@ -28,7 +28,6 @@ import Ctl.Internal.ToData (class ToData) import Ctl.Internal.Types.ByteArray (ByteArray, byteArrayToHex, byteLength) import Ctl.Internal.Types.RawBytes (RawBytes(RawBytes)) import Data.ArrayBuffer.Types (Uint8Array) -import Data.BigInt (BigInt) import Data.Bitraversable (ltraverse) import Data.Either (Either(Right, Left), either, note) import Data.Map (Map) @@ -39,6 +38,7 @@ import Data.String.CodePoints (drop, take) import Data.TextEncoder (encodeUtf8) import Data.Traversable (class Traversable, traverse) import Data.Tuple.Nested (type (/\)) +import JS.BigInt (BigInt) import Partial.Unsafe (unsafePartial) import Test.QuickCheck.Arbitrary (class Arbitrary, arbitrary) import Test.QuickCheck.Gen (resize) diff --git a/src/Internal/Types/TransactionMetadata.purs b/src/Internal/Types/TransactionMetadata.purs index 55e76dfc7e..c92752e996 100644 --- a/src/Internal/Types/TransactionMetadata.purs +++ b/src/Internal/Types/TransactionMetadata.purs @@ -21,12 +21,12 @@ import Ctl.Internal.Helpers ) import Ctl.Internal.Types.ByteArray (ByteArray) import Ctl.Internal.Types.Int (Int) as Int -import Data.BigInt (BigInt) import Data.Generic.Rep (class Generic) import Data.Map (Map) import Data.Map (empty) as Map import Data.Newtype (class Newtype) import Data.Show.Generic (genericShow) +import JS.BigInt (BigInt) newtype GeneralTransactionMetadata = GeneralTransactionMetadata diff --git a/src/Internal/Types/TxConstraints.purs b/src/Internal/Types/TxConstraints.purs index 4fec99e663..a7f9ab229d 100644 --- a/src/Internal/Types/TxConstraints.purs +++ b/src/Internal/Types/TxConstraints.purs @@ -134,7 +134,6 @@ import Ctl.Internal.Types.Scripts import Ctl.Internal.Types.TokenName (TokenName) import Ctl.Internal.Types.Transaction (DataHash, TransactionInput) import Data.Array as Array -import Data.BigInt (BigInt) import Data.Foldable (class Foldable, foldMap, foldl, foldr) import Data.Generic.Rep (class Generic) import Data.Lattice (join) @@ -145,6 +144,7 @@ import Data.Monoid (guard) import Data.Newtype (class Newtype, over, unwrap) import Data.Show.Generic (genericShow) import Data.Tuple.Nested (type (/\), (/\)) +import JS.BigInt (BigInt) import Prim.TypeError (class Warn, Text) -------------------------------------------------------------------------------- diff --git a/src/Internal/Wallet/Cip30.purs b/src/Internal/Wallet/Cip30.purs index 57e05150d1..f698e5dd52 100644 --- a/src/Internal/Wallet/Cip30.purs +++ b/src/Internal/Wallet/Cip30.purs @@ -46,7 +46,6 @@ import Ctl.Internal.Types.CborBytes , rawBytesAsCborBytes ) import Ctl.Internal.Types.RawBytes (RawBytes, hexToRawBytes, rawBytesToHex) -import Data.BigInt (fromInt) as BigInt import Data.Maybe (Maybe(Just, Nothing), maybe) import Data.Newtype (unwrap) import Data.Traversable (for, traverse) @@ -54,6 +53,7 @@ import Effect (Effect) import Effect.Aff (Aff) import Effect.Class (liftEffect) import Effect.Exception (error, throw) +import JS.BigInt (fromInt) as BigInt type DataSignature = { key :: CborBytes diff --git a/templates/ctl-scaffold/packages.dhall b/templates/ctl-scaffold/packages.dhall index 765b35fc48..b83a46920e 100644 --- a/templates/ctl-scaffold/packages.dhall +++ b/templates/ctl-scaffold/packages.dhall @@ -117,7 +117,7 @@ let additions = , "argonaut-core" , "arrays" , "bifunctors" - , "bigints" + , "js-bigints" , "bignumber" , "const" , "control" @@ -145,7 +145,7 @@ let additions = , "untagged-union" ] , repo = "https://github.com/mlabs-haskell/purescript-aeson.git" - , version = "e411566cf5e3adf05ea9ae866705886cfba4bfa6" + , version = "1da04ea8ff3656a4954b3ae2414da2d6a73ade82" } , bignumber = { dependencies = @@ -262,7 +262,7 @@ let additions = , "arrays" , "avar" , "bifunctors" - , "bigints" + , "js-bigints" , "bignumber" , "checked-exceptions" , "console" @@ -344,6 +344,15 @@ let additions = , repo = "https://github.com/Plutonomicon/cardano-transaction-lib.git" , version = "325665b19859bbf3e48e296e9aa717673f5f3d79" } + , js-bigints = + { dependencies = + [ "integers" + , "maybe" + , "prelude" + ] + , repo = "https://github.com/purescript-contrib/purescript-js-bigints" + , version = "36a7d8ac75a7230043ae511f3145f9ed130954a9" + } } in upstream // additions diff --git a/templates/ctl-scaffold/spago-packages.nix b/templates/ctl-scaffold/spago-packages.nix index ddecaa01d4..743cf27d64 100644 --- a/templates/ctl-scaffold/spago-packages.nix +++ b/templates/ctl-scaffold/spago-packages.nix @@ -7,11 +7,11 @@ let "aeson" = pkgs.stdenv.mkDerivation { name = "aeson"; - version = "e411566cf5e3adf05ea9ae866705886cfba4bfa6"; + version = "1da04ea8ff3656a4954b3ae2414da2d6a73ade82"; src = pkgs.fetchgit { url = "https://github.com/mlabs-haskell/purescript-aeson.git"; - rev = "e411566cf5e3adf05ea9ae866705886cfba4bfa6"; - sha256 = "01wqbd9pz1pmz1f0z5w4gwaswbdnkr9md7fihg4d91vs690zf792"; + rev = "1da04ea8ff3656a4954b3ae2414da2d6a73ade82"; + sha256 = "1brh39w3krjscnpsda5yk171yiq0ykf148bzapl1w21qc4g9ifpr"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -185,18 +185,6 @@ let installPhase = "ln -s $src $out"; }; - "bigints" = pkgs.stdenv.mkDerivation { - name = "bigints"; - version = "v7.0.1"; - src = pkgs.fetchgit { - url = "https://github.com/purescript-contrib/purescript-bigints.git"; - rev = "e73f55b866e437c7bf04c7d262de7c205c47bbca"; - sha256 = "0msh5sv6g0k69fi0qv4xi1g89bfwai099f0ycjb8a69mnjq8x21n"; - }; - phases = "installPhase"; - installPhase = "ln -s $src $out"; - }; - "bignumber" = pkgs.stdenv.mkDerivation { name = "bignumber"; version = "760d11b41ece31b8cdd3c53349c5c2fd48d3ff89"; @@ -629,6 +617,18 @@ let installPhase = "ln -s $src $out"; }; + "js-bigints" = pkgs.stdenv.mkDerivation { + name = "js-bigints"; + version = "36a7d8ac75a7230043ae511f3145f9ed130954a9"; + src = pkgs.fetchgit { + url = "https://github.com/purescript-contrib/purescript-js-bigints"; + rev = "36a7d8ac75a7230043ae511f3145f9ed130954a9"; + sha256 = "0q3j7jl6ga63ygw2hmfigxjq8nbj56p3bn94x7vnhnhq7996bkpd"; + }; + phases = "installPhase"; + installPhase = "ln -s $src $out"; + }; + "js-date" = pkgs.stdenv.mkDerivation { name = "js-date"; version = "v8.0.0"; diff --git a/templates/ctl-scaffold/spago.dhall b/templates/ctl-scaffold/spago.dhall index d56a902bcb..9880991208 100644 --- a/templates/ctl-scaffold/spago.dhall +++ b/templates/ctl-scaffold/spago.dhall @@ -5,7 +5,7 @@ You can edit this file as you like. { name = "ctl-package-example" , dependencies = [ "aff" - , "bigints" + , "js-bigints" , "cardano-transaction-lib" , "datetime" , "effect" diff --git a/templates/ctl-scaffold/test/Main.purs b/templates/ctl-scaffold/test/Main.purs index d3f13d060c..1ea12ce4e2 100644 --- a/templates/ctl-scaffold/test/Main.purs +++ b/templates/ctl-scaffold/test/Main.purs @@ -14,7 +14,6 @@ import Contract.Test.Plutip , withWallets ) import Contract.Test.Utils (exitCode, interruptOnSignal) -import Data.BigInt (fromInt) as BigInt import Data.Posix.Signal (Signal(SIGINT)) import Effect.Aff ( Milliseconds(Milliseconds) @@ -22,6 +21,7 @@ import Effect.Aff , effectCanceler , launchAff ) +import JS.BigInt (fromInt) as BigInt import Mote (group, test) import Scaffold (contract) import Test.Spec.Runner (defaultConfig) diff --git a/test/ApplyArgs.purs b/test/ApplyArgs.purs index 9e08c782bb..da50480104 100644 --- a/test/ApplyArgs.purs +++ b/test/ApplyArgs.purs @@ -16,12 +16,12 @@ import Control.Monad.Error.Class (class MonadError) import Ctl.Internal.ApplyArgs (applyArgs) import Ctl.Internal.Cardano.TextEnvelope (TextEnvelope) import Ctl.Internal.Test.TestPlanM (TestPlanM, interpret) -import Data.BigInt (fromInt) import Data.List.Lazy (replicate) import Data.Profunctor.Choice (left) import Effect.Aff (Error, error, throwError) import Foreign.Object (Object) import Foreign.Object as Object +import JS.BigInt (fromInt) import Mote (group, test) import Test.Spec.Assertions (shouldEqual) diff --git a/test/BalanceTx/ChangeGeneration.purs b/test/BalanceTx/ChangeGeneration.purs index 3cced8073a..b0ae5eff29 100644 --- a/test/BalanceTx/ChangeGeneration.purs +++ b/test/BalanceTx/ChangeGeneration.purs @@ -5,7 +5,7 @@ import Prelude import Contract.Test (ContractTest, InitialUTxOs, withKeyWallet, withWallets) import Ctl.Examples.ChangeGeneration (checkChangeOutputsDistribution) import Ctl.Internal.Test.TestPlanM (TestPlanM) -import Data.BigInt (fromInt) as BigInt +import JS.BigInt (fromInt) as BigInt import Mote (group, test) suite :: TestPlanM ContractTest Unit diff --git a/test/BalanceTx/Collateral.purs b/test/BalanceTx/Collateral.purs index 152a759466..4bad2e75a5 100644 --- a/test/BalanceTx/Collateral.purs +++ b/test/BalanceTx/Collateral.purs @@ -24,7 +24,6 @@ import Ctl.Internal.Test.TestPlanM (TestPlanM) import Ctl.Internal.Types.ProtocolParameters (CoinsPerUtxoUnit) import Ctl.Internal.Types.Transaction (TransactionHash, TransactionInput) import Data.Array (length, range, replicate, zipWith) as Array -import Data.BigInt (fromInt) as BigInt import Data.List (singleton) as List import Data.Map (fromFoldable) as Map import Data.Maybe (Maybe(Just)) @@ -36,6 +35,7 @@ import Data.UInt (UInt) import Data.UInt (fromInt, toInt) as UInt import Effect.Aff (Aff) import Effect.Class (liftEffect) +import JS.BigInt (fromInt) as BigInt import Mote (group, test) import Test.Ctl.Fixtures ( currencySymbol1 diff --git a/test/BalanceTx/Time.purs b/test/BalanceTx/Time.purs index c910f46b08..8d265bb511 100644 --- a/test/BalanceTx/Time.purs +++ b/test/BalanceTx/Time.purs @@ -29,9 +29,9 @@ import Ctl.Internal.Test.TestPlanM (TestPlanM) import Ctl.Internal.Types.BigNum (BigNum) import Ctl.Internal.Types.BigNum (fromInt, toInt) as BigNum import Ctl.Internal.Types.Interval (Interval) -import Data.BigInt (fromString) as BigInt import Effect.Aff (Aff) import Effect.Exception (error) +import JS.BigInt (fromString) as BigInt import Mote (group, test) import Partial.Unsafe (unsafePartial) import Test.Spec.Assertions (fail, shouldEqual) diff --git a/test/Blockfrost.purs b/test/Blockfrost.purs index 287373ac8c..fb3d84732d 100644 --- a/test/Blockfrost.purs +++ b/test/Blockfrost.purs @@ -29,7 +29,6 @@ import Ctl.Internal.Service.Blockfrost import Ctl.Internal.Service.Blockfrost as Blockfrost import Data.Array ((!!)) import Data.Bifunctor (lmap) -import Data.BigInt as BigInt import Data.Either (Either(Left, Right), fromRight, isRight) import Data.FoldableWithIndex (forWithIndex_) import Data.Log.Formatter.Pretty (prettyFormatter) @@ -40,6 +39,7 @@ import Data.Tuple.Nested ((/\)) import Effect (Effect) import Effect.Aff (Aff, error, launchAff_) import Effect.Class.Console (log) +import JS.BigInt as BigInt import Mote (group, test) import Node.Process (argv) import Partial.Unsafe (unsafePartial) diff --git a/test/Blockfrost/GenerateFixtures/NativeScript.purs b/test/Blockfrost/GenerateFixtures/NativeScript.purs index 256674a30f..5d2c45a1ae 100644 --- a/test/Blockfrost/GenerateFixtures/NativeScript.purs +++ b/test/Blockfrost/GenerateFixtures/NativeScript.purs @@ -31,8 +31,8 @@ import Ctl.Internal.Service.Blockfrost ) import Ctl.Internal.Service.Blockfrost (getScriptByHash) as Blockfrost import Data.Array (mapWithIndex) -import Data.BigInt (fromInt) as BigInt import Data.UInt (fromInt) as UInt +import JS.BigInt (fromInt) as BigInt import Test.Ctl.Blockfrost.GenerateFixtures.Helpers ( blockfrostBackend , getSkeyFilepathFromEnv diff --git a/test/Blockfrost/GenerateFixtures/ScriptInfo.purs b/test/Blockfrost/GenerateFixtures/ScriptInfo.purs index ed1d754f80..46421748f3 100644 --- a/test/Blockfrost/GenerateFixtures/ScriptInfo.purs +++ b/test/Blockfrost/GenerateFixtures/ScriptInfo.purs @@ -35,9 +35,9 @@ import Ctl.Internal.Service.Blockfrost ) import Ctl.Internal.Service.Blockfrost (getScriptInfo) as Blockfrost import Data.Array (zip) as Array -import Data.BigInt (fromInt) as BigInt import Data.FoldableWithIndex (forWithIndex_) import Data.UInt (fromInt) as UInt +import JS.BigInt (fromInt) as BigInt import Test.Ctl.Blockfrost.GenerateFixtures.Helpers ( blockfrostBackend , getSkeyFilepathFromEnv diff --git a/test/CoinSelection/CoinSelection.purs b/test/CoinSelection/CoinSelection.purs index 6059a383e7..499db9afa7 100644 --- a/test/CoinSelection/CoinSelection.purs +++ b/test/CoinSelection/CoinSelection.purs @@ -29,7 +29,6 @@ import Ctl.Internal.Types.ByteArray (byteArrayFromAscii) import Ctl.Internal.Types.OutputDatum (OutputDatum(NoOutputDatum)) import Ctl.Internal.Types.TokenName (TokenName, mkTokenName) import Ctl.Internal.Types.Transaction (TransactionInput) -import Data.BigInt (fromInt) as BigInt import Data.Foldable (fold, foldMap) import Data.Generic.Rep (class Generic) import Data.Map (fromFoldable, values) as Map @@ -44,6 +43,7 @@ import Effect.Aff (Aff) import Effect.Class (class MonadEffect, liftEffect) import Effect.Exception (throw) import Effect.Unsafe (unsafePerformEffect) +import JS.BigInt (fromInt) as BigInt import Mote (group, test) import Partial.Unsafe (unsafePartial) import Test.Ctl.CoinSelection.Arbitrary diff --git a/test/Data.purs b/test/Data.purs index de27966d2c..8271ca5a67 100644 --- a/test/Data.purs +++ b/test/Data.purs @@ -34,8 +34,6 @@ import Ctl.Internal.Types.BigNum as BigNum import Ctl.Internal.Types.ByteArray (hexToByteArrayUnsafe) import Ctl.Internal.Types.PlutusData (PlutusData(Constr, Integer)) import Data.Array.NonEmpty (fromNonEmpty) as NEArray -import Data.BigInt (BigInt) -import Data.BigInt as BigInt import Data.Either (Either(Left, Right)) import Data.Generic.Rep as G import Data.Maybe (Maybe(Just, Nothing), fromJust, maybe) @@ -47,6 +45,8 @@ import Data.Tuple (Tuple(Tuple), uncurry) import Data.Tuple.Nested ((/\)) import Effect.Aff (Aff) import Effect.Exception (Error) +import JS.BigInt (BigInt) +import JS.BigInt as BigInt import Mote (group, test) import Partial.Unsafe (unsafePartial) import Test.QuickCheck ((===)) diff --git a/test/Data/Interval.purs b/test/Data/Interval.purs index 8d313a46bb..8808d9ad4d 100644 --- a/test/Data/Interval.purs +++ b/test/Data/Interval.purs @@ -33,11 +33,11 @@ import Ctl.Internal.Types.Interval , genUpperRay , mkFiniteInterval ) -import Data.BigInt (BigInt) -import Data.BigInt as BigInt import Data.Generic.Rep (class Generic) import Data.Newtype (class Newtype) import Data.Show.Generic (genericShow) +import JS.BigInt (BigInt) +import JS.BigInt as BigInt import Mote (group, test) import Test.QuickCheck (Result, arbitrary, quickCheck, (===)) import Test.QuickCheck.Gen (Gen) diff --git a/test/Deserialization.purs b/test/Deserialization.purs index 8f51d601a9..f85cf66b46 100644 --- a/test/Deserialization.purs +++ b/test/Deserialization.purs @@ -40,7 +40,6 @@ import Ctl.Internal.Test.TestPlanM (TestPlanM) import Ctl.Internal.Types.BigNum (fromBigInt, toBigInt) as BigNum import Ctl.Internal.Types.Transaction (TransactionInput) as T import Data.Array as Array -import Data.BigInt as BigInt import Data.Either (hush) import Data.Foldable (fold) import Data.Maybe (isJust, isNothing) @@ -50,6 +49,7 @@ import Effect (Effect) import Effect.Aff (Aff) import Effect.Class (class MonadEffect, liftEffect) import Effect.Exception (Error, error) +import JS.BigInt as BigInt import Mote (group, skip, test) import Test.Ctl.Fixtures ( nativeScriptFixture1 diff --git a/test/Fixtures.purs b/test/Fixtures.purs index bbd8b1e756..b76d11831e 100644 --- a/test/Fixtures.purs +++ b/test/Fixtures.purs @@ -205,7 +205,6 @@ import Ctl.Internal.Types.TransactionMetadata , TransactionMetadatumLabel(TransactionMetadatumLabel) ) import Data.Array as Array -import Data.BigInt as BigInt import Data.Either (fromRight, hush) import Data.Map as Map import Data.Maybe (Maybe(Just, Nothing), fromJust) @@ -215,6 +214,7 @@ import Data.Set (singleton) as Set import Data.Tuple.Nested ((/\)) import Data.UInt as UInt import Effect (Effect) +import JS.BigInt as BigInt import Node.Encoding (Encoding(UTF8)) import Node.FS.Sync (readTextFile) import Partial.Unsafe (unsafePartial) diff --git a/test/Hashing.purs b/test/Hashing.purs index d762a8a233..11c92b5a28 100644 --- a/test/Hashing.purs +++ b/test/Hashing.purs @@ -22,10 +22,10 @@ import Ctl.Internal.Types.ByteArray import Ctl.Internal.Types.PlutusData (PlutusData(Integer)) import Ctl.Internal.Types.Scripts (PlutusScript, plutusV1Script, plutusV2Script) import Ctl.Internal.Types.Transaction (DataHash) -import Data.BigInt (fromInt) import Data.Maybe (fromJust) import Data.Newtype (wrap) import Effect.Aff (Aff) +import JS.BigInt (fromInt) import Mote (group, test) import Partial.Unsafe (unsafePartial) import Test.Ctl.Fixtures (plutusDataFixture7) diff --git a/test/Partition.purs b/test/Partition.purs index 77b86eb1ab..dfa9e868f5 100644 --- a/test/Partition.purs +++ b/test/Partition.purs @@ -12,8 +12,6 @@ import Ctl.Internal.Test.TestPlanM (TestPlanM) import Data.Array (elem) as Array import Data.Array.NonEmpty (NonEmptyArray, (:)) import Data.Array.NonEmpty (length, singleton, sort, zip) as NEArray -import Data.BigInt (BigInt) -import Data.BigInt (fromInt) as BigInt import Data.Foldable (all, foldMap, sum) import Data.Maybe (Maybe(Just, Nothing), isNothing) import Data.Newtype (class Newtype, unwrap) @@ -21,6 +19,8 @@ import Data.Ord.Max (Max(Max)) import Data.Ord.Min (Min(Min)) import Data.Tuple.Nested ((/\)) import Effect.Aff (Aff) +import JS.BigInt (BigInt) +import JS.BigInt (fromInt) as BigInt import Mote (group, test) import Test.QuickCheck.Arbitrary (class Arbitrary, arbitrary) import Test.QuickCheck.Gen (suchThat) diff --git a/test/Plutip/Contract.purs b/test/Plutip/Contract.purs index cd9c3e0c3c..63652ec96e 100644 --- a/test/Plutip/Contract.purs +++ b/test/Plutip/Contract.purs @@ -157,7 +157,6 @@ import Ctl.Internal.Wallet.Cip30Mock , withCip30Mock ) import Data.Array (head, (!!)) -import Data.BigInt as BigInt import Data.Either (Either(Left, Right), isLeft, isRight) import Data.Foldable (fold, foldM, length) import Data.Lens (view) @@ -170,6 +169,7 @@ import Data.Tuple.Nested (type (/\), (/\)) import Data.UInt (UInt) import Effect.Class (liftEffect) import Effect.Exception (throw) +import JS.BigInt as BigInt import Mote (group, skip, test) import Partial.Unsafe (unsafePartial) import Safe.Coerce (coerce) diff --git a/test/Plutip/Contract/Assert.purs b/test/Plutip/Contract/Assert.purs index 543c4c39ea..824b65341e 100644 --- a/test/Plutip/Contract/Assert.purs +++ b/test/Plutip/Contract/Assert.purs @@ -23,12 +23,12 @@ import Ctl.Examples.ContractTestUtils as ContractTestUtils import Ctl.Examples.Helpers (mkCurrencySymbol, mkTokenName) import Ctl.Examples.PlutusV2.Scripts.AlwaysMints (alwaysMintsPolicyV2) import Data.Array (head) -import Data.BigInt as BigInt import Data.Either (isLeft, isRight) import Data.Newtype (wrap) import Data.Tuple.Nested (type (/\), (/\)) import Effect.Class (liftEffect) import Effect.Exception (throw) +import JS.BigInt as BigInt import Mote (group, test) import Test.Ctl.Fixtures (cip25MetadataFixture1) import Test.Spec.Assertions (shouldEqual, shouldSatisfy) diff --git a/test/Plutip/Contract/OgmiosMempool.purs b/test/Plutip/Contract/OgmiosMempool.purs index dc9a772236..269ec587a8 100644 --- a/test/Plutip/Contract/OgmiosMempool.purs +++ b/test/Plutip/Contract/OgmiosMempool.purs @@ -18,7 +18,7 @@ import Contract.Test.Mote (TestPlanM) import Contract.Transaction (awaitTxConfirmed) import Ctl.Examples.PlutusV2.InlineDatum as InlineDatum import Data.Array (length) -import Data.BigInt as BigInt +import JS.BigInt as BigInt import Mote (group, skip, test) import Test.Spec.Assertions (shouldEqual) diff --git a/test/Plutip/ExUnits.purs b/test/Plutip/ExUnits.purs index 73c4332344..b05bc93736 100644 --- a/test/Plutip/ExUnits.purs +++ b/test/Plutip/ExUnits.purs @@ -11,9 +11,9 @@ import Contract.Test (ContractTest, InitialUTxOs, withKeyWallet, withWallets) import Contract.Transaction (awaitTxConfirmed) import Ctl.Examples.ExUnits as ExUnits import Ctl.Internal.Test.TestPlanM (TestPlanM) -import Data.BigInt as BigInt import Data.Either (isLeft) import Effect.Aff (try) +import JS.BigInt as BigInt import Mote (test) import Test.Spec.Assertions (shouldSatisfy) diff --git a/test/Plutip/Staking.purs b/test/Plutip/Staking.purs index 538913c37e..d4d698ed04 100644 --- a/test/Plutip/Staking.purs +++ b/test/Plutip/Staking.purs @@ -74,7 +74,6 @@ import Ctl.Examples.AlwaysSucceeds (alwaysSucceedsScript) import Ctl.Examples.IncludeDatum (only42Script) import Data.Array (head, (!!)) import Data.Array as Array -import Data.BigInt as BigInt import Data.Foldable (for_) import Data.Maybe (Maybe(Just, Nothing), fromJust) import Data.Newtype (unwrap) @@ -95,6 +94,7 @@ import Effect.Aff import Effect.Aff.Class (liftAff) import Effect.Class (liftEffect) import Effect.Exception (error) +import JS.BigInt as BigInt import Mote (group, skip, test) import Partial.Unsafe (unsafePartial) import Test.Ctl.Plutip.Common (config) as Common diff --git a/test/Plutip/UtxoDistribution.purs b/test/Plutip/UtxoDistribution.purs index 04d1f2f749..fcc796eb1d 100644 --- a/test/Plutip/UtxoDistribution.purs +++ b/test/Plutip/UtxoDistribution.purs @@ -45,8 +45,6 @@ import Ctl.Internal.Test.TestPlanM (TestPlanM) import Ctl.Internal.Test.UtxoDistribution (encodeDistribution, keyWallets) import Data.Array (foldl, head, replicate, zip) import Data.Array.NonEmpty (fromNonEmpty) as NEArray -import Data.BigInt (BigInt) -import Data.BigInt (fromInt, toString) as BigInt import Data.Foldable (intercalate) import Data.FoldableWithIndex (foldlWithIndex) import Data.Map (empty, insert, isEmpty) as Map @@ -58,6 +56,8 @@ import Data.Tuple.Nested (type (/\), (/\)) import Effect.Aff (Aff) import Effect.Class (liftEffect) import Effect.Exception (throw) +import JS.BigInt (BigInt) +import JS.BigInt (fromInt, toString) as BigInt import Mote (group, test) import Test.Ctl.Plutip.Common (config, privateStakeKey) import Test.QuickCheck (class Arbitrary, arbitrary) diff --git a/test/Plutus/Conversion/Value.purs b/test/Plutus/Conversion/Value.purs index 6cce4c9509..36d8a44386 100644 --- a/test/Plutus/Conversion/Value.purs +++ b/test/Plutus/Conversion/Value.purs @@ -11,12 +11,12 @@ import Ctl.Internal.Plutus.Types.Value (Value) as Plutus import Ctl.Internal.Plutus.Types.Value as Plutus.Value import Ctl.Internal.Test.TestPlanM (TestPlanM) import Data.Array (length, range, zip) -import Data.BigInt (fromInt) import Data.Maybe (fromJust) import Data.Traversable (for_) import Data.Tuple (fst, snd) import Data.Tuple.Nested (type (/\), (/\)) import Effect.Aff (Aff) +import JS.BigInt (fromInt) import Mote (group, test) import Partial.Unsafe (unsafePartial) import Test.Ctl.Fixtures (currencySymbol1, tokenName1, tokenName2) diff --git a/test/Plutus/Time.purs b/test/Plutus/Time.purs index 0187c9c080..97ff2fcd2a 100644 --- a/test/Plutus/Time.purs +++ b/test/Plutus/Time.purs @@ -44,11 +44,11 @@ import Ctl.Internal.Types.Interval , ToOnChainPosixTimeRangeError(PosixTimeToSlotError', SlotToPosixTimeError') ) import Ctl.Internal.Types.SystemStart (sysStartFromOgmiosTimestampUnsafe) -import Data.BigInt as BigInt import Data.Int as Int import Data.Maybe (Maybe(Just, Nothing)) import Data.Newtype (unwrap, wrap) import Effect.Aff (Aff) +import JS.BigInt as BigInt import Mote (group) import Test.Ctl.Utils (toFromAesonTest, toFromAesonTestWith) diff --git a/test/Serialization.purs b/test/Serialization.purs index aabb3f997e..64c3a6fb39 100644 --- a/test/Serialization.purs +++ b/test/Serialization.purs @@ -22,7 +22,6 @@ import Ctl.Internal.Types.BigNum (fromString, one) as BN import Ctl.Internal.Types.ByteArray (byteArrayToHex, hexToByteArrayUnsafe) import Ctl.Internal.Types.CborBytes (cborBytesToHex) import Ctl.Internal.Types.PlutusData as PD -import Data.BigInt as BigInt import Data.Either (hush) import Data.Maybe (Maybe, isJust, isNothing) import Data.Newtype (unwrap, wrap) @@ -30,6 +29,7 @@ import Data.Tuple.Nested ((/\)) import Effect.Aff (Aff) import Effect.Class (liftEffect) import Effect.Exception (error) +import JS.BigInt as BigInt import Mote (group, test) import Test.Ctl.Fixtures ( txBinaryFixture1 diff --git a/test/Transaction.purs b/test/Transaction.purs index 7b0692f7d8..da44aa6e65 100644 --- a/test/Transaction.purs +++ b/test/Transaction.purs @@ -31,7 +31,6 @@ import Ctl.Internal.Types.Scripts ( Language(PlutusV1, PlutusV2) , PlutusScript(PlutusScript) ) -import Data.BigInt as BigInt import Data.Either (Either(Left, Right)) import Data.Maybe (Maybe(Just, Nothing), fromJust) import Data.Newtype (over, unwrap) @@ -40,6 +39,7 @@ import Effect (Effect) import Effect.Aff (Aff) import Effect.Class (liftEffect) import Effect.Exception (throw) +import JS.BigInt as BigInt import Mote (group, test) import Partial.Unsafe (unsafePartial) import Test.Ctl.Fixtures.CostModels (costModelsFixture1) diff --git a/test/Types/Interval.purs b/test/Types/Interval.purs index 727e1d5215..e671c55a83 100644 --- a/test/Types/Interval.purs +++ b/test/Types/Interval.purs @@ -33,13 +33,13 @@ import Ctl.Internal.Types.Interval ) import Ctl.Internal.Types.SystemStart (SystemStart) import Data.Bifunctor (lmap) -import Data.BigInt (fromInt, fromString) as BigInt import Data.Either (Either(Left, Right), either) import Data.Maybe (fromJust) import Data.Newtype (unwrap) import Data.Traversable (traverse_) import Effect (Effect) import Effect.Exception (error) +import JS.BigInt (fromInt, fromString) as BigInt import Mote (group, test) import Node.Encoding (Encoding(UTF8)) import Node.FS.Sync (readTextFile) From 6e4debe87ddbafaa3c77033888f9c998e28cd7ca Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Tue, 17 Oct 2023 18:30:30 +0400 Subject: [PATCH 59/85] Support nodejs bundling. Proxy-pass kupo requests when serving via esbuild --- Makefile | 23 +++++++++++---- esbuild/config.js | 62 ++++++++++++++++++++++++---------------- esbuild/serve.js | 55 +++++++++++++++++++++++++++++++++-- package-lock.json | 21 ++++++++++++++ package.json | 1 + webpack.config.cjs | 71 ++++++++++++++++++++++++++++++---------------- 6 files changed, 176 insertions(+), 57 deletions(-) diff --git a/Makefile b/Makefile index 09bddd630b..3b2b7300d4 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,21 @@ SHELL := bash .ONESHELL: -.PHONY: esbuild-bundle esbuild-serve webpack-bundle webpack-serve check-format format query-testnet-tip clean check-explicit-exports spago-build create-bundle-entrypoint create-html-entrypoint +.PHONY: esbuild-bundle esbuild-serve webpack-bundle webpack-serve check-format format query-testnet-tip clean check-explicit-exports spago-build create-bundle-entrypoint create-html-entrypoint delete-bundle-entrypoint .SHELLFLAGS := -eu -o pipefail -c ps-sources := $(shell fd --no-ignore-parent -epurs) nix-sources := $(shell fd --no-ignore-parent -enix --exclude='spago*') -js-sources := $(shell fd --no-ignore-parent -ejs) -# points to one of the example PureScript modules in examples/ +js-sources := $(shell fd --no-ignore-parent -ejs -ecjs) + +### Bundler setup + +# The main Purescript module ps-entrypoint := Ctl.Examples.ByUrl +# The entry point function in the main PureScript module ps-entrypoint-function := main +# Whether to bundle for the browser +browser-runtime := 1 # Use "1" for true and "" for false + preview-node-ipc = $(shell docker volume inspect store_node-preview-ipc | jq -r '.[0].Mountpoint') preprod-node-ipc = $(shell docker volume inspect store_node-preprod-ipc | jq -r '.[0].Mountpoint') serve-port := 4008 @@ -20,6 +27,9 @@ create-bundle-entrypoint: @mkdir -p dist/ @echo 'import("../output/${ps-entrypoint}/index.js").then(m => m.${ps-entrypoint-function}());' > ./dist/entrypoint.js +delete-bundle-entrypoint: + @rm -f ./dist/entrypoint.js + create-html-entrypoint: @mkdir -p dist/ @cat << EOF > dist/index.html @@ -31,15 +41,16 @@ create-html-entrypoint: esbuild-bundle: spago-build create-bundle-entrypoint @mkdir -p dist/ - @BROWSER_RUNTIME=1 node esbuild/bundle.js ./dist/entrypoint.js dist/index.js + BROWSER_RUNTIME=${browser-runtime} node esbuild/bundle.js ./dist/entrypoint.js dist/index.js + @make delete-bundle-entrypoint esbuild-serve: spago-build create-bundle-entrypoint create-html-entrypoint - BROWSER_RUNTIME=1 node esbuild/serve.js ./dist/entrypoint.js dist/index.js dist/ ${serve-port} webpack-bundle: spago-build create-bundle-entrypoint - BROWSER_RUNTIME=1 webpack --mode=production \ + BROWSER_RUNTIME=${browser-runtime} webpack --mode=production \ -o dist/ --env entry=./dist/entrypoint.js + @make delete-bundle-entrypoint webpack-serve: spago-build create-bundle-entrypoint create-html-entrypoint BROWSER_RUNTIME=1 webpack-dev-server --progress \ diff --git a/esbuild/config.js b/esbuild/config.js index c3294b5f8e..c1785847af 100644 --- a/esbuild/config.js +++ b/esbuild/config.js @@ -1,27 +1,41 @@ import { wasmLoader } from "esbuild-plugin-wasm"; import { polyfillNode } from "esbuild-plugin-polyfill-node"; -export const buildOptions = ({ entryPoint, outfile }) => ({ - entryPoints: [entryPoint], - outfile: outfile, - define: { - BROWSER_RUNTIME: process.env.BROWSER_RUNTIME, - }, - plugins: [ - polyfillNode({ - polyfills: { - crypto: true, - fs: true, - os: true, - }, - }), - wasmLoader({ - mode: "deferred", - }), - ], - bundle: true, - platform: "browser", - format: "esm", - treeShaking: true, - logLevel: "error", -}); +const isBrowser = !!process.env.BROWSER_RUNTIME; + +export const buildOptions = ({ entryPoint, outfile }) => { + const config = { + entryPoints: [entryPoint], + outfile: outfile, + define: { + BROWSER_RUNTIME: isBrowser ? "true" : '""', + }, + plugins: [ + wasmLoader({ + mode: "deferred", + }), + ], + bundle: true, + platform: isBrowser ? "browser" : "node", + format: "esm", + treeShaking: true, + logLevel: "error", + }; + + // https://esbuild.github.io/api/#packages + if (!isBrowser) { + config.packages = "external"; + } else { + config.plugins.push( + polyfillNode({ + polyfills: { + crypto: true, + fs: true, + os: true, + }, + }) + ); + } + + return config; +}; diff --git a/esbuild/serve.js b/esbuild/serve.js index c079f1cc8e..00ad2ffe37 100755 --- a/esbuild/serve.js +++ b/esbuild/serve.js @@ -1,5 +1,7 @@ import * as esbuild from "esbuild"; import { buildOptions } from "./config.js"; +import http from "node:http"; +import * as url from "url"; if (process.argv.length < 6) { throw `usage: nodejs serve.js ENTRY_POINT OUTPUT_FILE SERVE_DIR PORT`; @@ -13,10 +15,57 @@ const ctx = await esbuild.context( ); const config = { - port: parseInt(process.argv[5]), + // Use the next port for esbuild server, + // we need a port for our proxy (see below). + port: parseInt(process.argv[5]) + 1, servedir: process.argv[4], }; -console.log("serving:", config); +let { host, port } = await ctx.serve(config); -await ctx.serve(config); +// Proxy Kupo to esbuild server +const kupoEndpoint = process.env.KUPO_HOST || "http://localhost:1442"; +const kupoHost = url.parse(kupoEndpoint).hostname; +const kupoPort = url.parse(kupoEndpoint).port || 80; + +http + .createServer((req, res) => { + const options = { + hostname: host, + port: port, + path: req.url, + method: req.method, + headers: req.headers, + }; + + // Forward each incoming request to esbuild + const proxyReq = http.request(options, proxyRes => { + // If esbuild returns "not found" and the path starts from /kupo/ + if (proxyRes.statusCode === 404 && req.url.startsWith("/kupo/")) { + // Connect to Kupo running on port 1442 + const kupoOptions = { + hostname: kupoHost, + port: kupoPort, + path: req.url.slice("/kupo".length), + method: req.method, + headers: req.headers, + }; + // Request the corresponding path + http + .request(kupoOptions, kupoRes => { + // Pipe the response from Kupo back to the client + res.writeHead(kupoRes.statusCode, kupoRes.headers); + kupoRes.pipe(res, { end: true }); + }) + .end(); + } else { + // Otherwise, forward the response from esbuild to the client + res.writeHead(proxyRes.statusCode, proxyRes.headers); + proxyRes.pipe(res, { end: true }); + } + }); + + // Forward the body of the request to esbuild + req.pipe(proxyReq, { end: true }); + }) + .listen(parseInt(process.argv[5])); diff --git a/package-lock.json b/package-lock.json index 209e8241c4..2314c4c567 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,6 +28,7 @@ "puppeteer-core": "^15.3.2", "reconnecting-websocket": "4.4.0", "uniqid": "5.4.0", + "utf-8-validate": "^5.0.10", "ws": "8.4.0", "xhr2": "0.2.1" }, @@ -5801,6 +5802,18 @@ "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", "dev": true }, + "node_modules/utf-8-validate": { + "version": "5.0.10", + "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz", + "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==", + "hasInstallScript": true, + "dependencies": { + "node-gyp-build": "^4.3.0" + }, + "engines": { + "node": ">=6.14.2" + } + }, "node_modules/util": { "version": "0.12.5", "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", @@ -10711,6 +10724,14 @@ } } }, + "utf-8-validate": { + "version": "5.0.10", + "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz", + "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==", + "requires": { + "node-gyp-build": "^4.3.0" + } + }, "util": { "version": "0.12.5", "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", diff --git a/package.json b/package.json index ddc811b7e3..c627e3f2c5 100755 --- a/package.json +++ b/package.json @@ -53,6 +53,7 @@ "puppeteer-core": "^15.3.2", "reconnecting-websocket": "4.4.0", "uniqid": "5.4.0", + "utf-8-validate": "^5.0.10", "ws": "8.4.0", "xhr2": "0.2.1" }, diff --git a/webpack.config.cjs b/webpack.config.cjs index 61c2e77fb9..f492dc070a 100644 --- a/webpack.config.cjs +++ b/webpack.config.cjs @@ -4,10 +4,11 @@ const path = require("path"); const webpack = require("webpack"); const NodePolyfillPlugin = require("node-polyfill-webpack-plugin"); +const isBrowser = !!process.env.BROWSER_RUNTIME; + module.exports = env => { - return { + const config = { mode: "development", - experiments: { asyncWebAssembly: false, layers: false, @@ -23,10 +24,10 @@ module.exports = env => { devServer: { static: { - directory: path.join(__dirname, 'dist'), + directory: path.join(__dirname, "dist"), }, client: { - overlay: false + overlay: false, }, port: 4008, proxy: { @@ -47,14 +48,34 @@ module.exports = env => { filename: "index.js", library: { type: "module", - } + }, }, resolve: { // We use node_modules provided by Nix shell via an environment variable modules: [process.env.NODE_PATH], extensions: [".js"], - fallback: { + }, + + plugins: [ + new webpack.DefinePlugin({ + BROWSER_RUNTIME: isBrowser, + }), + new webpack.LoaderOptionsPlugin({ + debug: true, + }), + // ContextReplacementPlugin is used just to suppress a webpack warning: + // "Critical dependency: the request of a dependency is an expression" + // See https://stackoverflow.com/a/59235546/17365145 + new webpack.ContextReplacementPlugin(/cardano-serialization-lib-browser/), + new webpack.ContextReplacementPlugin(/cardano-serialization-lib-nodejs/), + ], + }; + + config.target = isBrowser ? "web" : "node18"; + config.node = isBrowser ? {} : { __dirname: true }; + config.resolve.fallback = isBrowser + ? { buffer: require.resolve("buffer/"), http: false, url: false, @@ -69,25 +90,27 @@ module.exports = env => { fs: false, readline: false, child_process: false, - }, - }, + } + : {}; - plugins: [ - new webpack.DefinePlugin({ - BROWSER_RUNTIME: !!process.env.BROWSER_RUNTIME, - }), - new NodePolyfillPlugin(), - new webpack.LoaderOptionsPlugin({ - debug: true, - }), + // Preserves console.log calls in NodeJS + // https://stackoverflow.com/a/71024096/17365145 + config.optimization = isBrowser + ? {} + : { + minimize: false, + }; + + if (isBrowser) { + // Provide top-level `Buffer` + config.plugins.push( new webpack.ProvidePlugin({ Buffer: ["buffer", "Buffer"], - }), - // ContextReplacementPlugin is used just to suppress a webpack warning: - // "Critical dependency: the request of a dependency is an expression" - // See https://stackoverflow.com/a/59235546/17365145 - new webpack.ContextReplacementPlugin(/cardano-serialization-lib-browser/), - new webpack.ContextReplacementPlugin(/cardano-serialization-lib-nodejs/), - ], - }; + }) + ); + // Provide NodeJS polyfills + config.plugins.push(new NodePolyfillPlugin()); + } + + return config; }; From 080e06bb872564742b9d05652a80d126a36f1189 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Tue, 17 Oct 2023 20:41:23 +0400 Subject: [PATCH 60/85] Update the template --- esbuild/bundle.js | 2 +- esbuild/serve.js | 5 +- templates/ctl-scaffold/Makefile | 31 +- templates/ctl-scaffold/esbuild/bundle.js | 2 +- templates/ctl-scaffold/esbuild/config.js | 62 +- templates/ctl-scaffold/esbuild/serve.js | 58 +- templates/ctl-scaffold/flake.lock | 8 +- templates/ctl-scaffold/flake.nix | 2 +- templates/ctl-scaffold/package-lock.json | 663 +--------------------- templates/ctl-scaffold/package.json | 1 + templates/ctl-scaffold/packages.dhall | 2 +- templates/ctl-scaffold/spago-packages.nix | 6 +- templates/ctl-scaffold/webpack.config.cjs | 176 +++--- 13 files changed, 244 insertions(+), 774 deletions(-) diff --git a/esbuild/bundle.js b/esbuild/bundle.js index 8b114bcfda..7ff2cc3a3e 100755 --- a/esbuild/bundle.js +++ b/esbuild/bundle.js @@ -2,7 +2,7 @@ import * as esbuild from "esbuild"; import { buildOptions } from "./config.js"; if (process.argv.length < 4) { - throw `usage: nodejs bundle.js ENTRY_POINT OUTPUT_FILENAME`; + throw `usage: node bundle.js ENTRY_POINT OUTPUT_FILENAME`; } esbuild.build( diff --git a/esbuild/serve.js b/esbuild/serve.js index 00ad2ffe37..ecfc84a915 100755 --- a/esbuild/serve.js +++ b/esbuild/serve.js @@ -4,7 +4,7 @@ import http from "node:http"; import * as url from "url"; if (process.argv.length < 6) { - throw `usage: nodejs serve.js ENTRY_POINT OUTPUT_FILE SERVE_DIR PORT`; + throw `usage: node serve.js ENTRY_POINT OUTPUT_FILE SERVE_DIR PORT`; } const ctx = await esbuild.context( @@ -23,7 +23,8 @@ const config = { let { host, port } = await ctx.serve(config); -// Proxy Kupo to esbuild server +// Proxy Kupo to esbuild server. This is needed due to CORS + const kupoEndpoint = process.env.KUPO_HOST || "http://localhost:1442"; const kupoHost = url.parse(kupoEndpoint).hostname; const kupoPort = url.parse(kupoEndpoint).port || 80; diff --git a/templates/ctl-scaffold/Makefile b/templates/ctl-scaffold/Makefile index 0e4ba027fb..3867c13199 100644 --- a/templates/ctl-scaffold/Makefile +++ b/templates/ctl-scaffold/Makefile @@ -1,15 +1,21 @@ SHELL := bash -.PHONY: esbuild-bundle esbuild-serve .ONESHELL: +.PHONY: esbuild-bundle esbuild-serve webpack-bundle webpack-serve check-format format query-testnet-tip clean check-explicit-exports spago-build create-bundle-entrypoint create-html-entrypoint delete-bundle-entrypoint .SHELLFLAGS := -eu -o pipefail -c - ps-sources := $(shell fd --no-ignore-parent -epurs) nix-sources := $(shell fd --no-ignore-parent -enix --exclude='spago*') -js-sources := $(shell fd --no-ignore-parent -ejs) -# points to one of the example PureScript modules in examples/ +js-sources := $(shell fd --no-ignore-parent -ejs -ecjs) + +### Bundler setup + +# The main Purescript module ps-entrypoint := Scaffold.Test.E2E.Serve +# The entry point function in the main PureScript module ps-entrypoint-function := main +# Whether to bundle for the browser +browser-runtime := 1 # Use "1" for true and "" for false + preview-node-ipc = $(shell docker volume inspect store_node-preview-ipc | jq -r '.[0].Mountpoint') preprod-node-ipc = $(shell docker volume inspect store_node-preprod-ipc | jq -r '.[0].Mountpoint') serve-port := 4008 @@ -30,30 +36,27 @@ create-html-entrypoint: EOF +delete-bundle-entrypoint: + @rm -f ./dist/entrypoint.js + esbuild-bundle: spago-build create-bundle-entrypoint - @mkdir -p dist/ - @BROWSER_RUNTIME=1 node esbuild/bundle.js ./dist/entrypoint.js dist/index.js + BROWSER_RUNTIME=${browser-runtime} node esbuild/bundle.js ./dist/entrypoint.js dist/index.js + @make delete-bundle-entrypoint esbuild-serve: spago-build create-bundle-entrypoint create-html-entrypoint BROWSER_RUNTIME=1 node esbuild/serve.js ./dist/entrypoint.js dist/index.js dist/ ${serve-port} webpack-bundle: spago-build create-bundle-entrypoint - BROWSER_RUNTIME=1 webpack --mode=production \ + BROWSER_RUNTIME=${browser-runtime} webpack --mode=production \ -o dist/ --env entry=./dist/entrypoint.js + @make delete-bundle-entrypoint webpack-serve: spago-build create-bundle-entrypoint create-html-entrypoint BROWSER_RUNTIME=1 webpack-dev-server --progress \ --port ${serve-port} \ -o dist/ --env entry=./dist/entrypoint.js -run-dev: - @${ps-bundle} && BROWSER_RUNTIME=1 webpack-dev-server --progress - -e2e-serve: - spago bundle-module -m ${e2e-entrypoint} --to output.js - BROWSER_RUNTIME=1 webpack-dev-server --progress - run-build: @${ps-bundle} && BROWSER_RUNTIME=1 webpack --mode=production diff --git a/templates/ctl-scaffold/esbuild/bundle.js b/templates/ctl-scaffold/esbuild/bundle.js index 8b114bcfda..7ff2cc3a3e 100644 --- a/templates/ctl-scaffold/esbuild/bundle.js +++ b/templates/ctl-scaffold/esbuild/bundle.js @@ -2,7 +2,7 @@ import * as esbuild from "esbuild"; import { buildOptions } from "./config.js"; if (process.argv.length < 4) { - throw `usage: nodejs bundle.js ENTRY_POINT OUTPUT_FILENAME`; + throw `usage: node bundle.js ENTRY_POINT OUTPUT_FILENAME`; } esbuild.build( diff --git a/templates/ctl-scaffold/esbuild/config.js b/templates/ctl-scaffold/esbuild/config.js index c3294b5f8e..c1785847af 100755 --- a/templates/ctl-scaffold/esbuild/config.js +++ b/templates/ctl-scaffold/esbuild/config.js @@ -1,27 +1,41 @@ import { wasmLoader } from "esbuild-plugin-wasm"; import { polyfillNode } from "esbuild-plugin-polyfill-node"; -export const buildOptions = ({ entryPoint, outfile }) => ({ - entryPoints: [entryPoint], - outfile: outfile, - define: { - BROWSER_RUNTIME: process.env.BROWSER_RUNTIME, - }, - plugins: [ - polyfillNode({ - polyfills: { - crypto: true, - fs: true, - os: true, - }, - }), - wasmLoader({ - mode: "deferred", - }), - ], - bundle: true, - platform: "browser", - format: "esm", - treeShaking: true, - logLevel: "error", -}); +const isBrowser = !!process.env.BROWSER_RUNTIME; + +export const buildOptions = ({ entryPoint, outfile }) => { + const config = { + entryPoints: [entryPoint], + outfile: outfile, + define: { + BROWSER_RUNTIME: isBrowser ? "true" : '""', + }, + plugins: [ + wasmLoader({ + mode: "deferred", + }), + ], + bundle: true, + platform: isBrowser ? "browser" : "node", + format: "esm", + treeShaking: true, + logLevel: "error", + }; + + // https://esbuild.github.io/api/#packages + if (!isBrowser) { + config.packages = "external"; + } else { + config.plugins.push( + polyfillNode({ + polyfills: { + crypto: true, + fs: true, + os: true, + }, + }) + ); + } + + return config; +}; diff --git a/templates/ctl-scaffold/esbuild/serve.js b/templates/ctl-scaffold/esbuild/serve.js index c079f1cc8e..ecfc84a915 100644 --- a/templates/ctl-scaffold/esbuild/serve.js +++ b/templates/ctl-scaffold/esbuild/serve.js @@ -1,8 +1,10 @@ import * as esbuild from "esbuild"; import { buildOptions } from "./config.js"; +import http from "node:http"; +import * as url from "url"; if (process.argv.length < 6) { - throw `usage: nodejs serve.js ENTRY_POINT OUTPUT_FILE SERVE_DIR PORT`; + throw `usage: node serve.js ENTRY_POINT OUTPUT_FILE SERVE_DIR PORT`; } const ctx = await esbuild.context( @@ -13,10 +15,58 @@ const ctx = await esbuild.context( ); const config = { - port: parseInt(process.argv[5]), + // Use the next port for esbuild server, + // we need a port for our proxy (see below). + port: parseInt(process.argv[5]) + 1, servedir: process.argv[4], }; -console.log("serving:", config); +let { host, port } = await ctx.serve(config); -await ctx.serve(config); +// Proxy Kupo to esbuild server. This is needed due to CORS + +const kupoEndpoint = process.env.KUPO_HOST || "http://localhost:1442"; +const kupoHost = url.parse(kupoEndpoint).hostname; +const kupoPort = url.parse(kupoEndpoint).port || 80; + +http + .createServer((req, res) => { + const options = { + hostname: host, + port: port, + path: req.url, + method: req.method, + headers: req.headers, + }; + + // Forward each incoming request to esbuild + const proxyReq = http.request(options, proxyRes => { + // If esbuild returns "not found" and the path starts from /kupo/ + if (proxyRes.statusCode === 404 && req.url.startsWith("/kupo/")) { + // Connect to Kupo running on port 1442 + const kupoOptions = { + hostname: kupoHost, + port: kupoPort, + path: req.url.slice("/kupo".length), + method: req.method, + headers: req.headers, + }; + // Request the corresponding path + http + .request(kupoOptions, kupoRes => { + // Pipe the response from Kupo back to the client + res.writeHead(kupoRes.statusCode, kupoRes.headers); + kupoRes.pipe(res, { end: true }); + }) + .end(); + } else { + // Otherwise, forward the response from esbuild to the client + res.writeHead(proxyRes.statusCode, proxyRes.headers); + proxyRes.pipe(res, { end: true }); + } + }); + + // Forward the body of the request to esbuild + req.pipe(proxyReq, { end: true }); + }) + .listen(parseInt(process.argv[5])); diff --git a/templates/ctl-scaffold/flake.lock b/templates/ctl-scaffold/flake.lock index 17da8409cd..57540eb0bb 100644 --- a/templates/ctl-scaffold/flake.lock +++ b/templates/ctl-scaffold/flake.lock @@ -2757,17 +2757,17 @@ ] }, "locked": { - "lastModified": 1697213277, - "narHash": "sha256-vEfiNwLI4ngh1RYfEfHfU4H6PO6DkCBzQMFG8Ynv49Q=", + "lastModified": 1697553030, + "narHash": "sha256-noK4fgwvaV3rlLVPnW2wH3WScYVgJ/M/fc+F1tQ8i40=", "owner": "Plutonomicon", "repo": "cardano-transaction-lib", - "rev": "8014c940cf69516c0a00048eec79b2ba95fd94f3", + "rev": "6e4debe87ddbafaa3c77033888f9c998e28cd7ca", "type": "github" }, "original": { "owner": "Plutonomicon", "repo": "cardano-transaction-lib", - "rev": "8014c940cf69516c0a00048eec79b2ba95fd94f3", + "rev": "6e4debe87ddbafaa3c77033888f9c998e28cd7ca", "type": "github" } }, diff --git a/templates/ctl-scaffold/flake.nix b/templates/ctl-scaffold/flake.nix index 482b486482..1128065826 100644 --- a/templates/ctl-scaffold/flake.nix +++ b/templates/ctl-scaffold/flake.nix @@ -10,7 +10,7 @@ type = "github"; owner = "Plutonomicon"; repo = "cardano-transaction-lib"; - rev = "8014c940cf69516c0a00048eec79b2ba95fd94f3"; + rev = "6e4debe87ddbafaa3c77033888f9c998e28cd7ca"; }; # To use the same version of `nixpkgs` as we do nixpkgs.follows = "ctl/nixpkgs"; diff --git a/templates/ctl-scaffold/package-lock.json b/templates/ctl-scaffold/package-lock.json index 27ccbe434a..414a8c52d0 100644 --- a/templates/ctl-scaffold/package-lock.json +++ b/templates/ctl-scaffold/package-lock.json @@ -28,6 +28,7 @@ "puppeteer-core": "^15.3.2", "reconnecting-websocket": "4.4.0", "uniqid": "5.4.0", + "utf-8-validate": "^5.0.10", "ws": "8.4.0", "xhr2": "0.2.1" }, @@ -36,7 +37,6 @@ "esbuild": "0.18.11", "esbuild-plugin-polyfill-node": "^0.3.0", "esbuild-plugin-wasm": "^1.1.0", - "html-webpack-plugin": "5.5.3", "node-polyfill-webpack-plugin": "2.0.1", "webpack": "5.88.1", "webpack-cli": "5.1.4", @@ -635,12 +635,6 @@ "@types/send": "*" } }, - "node_modules/@types/html-minifier-terser": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", - "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==", - "dev": true - }, "node_modules/@types/http-errors": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz", @@ -1084,15 +1078,6 @@ "ansi-html": "bin/ansi-html" } }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/anymatch": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", @@ -1359,12 +1344,6 @@ "multicast-dns": "^7.2.5" } }, - "node_modules/boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", - "dev": true - }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -1595,16 +1574,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/camel-case": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", - "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", - "dev": true, - "dependencies": { - "pascal-case": "^3.1.2", - "tslib": "^2.0.3" - } - }, "node_modules/caniuse-lite": { "version": "1.0.30001519", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz", @@ -1676,18 +1645,6 @@ "safe-buffer": "^5.0.1" } }, - "node_modules/clean-css": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz", - "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==", - "dev": true, - "dependencies": { - "source-map": "~0.6.0" - }, - "engines": { - "node": ">= 10.0" - } - }, "node_modules/clone-deep": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", @@ -1708,15 +1665,6 @@ "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", "dev": true }, - "node_modules/commander": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", - "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", - "dev": true, - "engines": { - "node": ">= 12" - } - }, "node_modules/compressible": { "version": "2.0.18", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", @@ -1923,34 +1871,6 @@ "node": "*" } }, - "node_modules/css-select": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", - "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", - "dev": true, - "dependencies": { - "boolbase": "^1.0.0", - "css-what": "^6.0.1", - "domhandler": "^4.3.1", - "domutils": "^2.8.0", - "nth-check": "^2.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/fb55" - } - }, - "node_modules/css-what": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", - "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", - "dev": true, - "engines": { - "node": ">= 6" - }, - "funding": { - "url": "https://github.com/sponsors/fb55" - } - }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -2079,38 +1999,6 @@ "node": ">=6" } }, - "node_modules/dom-converter": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz", - "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==", - "dev": true, - "dependencies": { - "utila": "~0.4" - } - }, - "node_modules/dom-serializer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", - "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", - "dev": true, - "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" - }, - "funding": { - "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" - } - }, - "node_modules/dom-serializer/node_modules/entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, "node_modules/domain-browser": { "version": "4.22.0", "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-4.22.0.tgz", @@ -2123,57 +2011,6 @@ "url": "https://bevry.me/fund" } }, - "node_modules/domelementtype": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", - "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ] - }, - "node_modules/domhandler": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", - "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", - "dev": true, - "dependencies": { - "domelementtype": "^2.2.0" - }, - "engines": { - "node": ">= 4" - }, - "funding": { - "url": "https://github.com/fb55/domhandler?sponsor=1" - } - }, - "node_modules/domutils": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", - "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", - "dev": true, - "dependencies": { - "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0" - }, - "funding": { - "url": "https://github.com/fb55/domutils?sponsor=1" - } - }, - "node_modules/dot-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", - "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", - "dev": true, - "dependencies": { - "no-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -2947,15 +2784,6 @@ "minimalistic-assert": "^1.0.1" } }, - "node_modules/he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true, - "bin": { - "he": "bin/he" - } - }, "node_modules/hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", @@ -3025,50 +2853,6 @@ } ] }, - "node_modules/html-minifier-terser": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", - "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==", - "dev": true, - "dependencies": { - "camel-case": "^4.1.2", - "clean-css": "^5.2.2", - "commander": "^8.3.0", - "he": "^1.2.0", - "param-case": "^3.0.4", - "relateurl": "^0.2.7", - "terser": "^5.10.0" - }, - "bin": { - "html-minifier-terser": "cli.js" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/html-webpack-plugin": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz", - "integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==", - "dev": true, - "dependencies": { - "@types/html-minifier-terser": "^6.0.0", - "html-minifier-terser": "^6.0.2", - "lodash": "^4.17.21", - "pretty-error": "^4.0.0", - "tapable": "^2.0.0" - }, - "engines": { - "node": ">=10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/html-webpack-plugin" - }, - "peerDependencies": { - "webpack": "^5.20.0" - } - }, "node_modules/http-deceiver": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", @@ -3539,21 +3323,6 @@ "node": ">=8" } }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, - "node_modules/lower-case": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", - "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", - "dev": true, - "dependencies": { - "tslib": "^2.0.3" - } - }, "node_modules/md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", @@ -3742,16 +3511,6 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, - "node_modules/no-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", - "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", - "dev": true, - "dependencies": { - "lower-case": "^2.0.2", - "tslib": "^2.0.3" - } - }, "node_modules/node-fetch": { "version": "2.6.7", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", @@ -3856,18 +3615,6 @@ "node": ">=8" } }, - "node_modules/nth-check": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", - "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", - "dev": true, - "dependencies": { - "boolbase": "^1.0.0" - }, - "funding": { - "url": "https://github.com/fb55/nth-check?sponsor=1" - } - }, "node_modules/object-inspect": { "version": "1.12.3", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", @@ -4027,16 +3774,6 @@ "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", "dev": true }, - "node_modules/param-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", - "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==", - "dev": true, - "dependencies": { - "dot-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, "node_modules/parse-asn1": { "version": "5.1.6", "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", @@ -4059,16 +3796,6 @@ "node": ">= 0.8" } }, - "node_modules/pascal-case": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", - "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", - "dev": true, - "dependencies": { - "no-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, "node_modules/path-browserify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", @@ -4162,16 +3889,6 @@ "node": ">=8" } }, - "node_modules/pretty-error": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz", - "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==", - "dev": true, - "dependencies": { - "lodash": "^4.17.20", - "renderkid": "^3.0.0" - } - }, "node_modules/process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", @@ -4423,56 +4140,6 @@ "resolved": "https://registry.npmjs.org/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz", "integrity": "sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng==" }, - "node_modules/relateurl": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", - "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/renderkid": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz", - "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==", - "dev": true, - "dependencies": { - "css-select": "^4.1.3", - "dom-converter": "^0.2.0", - "htmlparser2": "^6.1.0", - "lodash": "^4.17.21", - "strip-ansi": "^6.0.1" - } - }, - "node_modules/renderkid/node_modules/entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, - "node_modules/renderkid/node_modules/htmlparser2": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", - "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", - "dev": true, - "funding": [ - "https://github.com/fb55/htmlparser2?sponsor=1", - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ], - "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", - "domutils": "^2.5.2", - "entities": "^2.0.0" - } - }, "node_modules/require-from-string": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", @@ -4995,18 +4662,6 @@ "safe-buffer": "~5.2.0" } }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", @@ -5198,12 +4853,6 @@ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, - "node_modules/tslib": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", - "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", - "dev": true - }, "node_modules/tty-browserify": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz", @@ -5336,6 +4985,18 @@ "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", "dev": true }, + "node_modules/utf-8-validate": { + "version": "5.0.10", + "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz", + "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==", + "hasInstallScript": true, + "dependencies": { + "node-gyp-build": "^4.3.0" + }, + "engines": { + "node": ">=6.14.2" + } + }, "node_modules/util": { "version": "0.12.5", "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", @@ -5354,12 +5015,6 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, - "node_modules/utila": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz", - "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==", - "dev": true - }, "node_modules/utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", @@ -6247,12 +5902,6 @@ "@types/send": "*" } }, - "@types/html-minifier-terser": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", - "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==", - "dev": true - }, "@types/http-errors": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz", @@ -6634,12 +6283,6 @@ "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==", "dev": true }, - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, "anymatch": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", @@ -6850,12 +6493,6 @@ "multicast-dns": "^7.2.5" } }, - "boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", - "dev": true - }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -7035,16 +6672,6 @@ "get-intrinsic": "^1.0.2" } }, - "camel-case": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", - "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", - "dev": true, - "requires": { - "pascal-case": "^3.1.2", - "tslib": "^2.0.3" - } - }, "caniuse-lite": { "version": "1.0.30001519", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz", @@ -7088,15 +6715,6 @@ "safe-buffer": "^5.0.1" } }, - "clean-css": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz", - "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==", - "dev": true, - "requires": { - "source-map": "~0.6.0" - } - }, "clone-deep": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", @@ -7114,12 +6732,6 @@ "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", "dev": true }, - "commander": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", - "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", - "dev": true - }, "compressible": { "version": "2.0.18", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", @@ -7306,25 +6918,6 @@ "randomfill": "^1.0.3" } }, - "css-select": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", - "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", - "dev": true, - "requires": { - "boolbase": "^1.0.0", - "css-what": "^6.0.1", - "domhandler": "^4.3.1", - "domutils": "^2.8.0", - "nth-check": "^2.0.1" - } - }, - "css-what": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", - "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", - "dev": true - }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -7425,76 +7018,12 @@ "@leichtgewicht/ip-codec": "^2.0.1" } }, - "dom-converter": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz", - "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==", - "dev": true, - "requires": { - "utila": "~0.4" - } - }, - "dom-serializer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", - "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", - "dev": true, - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" - }, - "dependencies": { - "entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true - } - } - }, "domain-browser": { "version": "4.22.0", "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-4.22.0.tgz", "integrity": "sha512-IGBwjF7tNk3cwypFNH/7bfzBcgSCbaMOD3GsaY1AU/JRrnHnYgEM0+9kQt52iZxjNsjBtJYtao146V+f8jFZNw==", "dev": true }, - "domelementtype": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", - "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", - "dev": true - }, - "domhandler": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", - "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", - "dev": true, - "requires": { - "domelementtype": "^2.2.0" - } - }, - "domutils": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", - "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", - "dev": true, - "requires": { - "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0" - } - }, - "dot-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", - "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", - "dev": true, - "requires": { - "no-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -8099,12 +7628,6 @@ "minimalistic-assert": "^1.0.1" } }, - "he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true - }, "hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", @@ -8166,34 +7689,6 @@ "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==", "dev": true }, - "html-minifier-terser": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", - "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==", - "dev": true, - "requires": { - "camel-case": "^4.1.2", - "clean-css": "^5.2.2", - "commander": "^8.3.0", - "he": "^1.2.0", - "param-case": "^3.0.4", - "relateurl": "^0.2.7", - "terser": "^5.10.0" - } - }, - "html-webpack-plugin": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz", - "integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==", - "dev": true, - "requires": { - "@types/html-minifier-terser": "^6.0.0", - "html-minifier-terser": "^6.0.2", - "lodash": "^4.17.21", - "pretty-error": "^4.0.0", - "tapable": "^2.0.0" - } - }, "http-deceiver": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", @@ -8517,21 +8012,6 @@ "p-locate": "^4.1.0" } }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, - "lower-case": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", - "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", - "dev": true, - "requires": { - "tslib": "^2.0.3" - } - }, "md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", @@ -8683,16 +8163,6 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, - "no-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", - "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", - "dev": true, - "requires": { - "lower-case": "^2.0.2", - "tslib": "^2.0.3" - } - }, "node-fetch": { "version": "2.6.7", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", @@ -8766,15 +8236,6 @@ "path-key": "^3.0.0" } }, - "nth-check": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", - "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", - "dev": true, - "requires": { - "boolbase": "^1.0.0" - } - }, "object-inspect": { "version": "1.12.3", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", @@ -8889,16 +8350,6 @@ "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", "dev": true }, - "param-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", - "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==", - "dev": true, - "requires": { - "dot-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, "parse-asn1": { "version": "5.1.6", "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", @@ -8918,16 +8369,6 @@ "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", "dev": true }, - "pascal-case": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", - "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", - "dev": true, - "requires": { - "no-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, "path-browserify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", @@ -9000,16 +8441,6 @@ "find-up": "^4.0.0" } }, - "pretty-error": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz", - "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==", - "dev": true, - "requires": { - "lodash": "^4.17.20", - "renderkid": "^3.0.0" - } - }, "process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", @@ -9210,45 +8641,6 @@ "resolved": "https://registry.npmjs.org/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz", "integrity": "sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng==" }, - "relateurl": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", - "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==", - "dev": true - }, - "renderkid": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz", - "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==", - "dev": true, - "requires": { - "css-select": "^4.1.3", - "dom-converter": "^0.2.0", - "htmlparser2": "^6.1.0", - "lodash": "^4.17.21", - "strip-ansi": "^6.0.1" - }, - "dependencies": { - "entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true - }, - "htmlparser2": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", - "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", - "dev": true, - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", - "domutils": "^2.5.2", - "entities": "^2.0.0" - } - } - } - }, "require-from-string": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", @@ -9681,15 +9073,6 @@ "safe-buffer": "~5.2.0" } }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - }, "strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", @@ -9825,12 +9208,6 @@ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, - "tslib": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", - "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", - "dev": true - }, "tty-browserify": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz", @@ -9921,6 +9298,14 @@ } } }, + "utf-8-validate": { + "version": "5.0.10", + "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz", + "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==", + "requires": { + "node-gyp-build": "^4.3.0" + } + }, "util": { "version": "0.12.5", "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", @@ -9939,12 +9324,6 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, - "utila": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz", - "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==", - "dev": true - }, "utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", diff --git a/templates/ctl-scaffold/package.json b/templates/ctl-scaffold/package.json index 34d1ad9c67..ad17c1b6f9 100644 --- a/templates/ctl-scaffold/package.json +++ b/templates/ctl-scaffold/package.json @@ -44,6 +44,7 @@ "puppeteer-core": "^15.3.2", "reconnecting-websocket": "4.4.0", "uniqid": "5.4.0", + "utf-8-validate": "^5.0.10", "ws": "8.4.0", "xhr2": "0.2.1" }, diff --git a/templates/ctl-scaffold/packages.dhall b/templates/ctl-scaffold/packages.dhall index f18969cfc4..4de1cef626 100644 --- a/templates/ctl-scaffold/packages.dhall +++ b/templates/ctl-scaffold/packages.dhall @@ -342,7 +342,7 @@ let additions = , "web-storage" ] , repo = "https://github.com/Plutonomicon/cardano-transaction-lib.git" - , version = "8014c940cf69516c0a00048eec79b2ba95fd94f3" + , version = "6e4debe87ddbafaa3c77033888f9c998e28cd7ca" } } diff --git a/templates/ctl-scaffold/spago-packages.nix b/templates/ctl-scaffold/spago-packages.nix index 4f3b7e2ef9..1ebaffc689 100644 --- a/templates/ctl-scaffold/spago-packages.nix +++ b/templates/ctl-scaffold/spago-packages.nix @@ -211,11 +211,11 @@ let "cardano-transaction-lib" = pkgs.stdenv.mkDerivation { name = "cardano-transaction-lib"; - version = "8014c940cf69516c0a00048eec79b2ba95fd94f3"; + version = "6e4debe87ddbafaa3c77033888f9c998e28cd7ca"; src = pkgs.fetchgit { url = "https://github.com/Plutonomicon/cardano-transaction-lib.git"; - rev = "8014c940cf69516c0a00048eec79b2ba95fd94f3"; - sha256 = "1m73xy4z2in181rj1443xqygm0akvzqi27qnslhpiqn808vy4ixw"; + rev = "6e4debe87ddbafaa3c77033888f9c998e28cd7ca"; + sha256 = "13cb7kadd1fgglzz69v0hmqr4x8zn1nrskxmjkmmss9g1izbi0ly"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; diff --git a/templates/ctl-scaffold/webpack.config.cjs b/templates/ctl-scaffold/webpack.config.cjs index 00c39dead9..f492dc070a 100644 --- a/templates/ctl-scaffold/webpack.config.cjs +++ b/templates/ctl-scaffold/webpack.config.cjs @@ -4,91 +4,113 @@ const path = require("path"); const webpack = require("webpack"); const NodePolyfillPlugin = require("node-polyfill-webpack-plugin"); +const isBrowser = !!process.env.BROWSER_RUNTIME; + module.exports = env => { - return { - mode: "development", + const config = { + mode: "development", + experiments: { + asyncWebAssembly: false, + layers: false, + lazyCompilation: false, + outputModule: true, + syncWebAssembly: true, + topLevelAwait: true, + }, + + devtool: "eval-source-map", - experiments: { - asyncWebAssembly: false, - layers: false, - lazyCompilation: false, - outputModule: true, - syncWebAssembly: true, - topLevelAwait: true, + stats: { errorDetails: true }, + + devServer: { + static: { + directory: path.join(__dirname, "dist"), + }, + client: { + overlay: false, + }, + port: 4008, + proxy: { + "/kupo": { + // `KUPO_HOST` env variable must be set to the base URL of the Kupo + // service, otherwise all requests to Kupo will fail. + target: process.env.KUPO_HOST || "http://localhost:1442", + changeOrigin: true, + pathRewrite: { "^/kupo": "" }, }, + }, + }, - devtool: "eval-source-map", + entry: env.entry, - stats: { errorDetails: true }, + output: { + path: path.resolve(__dirname, "dist"), + filename: "index.js", + library: { + type: "module", + }, + }, - devServer: { - static: { - directory: path.join(__dirname, 'dist'), - }, - client: { - overlay: false - }, - port: 4008, - proxy: { - "/kupo": { - // `KUPO_HOST` env variable must be set to the base URL of the Kupo - // service, otherwise all requests to Kupo will fail. - target: process.env.KUPO_HOST || "http://localhost:1442", - changeOrigin: true, - pathRewrite: { "^/kupo": "" }, - }, - }, - }, + resolve: { + // We use node_modules provided by Nix shell via an environment variable + modules: [process.env.NODE_PATH], + extensions: [".js"], + }, - // we can add more entrypoints as needed - entry: env.entry, + plugins: [ + new webpack.DefinePlugin({ + BROWSER_RUNTIME: isBrowser, + }), + new webpack.LoaderOptionsPlugin({ + debug: true, + }), + // ContextReplacementPlugin is used just to suppress a webpack warning: + // "Critical dependency: the request of a dependency is an expression" + // See https://stackoverflow.com/a/59235546/17365145 + new webpack.ContextReplacementPlugin(/cardano-serialization-lib-browser/), + new webpack.ContextReplacementPlugin(/cardano-serialization-lib-nodejs/), + ], + }; - output: { - path: path.resolve(__dirname, "dist"), - filename: "index.js", - library: { - type: "module", - }, - }, + config.target = isBrowser ? "web" : "node18"; + config.node = isBrowser ? {} : { __dirname: true }; + config.resolve.fallback = isBrowser + ? { + buffer: require.resolve("buffer/"), + http: false, + url: false, + stream: false, + crypto: false, + https: false, + net: false, + tls: false, + zlib: false, + os: false, + path: false, + fs: false, + readline: false, + child_process: false, + } + : {}; - resolve: { - // We use node_modules provided by Nix shell via an environment variable - modules: [process.env.NODE_PATH], - extensions: [".js"], - fallback: { - buffer: require.resolve("buffer/"), - http: false, - url: false, - stream: false, - crypto: false, - https: false, - net: false, - tls: false, - zlib: false, - os: false, - path: false, - fs: false, - readline: false, - child_process: false, - }, - }, + // Preserves console.log calls in NodeJS + // https://stackoverflow.com/a/71024096/17365145 + config.optimization = isBrowser + ? {} + : { + minimize: false, + }; + + if (isBrowser) { + // Provide top-level `Buffer` + config.plugins.push( + new webpack.ProvidePlugin({ + Buffer: ["buffer", "Buffer"], + }) + ); + // Provide NodeJS polyfills + config.plugins.push(new NodePolyfillPlugin()); + } - plugins: [ - new webpack.DefinePlugin({ - BROWSER_RUNTIME: !!process.env.BROWSER_RUNTIME, - }), - new NodePolyfillPlugin(), - new webpack.LoaderOptionsPlugin({ - debug: true, - }), - new webpack.ProvidePlugin({ - Buffer: ["buffer", "Buffer"], - }), - // ContextReplacementPlugin is used just to suppress a webpack warning: - // "Critical dependency: the request of a dependency is an expression" - // See https://stackoverflow.com/a/59235546/17365145 - new webpack.ContextReplacementPlugin(/cardano-serialization-lib-browser/), - new webpack.ContextReplacementPlugin(/cardano-serialization-lib-nodejs/), - ], - }; + return config; }; From cc808a76ab8b279a2cf6c1b20b7d6bae7c5fca1f Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Tue, 17 Oct 2023 20:47:34 +0400 Subject: [PATCH 61/85] Update formatting rules --- scripts/whitespace-check.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/whitespace-check.sh b/scripts/whitespace-check.sh index 5439ba834b..2e0f26cfb4 100755 --- a/scripts/whitespace-check.sh +++ b/scripts/whitespace-check.sh @@ -18,17 +18,17 @@ examples/ fixtures/scripts/ scripts/ src/ +esbuild/ templates/ctl-scaffold/*.md templates/ctl-scaffold/*.nix templates/ctl-scaffold/*.dhall -templates/ctl-scaffold/index.html -templates/ctl-scaffold/index.js templates/ctl-scaffold/package.json -templates/ctl-scaffold/webpack.config.js +templates/ctl-scaffold/webpack.config.cjs templates/ctl-scaffold/Makefile templates/ctl-scaffold/exe/ templates/ctl-scaffold/src/ templates/ctl-scaffold/test/ +templates/ctl-scaffold/esbuild/ test/ " From 0ccc85d4cd816283a47a8509754ea273809962bd Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Wed, 8 Nov 2023 14:12:36 +0400 Subject: [PATCH 62/85] Update error message fixtures in plutip tests --- test/Plutip/Contract/Assert.purs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/Plutip/Contract/Assert.purs b/test/Plutip/Contract/Assert.purs index 824b65341e..14fb3e5efd 100644 --- a/test/Plutip/Contract/Assert.purs +++ b/test/Plutip/Contract/Assert.purs @@ -102,7 +102,7 @@ suite = do ContractTestUtils.mkContract params eiResult `shouldSatisfy` isRight printContractAssertionFailures failures `shouldEqual` - "In addition to the error above, the following `Contract` assertions have failed:\n\n 1. Unexpected token delta (TokenName (hexToRawBytesUnsafe \"546865546f6b656e\")) at address Sender Expected: (fromString \"2\"), Actual: (fromString \"1\")" + "In addition to the error above, the following `Contract` assertions have failed:\n\n 1. Unexpected token delta (TokenName (hexToRawBytesUnsafe \"546865546f6b656e\")) at address Sender Expected: 2, Actual: 1" test "ExUnits limit reached" do @@ -137,7 +137,7 @@ suite = do ContractTestUtils.mkContract params eiResult `shouldSatisfy` isRight printContractAssertionFailures failures `shouldEqual` - "In addition to the error above, the following `Contract` assertions have failed:\n\n 1. ExUnits limit exceeded: Expected: { mem: (fromString \"800\"), steps: (fromString \"16110\") }, Actual: { mem: (fromString \"800\"), steps: (fromString \"161100\") }" + "In addition to the error above, the following `Contract` assertions have failed:\n\n 1. ExUnits limit exceeded: Expected: { mem: 800, steps: 16110 }, Actual: { mem: 800, steps: 161100 }" test "An exception is thrown - everything is reported" do @@ -176,4 +176,4 @@ suite = do eiResult `shouldSatisfy` isLeft printContractAssertionFailures failures `shouldEqual` - "In addition to the error above, the following `Contract` assertions have failed:\n\n 1. Error while trying to get expected value: Unable to estimate expected loss in wallet\n\n 2. Unexpected token delta (TokenName (hexToRawBytesUnsafe \"546865546f6b656e\")) at address Sender Expected: (fromString \"2\"), Actual: (fromString \"1\") \n\n 3. ExUnits limit exceeded: Expected: { mem: (fromString \"800\"), steps: (fromString \"16110\") }, Actual: { mem: (fromString \"800\"), steps: (fromString \"161100\") } \n\nThe following `Contract` checks have been skipped due to an exception: \n\n 1. Sender's output has a datum\n\n 2. Output has a reference script\n\n 3. Contains CIP-25 metadata" + "In addition to the error above, the following `Contract` assertions have failed:\n\n 1. Error while trying to get expected value: Unable to estimate expected loss in wallet\n\n 2. Unexpected token delta (TokenName (hexToRawBytesUnsafe \"546865546f6b656e\")) at address Sender Expected: 2, Actual: 1 \n\n 3. ExUnits limit exceeded: Expected: { mem: 800, steps: 16110 }, Actual: { mem: 800, steps: 161100 } \n\nThe following `Contract` checks have been skipped due to an exception: \n\n 1. Sender's output has a datum\n\n 2. Output has a reference script\n\n 3. Contains CIP-25 metadata" From c677f5fd5a8ce9fefa184348e6522f5776331e68 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Wed, 8 Nov 2023 22:33:23 +0400 Subject: [PATCH 63/85] Use newer purescript-aeson and json-bigint --- package-lock.json | 20 ++++------- package.json | 2 +- packages.dhall | 8 ++--- src/Internal/Cardano/Types/Transaction.purs | 6 ++-- src/Internal/Plutip/Types.purs | 6 ++-- src/Internal/Service/Blockfrost.purs | 39 +++++++++++++-------- src/Internal/Types/EraSummaries.purs | 9 +++-- src/Internal/Types/Interval.purs | 4 +-- 8 files changed, 46 insertions(+), 48 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2314c4c567..60e4d9aaba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.6", "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.6", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1", - "@mlabs-haskell/json-bigint": " 1.0.0", + "@mlabs-haskell/json-bigint": "2.0.0", "@noble/secp256k1": "^1.7.0", "apply-args-browser": "0.0.1", "apply-args-nodejs": "0.0.1", @@ -519,12 +519,9 @@ "integrity": "sha512-8pEb4BoQlD5zN+KtOCgtTg62OmLPjMa+DiJvoAzlLcWmp01P3TyJPgbEOtS+xiZpGA+1rRkdyeeLZV3wyw8Xfw==" }, "node_modules/@mlabs-haskell/json-bigint": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/json-bigint/-/json-bigint-1.0.0.tgz", - "integrity": "sha512-Opo07yXP/OU9mIoGmY5VVuDy5kxmb3fBAG3U9dbC15qK1OCpVLJAlxbdOfBmLOja94SnIfZINUU2xvYtVfk65w==", - "dependencies": { - "bignumber.js": "^9.0.0" - } + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/json-bigint/-/json-bigint-2.0.0.tgz", + "integrity": "sha512-JX9TON+nZbt+1TJ5MNV1Gcpxp3/m56x1/glDwzGtydrzQzyZbKg4XFw9Frib6fh89YVqjSFJ9xmVeIyDJ5DxTQ==" }, "node_modules/@noble/hashes": { "version": "1.3.1", @@ -6654,12 +6651,9 @@ "integrity": "sha512-8pEb4BoQlD5zN+KtOCgtTg62OmLPjMa+DiJvoAzlLcWmp01P3TyJPgbEOtS+xiZpGA+1rRkdyeeLZV3wyw8Xfw==" }, "@mlabs-haskell/json-bigint": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/json-bigint/-/json-bigint-1.0.0.tgz", - "integrity": "sha512-Opo07yXP/OU9mIoGmY5VVuDy5kxmb3fBAG3U9dbC15qK1OCpVLJAlxbdOfBmLOja94SnIfZINUU2xvYtVfk65w==", - "requires": { - "bignumber.js": "^9.0.0" - } + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/json-bigint/-/json-bigint-2.0.0.tgz", + "integrity": "sha512-JX9TON+nZbt+1TJ5MNV1Gcpxp3/m56x1/glDwzGtydrzQzyZbKg4XFw9Frib6fh89YVqjSFJ9xmVeIyDJ5DxTQ==" }, "@noble/hashes": { "version": "1.3.1", diff --git a/package.json b/package.json index c627e3f2c5..faa207c349 100755 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.6", "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.6", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1", - "@mlabs-haskell/json-bigint": " 1.0.0", + "@mlabs-haskell/json-bigint": "2.0.0", "@noble/secp256k1": "^1.7.0", "apply-args-browser": "0.0.1", "apply-args-nodejs": "0.0.1", diff --git a/packages.dhall b/packages.dhall index bb7e263fba..316e965553 100644 --- a/packages.dhall +++ b/packages.dhall @@ -145,7 +145,7 @@ let additions = , "untagged-union" ] , repo = "https://github.com/mlabs-haskell/purescript-aeson.git" - , version = "1da04ea8ff3656a4954b3ae2414da2d6a73ade82" + , version = "e885fa483ba374f34416049b96be0bb0cd591c0b" } , bignumber = { dependencies = @@ -250,11 +250,7 @@ let additions = , version = "a3c0f67e9fdb0086016d7aebfad35d09a08b4ecd" } , js-bigints = - { dependencies = - [ "integers" - , "maybe" - , "prelude" - ] + { dependencies = [ "integers", "maybe", "prelude" ] , repo = "https://github.com/purescript-contrib/purescript-js-bigints" , version = "36a7d8ac75a7230043ae511f3145f9ed130954a9" } diff --git a/src/Internal/Cardano/Types/Transaction.purs b/src/Internal/Cardano/Types/Transaction.purs index 0a92ad9dd3..3aebed07a5 100644 --- a/src/Internal/Cardano/Types/Transaction.purs +++ b/src/Internal/Cardano/Types/Transaction.purs @@ -95,7 +95,7 @@ import Aeson , caseAesonString , decodeAeson , encodeAeson - , partialFiniteNumber + , finiteNumber ) import Control.Alternative ((<|>)) import Control.Apply (lift2) @@ -605,10 +605,10 @@ instance EncodeAeson MoveInstantaneousReward where encodeAeson = case _ of ToOtherPot r -> encodeTagged' "ToOtherPot" r -- We assume the numbers are finite - { pot = unsafePartial partialFiniteNumber r.pot } + { pot = unsafePartial $ fromJust $ finiteNumber r.pot } ToStakeCreds r -> encodeTagged' "ToStakeCreds" r -- We assume the numbers are finite - { pot = unsafePartial partialFiniteNumber r.pot } + { pot = unsafePartial $ fromJust $ finiteNumber r.pot } type PoolRegistrationParams = { operator :: PoolPubKeyHash -- cwitness (cert) diff --git a/src/Internal/Plutip/Types.purs b/src/Internal/Plutip/Types.purs index 13a880d5b7..d2f7ba78c6 100644 --- a/src/Internal/Plutip/Types.purs +++ b/src/Internal/Plutip/Types.purs @@ -26,7 +26,7 @@ import Aeson , JsonDecodeError(TypeMismatch, UnexpectedValue) , decodeAeson , encodeAeson - , partialFiniteNumber + , finiteNumber , toStringifiedNumbersJson , (.:) ) @@ -41,7 +41,7 @@ import Data.Either (Either(Left), note) import Data.Generic.Rep (class Generic) import Data.Log.Level (LogLevel) import Data.Log.Message (Message) -import Data.Maybe (Maybe) +import Data.Maybe (Maybe, fromJust) import Data.Newtype (class Newtype) import Data.Show.Generic (genericShow) import Data.Time.Duration (Seconds(Seconds)) @@ -94,7 +94,7 @@ instance EncodeAeson ClusterStartupRequest where ) = encodeAeson { keysToGenerate , epochSize - , slotLength: unsafePartial partialFiniteNumber slotLength + , slotLength: unsafePartial $ fromJust $ finiteNumber slotLength , maxTxSize , raiseExUnitsToMax } diff --git a/src/Internal/Service/Blockfrost.purs b/src/Internal/Service/Blockfrost.purs index 81ffa2cbe1..d5f22cc2ce 100644 --- a/src/Internal/Service/Blockfrost.purs +++ b/src/Internal/Service/Blockfrost.purs @@ -63,7 +63,6 @@ import Prelude import Aeson ( class DecodeAeson , Aeson - , Finite , JsonDecodeError(TypeMismatch, MissingValue, AtKey) , decodeAeson , decodeJsonString @@ -74,7 +73,6 @@ import Aeson , isNull , parseJsonStringToAeson , stringifyAeson - , unpackFinite , (.:) , (.:!) ) @@ -214,7 +212,7 @@ import Data.Bifunctor (lmap) import Data.BigNumber (BigNumber, toFraction) import Data.BigNumber as BigNumber import Data.DateTime.Instant (instant, toDateTime) -import Data.Either (Either(Left, Right), either, note) +import Data.Either (Either(Left, Right), either, hush, note) import Data.Foldable (fold) import Data.Generic.Rep (class Generic) import Data.HTTP.Method (Method(GET, POST)) @@ -1237,7 +1235,7 @@ blockfrostStakeCredentialToBech32 = case _ of -- BlockfrostProtocolParameters -------------------------------------------------------------------------------- --- | `Stringed a` decodes an `a` who was encoded as a `String` +-- | `Stringed a` decodes an `a` that was encoded as a `String` newtype Stringed a = Stringed a derive instance Newtype (Stringed a) _ @@ -1245,6 +1243,17 @@ derive instance Newtype (Stringed a) _ instance DecodeAeson a => DecodeAeson (Stringed a) where decodeAeson = decodeAeson >=> decodeJsonString >=> Stringed >>> pure +newtype FiniteBigNumber = FiniteBigNumber BigNumber + +derive instance Newtype FiniteBigNumber _ + +instance DecodeAeson FiniteBigNumber where + decodeAeson aeson = do + number <- decodeAeson aeson + map FiniteBigNumber $ note (TypeMismatch "BigNumber") $ hush + $ BigNumber.parseBigNumber + $ show (number :: Number) + type BlockfrostProtocolParametersRaw = { "min_fee_a" :: UInt , "min_fee_b" :: UInt @@ -1255,9 +1264,9 @@ type BlockfrostProtocolParametersRaw = , "pool_deposit" :: Stringed BigInt , "e_max" :: BigInt , "n_opt" :: UInt - , "a0" :: Finite BigNumber - , "rho" :: Finite BigNumber - , "tau" :: Finite BigNumber + , "a0" :: FiniteBigNumber + , "rho" :: FiniteBigNumber + , "tau" :: FiniteBigNumber , "protocol_major_ver" :: UInt , "protocol_minor_ver" :: UInt , "min_pool_cost" :: Stringed BigInt @@ -1265,8 +1274,8 @@ type BlockfrostProtocolParametersRaw = { "PlutusV1" :: { | CostModelV1 } , "PlutusV2" :: { | CostModelV2 } } - , "price_mem" :: Finite BigNumber - , "price_step" :: Finite BigNumber + , "price_mem" :: FiniteBigNumber + , "price_step" :: FiniteBigNumber , "max_tx_ex_mem" :: Stringed BigInt , "max_tx_ex_steps" :: Stringed BigInt , "max_block_ex_mem" :: Stringed BigInt @@ -1278,15 +1287,15 @@ type BlockfrostProtocolParametersRaw = , "coins_per_utxo_word" :: Maybe (Stringed BigInt) } -toFraction' :: Finite BigNumber -> String /\ String +toFraction' :: BigNumber -> String /\ String toFraction' bn = (BigNumber.toString numerator /\ BigNumber.toString denominator) where - (numerator /\ denominator) = toFraction (unpackFinite bn) + (numerator /\ denominator) = toFraction bn (BigNumber.fromNumber infinity) -bigNumberToRational :: Finite BigNumber -> Either JsonDecodeError Rational -bigNumberToRational bn = note (TypeMismatch "Rational") do +bigNumberToRational :: FiniteBigNumber -> Either JsonDecodeError Rational +bigNumberToRational (FiniteBigNumber bn) = note (TypeMismatch "Rational") do numerator <- BigInt.fromString numerator' denominator <- BigInt.fromString denominator' reduce numerator denominator @@ -1294,9 +1303,9 @@ bigNumberToRational bn = note (TypeMismatch "Rational") do (numerator' /\ denominator') = toFraction' bn bigNumberToPrice - :: Finite BigNumber + :: FiniteBigNumber -> Either JsonDecodeError { numerator :: BigNum, denominator :: BigNum } -bigNumberToPrice bn = note (TypeMismatch "Rational") do +bigNumberToPrice (FiniteBigNumber bn) = note (TypeMismatch "Rational") do numerator <- BigNum.fromString numerator' denominator <- BigNum.fromString denominator' pure { numerator, denominator } diff --git a/src/Internal/Types/EraSummaries.purs b/src/Internal/Types/EraSummaries.purs index e1d11c076e..ae6cf387c5 100644 --- a/src/Internal/Types/EraSummaries.purs +++ b/src/Internal/Types/EraSummaries.purs @@ -15,15 +15,15 @@ import Aeson ( class DecodeAeson , class EncodeAeson , encodeAeson + , finiteNumber , getField - , partialFiniteNumber ) import Ctl.Internal.Helpers (showWithParens) import Ctl.Internal.Serialization.Address (Slot) import Ctl.Internal.Service.Helpers (aesonObject) import Ctl.Internal.Types.Epoch (Epoch) import Data.Generic.Rep (class Generic) -import Data.Maybe (Maybe) +import Data.Maybe (Maybe, fromJust) import Data.Newtype (class Newtype, wrap) import Data.Show.Generic (genericShow) import JS.BigInt (BigInt) @@ -143,7 +143,7 @@ derive newtype instance DecodeAeson RelativeTime instance EncodeAeson RelativeTime where encodeAeson (RelativeTime rt) = -- We assume the numbers are finite. - encodeAeson $ unsafePartial partialFiniteNumber rt + encodeAeson $ unsafePartial $ fromJust $ finiteNumber rt instance Show RelativeTime where show (RelativeTime rt) = showWithParens "RelativeTime" rt @@ -170,7 +170,7 @@ derive newtype instance DecodeAeson SlotLength instance EncodeAeson SlotLength where encodeAeson (SlotLength sl) = -- We assume the numbers are finite. - encodeAeson $ unsafePartial partialFiniteNumber sl + encodeAeson $ unsafePartial $ fromJust $ finiteNumber sl instance Show SlotLength where show (SlotLength slotLength) = showWithParens "SlotLength" slotLength @@ -189,4 +189,3 @@ derive newtype instance EncodeAeson SafeZone instance Show SafeZone where show (SafeZone sz) = showWithParens "SafeZone" sz - diff --git a/src/Internal/Types/Interval.purs b/src/Internal/Types/Interval.purs index 9a957d5eba..69ec8c30e6 100644 --- a/src/Internal/Types/Interval.purs +++ b/src/Internal/Types/Interval.purs @@ -73,9 +73,9 @@ import Aeson , aesonNull , decodeAeson , encodeAeson + , finiteNumber , getField , isNull - , partialFiniteNumber , (.:) ) import Control.Monad.Error.Class (throwError) @@ -652,7 +652,7 @@ instance EncodeAeson SlotToPosixTimeError where slotToPosixTimeErrorStr "endTimeLessThanTime" -- We assume the numbers are finite - [ unsafePartial partialFiniteNumber absTime ] + [ unsafePartial $ fromJust $ finiteNumber absTime ] encodeAeson CannotGetBigIntFromNumber = do encodeAeson $ mkErrorRecord slotToPosixTimeErrorStr From 539093d4fca99de5651fed27f4052317eb361b79 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Wed, 8 Nov 2023 23:37:52 +0400 Subject: [PATCH 64/85] Remove big-integer runtime dep, update the template --- package-lock.json | 14 -------------- package.json | 1 - packages.dhall | 5 ++--- spago-packages.nix | 6 +++--- templates/ctl-scaffold/package-lock.json | 14 -------------- templates/ctl-scaffold/package.json | 1 - templates/ctl-scaffold/packages.dhall | 11 +++-------- templates/ctl-scaffold/spago-packages.nix | 6 +++--- 8 files changed, 11 insertions(+), 47 deletions(-) diff --git a/package-lock.json b/package-lock.json index 60e4d9aaba..e33f069314 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,6 @@ "apply-args-browser": "0.0.1", "apply-args-nodejs": "0.0.1", "base64-js": "^1.5.1", - "big-integer": "1.6.51", "bignumber.js": "^9.1.1", "bip39": "^3.1.0", "blakejs": "1.2.1", @@ -1234,14 +1233,6 @@ "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==", "dev": true }, - "node_modules/big-integer": { - "version": "1.6.51", - "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", - "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==", - "engines": { - "node": ">=0.6" - } - }, "node_modules/bignumber.js": { "version": "9.1.1", "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz", @@ -7267,11 +7258,6 @@ "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==", "dev": true }, - "big-integer": { - "version": "1.6.51", - "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", - "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==" - }, "bignumber.js": { "version": "9.1.1", "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz", diff --git a/package.json b/package.json index faa207c349..3eae60f6c6 100755 --- a/package.json +++ b/package.json @@ -44,7 +44,6 @@ "apply-args-browser": "0.0.1", "apply-args-nodejs": "0.0.1", "base64-js": "^1.5.1", - "big-integer": "1.6.51", "bignumber.js": "^9.1.1", "bip39": "^3.1.0", "blakejs": "1.2.1", diff --git a/packages.dhall b/packages.dhall index 316e965553..b409a65546 100644 --- a/packages.dhall +++ b/packages.dhall @@ -117,8 +117,6 @@ let additions = , "argonaut-core" , "arrays" , "bifunctors" - , "js-bigints" - , "bignumber" , "const" , "control" , "effect" @@ -127,6 +125,7 @@ let additions = , "foldable-traversable" , "foreign-object" , "integers" + , "js-bigints" , "lists" , "maybe" , "mote" @@ -145,7 +144,7 @@ let additions = , "untagged-union" ] , repo = "https://github.com/mlabs-haskell/purescript-aeson.git" - , version = "e885fa483ba374f34416049b96be0bb0cd591c0b" + , version = "v2.0.0" } , bignumber = { dependencies = diff --git a/spago-packages.nix b/spago-packages.nix index 8fc9f46bd2..67a7b2ab75 100644 --- a/spago-packages.nix +++ b/spago-packages.nix @@ -7,11 +7,11 @@ let "aeson" = pkgs.stdenv.mkDerivation { name = "aeson"; - version = "1da04ea8ff3656a4954b3ae2414da2d6a73ade82"; + version = "v2.0.0"; src = pkgs.fetchgit { url = "https://github.com/mlabs-haskell/purescript-aeson.git"; - rev = "1da04ea8ff3656a4954b3ae2414da2d6a73ade82"; - sha256 = "1brh39w3krjscnpsda5yk171yiq0ykf148bzapl1w21qc4g9ifpr"; + rev = "4fddd518a143de563299d484272a0ef18daa7dcd"; + sha256 = "1bz1z9l6nwf5yk45sbbjllmqvci0n1l92cvk3lgmni19g9silbrl"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; diff --git a/templates/ctl-scaffold/package-lock.json b/templates/ctl-scaffold/package-lock.json index 414a8c52d0..1a2c07f966 100644 --- a/templates/ctl-scaffold/package-lock.json +++ b/templates/ctl-scaffold/package-lock.json @@ -19,7 +19,6 @@ "apply-args-browser": "0.0.1", "apply-args-nodejs": "0.0.1", "base64-js": "^1.5.1", - "big-integer": "1.6.51", "bignumber.js": "^9.1.1", "bip39": "^3.1.0", "blakejs": "1.2.1", @@ -1179,14 +1178,6 @@ "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==", "dev": true }, - "node_modules/big-integer": { - "version": "1.6.51", - "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", - "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==", - "engines": { - "node": ">=0.6" - } - }, "node_modules/bignumber.js": { "version": "9.1.1", "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz", @@ -6363,11 +6354,6 @@ "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==", "dev": true }, - "big-integer": { - "version": "1.6.51", - "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", - "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==" - }, "bignumber.js": { "version": "9.1.1", "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz", diff --git a/templates/ctl-scaffold/package.json b/templates/ctl-scaffold/package.json index ad17c1b6f9..de23a588b3 100644 --- a/templates/ctl-scaffold/package.json +++ b/templates/ctl-scaffold/package.json @@ -35,7 +35,6 @@ "apply-args-browser": "0.0.1", "apply-args-nodejs": "0.0.1", "base64-js": "^1.5.1", - "big-integer": "1.6.51", "bignumber.js": "^9.1.1", "bip39": "^3.1.0", "blakejs": "1.2.1", diff --git a/templates/ctl-scaffold/packages.dhall b/templates/ctl-scaffold/packages.dhall index d171e03240..421343fae4 100644 --- a/templates/ctl-scaffold/packages.dhall +++ b/templates/ctl-scaffold/packages.dhall @@ -117,8 +117,6 @@ let additions = , "argonaut-core" , "arrays" , "bifunctors" - , "js-bigints" - , "bignumber" , "const" , "control" , "effect" @@ -127,6 +125,7 @@ let additions = , "foldable-traversable" , "foreign-object" , "integers" + , "js-bigints" , "lists" , "maybe" , "mote" @@ -145,7 +144,7 @@ let additions = , "untagged-union" ] , repo = "https://github.com/mlabs-haskell/purescript-aeson.git" - , version = "1da04ea8ff3656a4954b3ae2414da2d6a73ade82" + , version = "v2.0.0" } , bignumber = { dependencies = @@ -345,11 +344,7 @@ let additions = , version = "6e4debe87ddbafaa3c77033888f9c998e28cd7ca" } , js-bigints = - { dependencies = - [ "integers" - , "maybe" - , "prelude" - ] + { dependencies = [ "integers", "maybe", "prelude" ] , repo = "https://github.com/purescript-contrib/purescript-js-bigints" , version = "36a7d8ac75a7230043ae511f3145f9ed130954a9" } diff --git a/templates/ctl-scaffold/spago-packages.nix b/templates/ctl-scaffold/spago-packages.nix index 7019d9c064..9c9641db00 100644 --- a/templates/ctl-scaffold/spago-packages.nix +++ b/templates/ctl-scaffold/spago-packages.nix @@ -7,11 +7,11 @@ let "aeson" = pkgs.stdenv.mkDerivation { name = "aeson"; - version = "1da04ea8ff3656a4954b3ae2414da2d6a73ade82"; + version = "v2.0.0"; src = pkgs.fetchgit { url = "https://github.com/mlabs-haskell/purescript-aeson.git"; - rev = "1da04ea8ff3656a4954b3ae2414da2d6a73ade82"; - sha256 = "1brh39w3krjscnpsda5yk171yiq0ykf148bzapl1w21qc4g9ifpr"; + rev = "4fddd518a143de563299d484272a0ef18daa7dcd"; + sha256 = "1bz1z9l6nwf5yk45sbbjllmqvci0n1l92cvk3lgmni19g9silbrl"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; From fbf56b2965752ced05fd7f3a2d7ae6778e566df9 Mon Sep 17 00:00:00 2001 From: Drazen Popovic Date: Thu, 9 Nov 2023 11:22:33 +0100 Subject: [PATCH 65/85] Adds a missing NPM json-bigint upgrade in CTL scaffold --- templates/ctl-scaffold/package-lock.json | 20 +++++++------------- templates/ctl-scaffold/package.json | 2 +- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/templates/ctl-scaffold/package-lock.json b/templates/ctl-scaffold/package-lock.json index 1a2c07f966..7b3db0184c 100644 --- a/templates/ctl-scaffold/package-lock.json +++ b/templates/ctl-scaffold/package-lock.json @@ -14,7 +14,7 @@ "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.6", "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.6", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1", - "@mlabs-haskell/json-bigint": " 1.0.0", + "@mlabs-haskell/json-bigint": "2.0.0", "@noble/secp256k1": "^1.7.0", "apply-args-browser": "0.0.1", "apply-args-nodejs": "0.0.1", @@ -517,12 +517,9 @@ "integrity": "sha512-8pEb4BoQlD5zN+KtOCgtTg62OmLPjMa+DiJvoAzlLcWmp01P3TyJPgbEOtS+xiZpGA+1rRkdyeeLZV3wyw8Xfw==" }, "node_modules/@mlabs-haskell/json-bigint": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/json-bigint/-/json-bigint-1.0.0.tgz", - "integrity": "sha512-Opo07yXP/OU9mIoGmY5VVuDy5kxmb3fBAG3U9dbC15qK1OCpVLJAlxbdOfBmLOja94SnIfZINUU2xvYtVfk65w==", - "dependencies": { - "bignumber.js": "^9.0.0" - } + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/json-bigint/-/json-bigint-2.0.0.tgz", + "integrity": "sha512-JX9TON+nZbt+1TJ5MNV1Gcpxp3/m56x1/glDwzGtydrzQzyZbKg4XFw9Frib6fh89YVqjSFJ9xmVeIyDJ5DxTQ==" }, "node_modules/@noble/hashes": { "version": "1.3.1", @@ -5788,12 +5785,9 @@ "integrity": "sha512-8pEb4BoQlD5zN+KtOCgtTg62OmLPjMa+DiJvoAzlLcWmp01P3TyJPgbEOtS+xiZpGA+1rRkdyeeLZV3wyw8Xfw==" }, "@mlabs-haskell/json-bigint": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@mlabs-haskell/json-bigint/-/json-bigint-1.0.0.tgz", - "integrity": "sha512-Opo07yXP/OU9mIoGmY5VVuDy5kxmb3fBAG3U9dbC15qK1OCpVLJAlxbdOfBmLOja94SnIfZINUU2xvYtVfk65w==", - "requires": { - "bignumber.js": "^9.0.0" - } + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@mlabs-haskell/json-bigint/-/json-bigint-2.0.0.tgz", + "integrity": "sha512-JX9TON+nZbt+1TJ5MNV1Gcpxp3/m56x1/glDwzGtydrzQzyZbKg4XFw9Frib6fh89YVqjSFJ9xmVeIyDJ5DxTQ==" }, "@noble/hashes": { "version": "1.3.1", diff --git a/templates/ctl-scaffold/package.json b/templates/ctl-scaffold/package.json index de23a588b3..1997e20657 100644 --- a/templates/ctl-scaffold/package.json +++ b/templates/ctl-scaffold/package.json @@ -30,7 +30,7 @@ "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.6", "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.6", "@mlabs-haskell/csl-gc-wrapper": "^1.0.1", - "@mlabs-haskell/json-bigint": " 1.0.0", + "@mlabs-haskell/json-bigint": "2.0.0", "@noble/secp256k1": "^1.7.0", "apply-args-browser": "0.0.1", "apply-args-nodejs": "0.0.1", From 02869ce91023a5c57c836037e84067e4fa90263e Mon Sep 17 00:00:00 2001 From: Drazen Popovic Date: Mon, 13 Nov 2023 14:19:25 +0100 Subject: [PATCH 66/85] Fixes runPursTest setting of `node_modules` --- nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/default.nix b/nix/default.nix index ae72f1d614..8eaf5fddba 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -314,7 +314,7 @@ let cp -r $src/* . # Provide NPM dependencies to the test suite scripts - ln -sfn $NODE_PATH node_modules + ln -sfn ${nodeModules}/lib/node_modules node_modules # Call the main module and execute the entry point function ${nodejs}/bin/node --enable-source-maps -e 'import("./output/${testMain}/index.js").then(m => m.${psEntryPoint}())' From 908927efe7e16a8d3fca5236fd7dfca531cefe3d Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Tue, 21 Nov 2023 21:03:26 +0100 Subject: [PATCH 67/85] Update `easy-purscript-nix` nix flake input --- flake.lock | 7 +++---- flake.nix | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index a190b7bca4..bb53f80912 100644 --- a/flake.lock +++ b/flake.lock @@ -2269,17 +2269,16 @@ "easy-purescript-nix": { "flake": false, "locked": { - "lastModified": 1679861376, - "narHash": "sha256-LLqaLPJNiap2U8I77K5XVPGJA/Be30Z8lyGOyYXmBlc=", + "lastModified": 1696584097, + "narHash": "sha256-a9Hhqf/Fi0FkjRTcQr3pYDhrO9A9tdOkaeVgD23Cdrk=", "owner": "justinwoo", "repo": "easy-purescript-nix", - "rev": "0c10ff170461aed0c336f5c21ed0f430c2c3574b", + "rev": "d5fe5f4b210a0e4bac42ae0c159596a49c5eb016", "type": "github" }, "original": { "owner": "justinwoo", "repo": "easy-purescript-nix", - "rev": "0c10ff170461aed0c336f5c21ed0f430c2c3574b", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 85c24f2f50..ad96479b15 100644 --- a/flake.nix +++ b/flake.nix @@ -63,7 +63,7 @@ flake = false; }; easy-purescript-nix = { - url = "github:justinwoo/easy-purescript-nix/0c10ff170461aed0c336f5c21ed0f430c2c3574b"; + url = "github:justinwoo/easy-purescript-nix"; flake = false; }; From 98de298ea00e7f9c6ff2fb77130cabbe53fd3673 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Wed, 22 Nov 2023 11:41:10 +0100 Subject: [PATCH 68/85] Add Hercules CI `flake-update` effect --- flake.lock | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 18 ++++++++++++++++- 2 files changed, 74 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index a190b7bca4..d051da0c8b 100644 --- a/flake.lock +++ b/flake.lock @@ -2752,6 +2752,26 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "hercules-ci-effects", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, "flake-utils": { "locked": { "lastModified": 1667395993, @@ -3899,6 +3919,25 @@ "type": "github" } }, + "hercules-ci-effects": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_70" + }, + "locked": { + "lastModified": 1699381651, + "narHash": "sha256-mZlQ54xJs3j5+SJrLhzePPMXzS+Czbx7gNyOnOAQrHA=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "0bd99f5ab7ec7a74c11238bd02bb29e709c14328", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, "hls-1.10": { "flake": false, "locked": { @@ -5559,7 +5598,7 @@ "nix_16": { "inputs": { "lowdown-src": "lowdown-src_16", - "nixpkgs": "nixpkgs_70", + "nixpkgs": "nixpkgs_71", "nixpkgs-regression": "nixpkgs-regression_14" }, "locked": { @@ -7758,6 +7797,22 @@ } }, "nixpkgs_70": { + "locked": { + "lastModified": 1697723726, + "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_71": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -8438,6 +8493,7 @@ "flake-compat": "flake-compat_11", "hackage-nix": "hackage-nix", "haskell-nix": "haskell-nix_3", + "hercules-ci-effects": "hercules-ci-effects", "iohk-nix": "iohk-nix_2", "kupo": "kupo", "kupo-nixos": "kupo-nixos", diff --git a/flake.nix b/flake.nix index 85c24f2f50..d938a37dc3 100644 --- a/flake.nix +++ b/flake.nix @@ -81,6 +81,8 @@ cardano-node.follows = "cardano-node"; }; }; + + hercules-ci-effects.url = "github:hercules-ci/hercules-ci-effects"; }; outputs = @@ -511,6 +513,20 @@ }; }; - herculesCI.ciSystems = [ "x86_64-linux" ]; + herculesCI = inputs.hercules-ci-effects.lib.mkHerculesCI { inherit inputs; } { + hercules-ci.flake-update = { + enable = true; + updateBranch = "updated-flake-lock"; + createPullRequest = true; + autoMergeMethod = null; + when = { + minute = 00; + hour = 12; + dayOfWeek = "Sun"; + }; + }; + + herculesCI.ciSystems = [ "x86_64-linux" ]; + }; }; } From 4eebbd49c1478e043aa077caf57b47189da60255 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Tue, 21 Nov 2023 21:03:26 +0100 Subject: [PATCH 69/85] Update `easy-purscript-nix` nix flake input --- flake.lock | 7 +++---- flake.nix | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index d051da0c8b..9c976bfd2a 100644 --- a/flake.lock +++ b/flake.lock @@ -2269,17 +2269,16 @@ "easy-purescript-nix": { "flake": false, "locked": { - "lastModified": 1679861376, - "narHash": "sha256-LLqaLPJNiap2U8I77K5XVPGJA/Be30Z8lyGOyYXmBlc=", + "lastModified": 1696584097, + "narHash": "sha256-a9Hhqf/Fi0FkjRTcQr3pYDhrO9A9tdOkaeVgD23Cdrk=", "owner": "justinwoo", "repo": "easy-purescript-nix", - "rev": "0c10ff170461aed0c336f5c21ed0f430c2c3574b", + "rev": "d5fe5f4b210a0e4bac42ae0c159596a49c5eb016", "type": "github" }, "original": { "owner": "justinwoo", "repo": "easy-purescript-nix", - "rev": "0c10ff170461aed0c336f5c21ed0f430c2c3574b", "type": "github" } }, diff --git a/flake.nix b/flake.nix index d938a37dc3..821ca51dbb 100644 --- a/flake.nix +++ b/flake.nix @@ -63,7 +63,7 @@ flake = false; }; easy-purescript-nix = { - url = "github:justinwoo/easy-purescript-nix/0c10ff170461aed0c336f5c21ed0f430c2c3574b"; + url = "github:justinwoo/easy-purescript-nix"; flake = false; }; From a0469ebf4339ee6d678c2e1271c3e7ed158353ac Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Fri, 24 Nov 2023 14:21:19 +0400 Subject: [PATCH 70/85] Fix merge --- src/Internal/Deserialization/Transaction.js | 4 ++++ src/Internal/QueryM.purs | 1 - src/Internal/QueryM/Ogmios.purs | 1 - test/Ogmios/EvaluateTx.purs | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Internal/Deserialization/Transaction.js b/src/Internal/Deserialization/Transaction.js index ddeb9881f2..57faa3572c 100644 --- a/src/Internal/Deserialization/Transaction.js +++ b/src/Internal/Deserialization/Transaction.js @@ -135,6 +135,10 @@ export function _unpackMint(containerhelper) { return containerhelper.unpackKeyIndexed; } +export function _unpackMintAssets(containerhelper) { + return containerhelper.unpackKeyIndexed; +} + export function _convertCert(certConvHelper) { return cert => { switch (cert.kind()) { diff --git a/src/Internal/QueryM.purs b/src/Internal/QueryM.purs index 0b0e314d73..79137872d6 100644 --- a/src/Internal/QueryM.purs +++ b/src/Internal/QueryM.purs @@ -78,7 +78,6 @@ import Control.Monad.Rec.Class (class MonadRec) import Control.Parallel (class Parallel, parallel, sequential) import Control.Plus (class Plus) import Ctl.Internal.Affjax (request) as Affjax -import Ctl.Internal.Cardano.Types.Transaction (PoolPubKeyHash) import Ctl.Internal.Helpers (logWithLevel) import Ctl.Internal.JsWebSocket ( JsWebSocket diff --git a/src/Internal/QueryM/Ogmios.purs b/src/Internal/QueryM/Ogmios.purs index e467c0001e..b9a0b0a701 100644 --- a/src/Internal/QueryM/Ogmios.purs +++ b/src/Internal/QueryM/Ogmios.purs @@ -213,7 +213,6 @@ import Foreign.Object (Object) import Foreign.Object as Object import JS.BigInt (BigInt) import JS.BigInt as BigInt -import Partial.Unsafe (unsafePartial) import Untagged.TypeCheck (class HasRuntimeType) import Untagged.Union (type (|+|), toEither1) diff --git a/test/Ogmios/EvaluateTx.purs b/test/Ogmios/EvaluateTx.purs index c05fceb212..3047dc4d9c 100644 --- a/test/Ogmios/EvaluateTx.purs +++ b/test/Ogmios/EvaluateTx.purs @@ -17,13 +17,13 @@ import Ctl.Internal.QueryM.Ogmios ) import Ctl.Internal.Test.TestPlanM (TestPlanM) import Ctl.Internal.Types.RedeemerTag (RedeemerTag(Spend, Cert, Reward)) -import Data.BigInt as BigInt import Data.Either (Either(Left, Right)) import Data.Map as Map import Data.Maybe (fromJust) import Data.Tuple.Nested (type (/\), (/\)) import Effect.Aff (Aff) import Effect.Class (liftEffect) +import JS.BigInt as BigInt import Mote (group, test) import Partial.Unsafe (unsafePartial) import Test.Ctl.Fixtures From fffaed0f2ce25cab803511b6c4ed03d860bfd7f8 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Sat, 25 Nov 2023 18:18:55 +0400 Subject: [PATCH 71/85] Fix formatting, improve unit test speed --- templates/ctl-scaffold/esbuild/bundle.js | 2 +- templates/ctl-scaffold/esbuild/config.js | 2 +- templates/ctl-scaffold/esbuild/serve.js | 2 +- templates/ctl-scaffold/webpack.config.cjs | 2 +- test/Partition.purs | 9 ++++----- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/templates/ctl-scaffold/esbuild/bundle.js b/templates/ctl-scaffold/esbuild/bundle.js index 7ff2cc3a3e..91fc9c774b 100644 --- a/templates/ctl-scaffold/esbuild/bundle.js +++ b/templates/ctl-scaffold/esbuild/bundle.js @@ -9,5 +9,5 @@ esbuild.build( buildOptions({ entryPoint: process.argv[2], outfile: process.argv[3], - }) + }), ); diff --git a/templates/ctl-scaffold/esbuild/config.js b/templates/ctl-scaffold/esbuild/config.js index c1785847af..996ca4335f 100755 --- a/templates/ctl-scaffold/esbuild/config.js +++ b/templates/ctl-scaffold/esbuild/config.js @@ -33,7 +33,7 @@ export const buildOptions = ({ entryPoint, outfile }) => { fs: true, os: true, }, - }) + }), ); } diff --git a/templates/ctl-scaffold/esbuild/serve.js b/templates/ctl-scaffold/esbuild/serve.js index ecfc84a915..a6843b4995 100644 --- a/templates/ctl-scaffold/esbuild/serve.js +++ b/templates/ctl-scaffold/esbuild/serve.js @@ -11,7 +11,7 @@ const ctx = await esbuild.context( buildOptions({ entryPoint: process.argv[2], outfile: process.argv[3], - }) + }), ); const config = { diff --git a/templates/ctl-scaffold/webpack.config.cjs b/templates/ctl-scaffold/webpack.config.cjs index f492dc070a..d5fcdf1c63 100644 --- a/templates/ctl-scaffold/webpack.config.cjs +++ b/templates/ctl-scaffold/webpack.config.cjs @@ -106,7 +106,7 @@ module.exports = env => { config.plugins.push( new webpack.ProvidePlugin({ Buffer: ["buffer", "Buffer"], - }) + }), ); // Provide NodeJS polyfills config.plugins.push(new NodePolyfillPlugin()); diff --git a/test/Partition.purs b/test/Partition.purs index dfa9e868f5..b636be4003 100644 --- a/test/Partition.purs +++ b/test/Partition.purs @@ -24,7 +24,7 @@ import JS.BigInt (fromInt) as BigInt import Mote (group, test) import Test.QuickCheck.Arbitrary (class Arbitrary, arbitrary) import Test.QuickCheck.Gen (suchThat) -import Test.Spec.QuickCheck (quickCheck) +import Test.Spec.QuickCheck (quickCheck, quickCheck') suite :: TestPlanM (Aff Unit) Unit suite = @@ -53,13 +53,13 @@ suite = (quickCheck prop_equipartitionBigInt_length) test "prop_equipartitionBigInt_sum" - (quickCheck prop_equipartitionBigInt_sum) + (quickCheck' 10 prop_equipartitionBigInt_sum) test "prop_equipartitionBigInt_order" - (quickCheck prop_equipartitionBigInt_order) + (quickCheck' 10 prop_equipartitionBigInt_order) test "prop_equipartitionBigInt_fair" - (quickCheck prop_equipartitionBigInt_fair) + (quickCheck' 10 prop_equipartitionBigInt_fair) prop_partitionBigInt_pos_weights :: BigInt' -> BigIntNeg -> NonEmptyArray BigIntGeqOne -> Boolean @@ -183,4 +183,3 @@ derive instance Newtype IntGeqOne _ instance Arbitrary IntGeqOne where arbitrary = IntGeqOne <$> suchThat arbitrary (_ >= one) - From 46be7345d3e4082314cf735c9f2944ac07758441 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Tue, 5 Dec 2023 12:10:52 +0100 Subject: [PATCH 72/85] Fix Arion volumes Latest Arion version has a specific `volumes` option --- nix/runtime.nix | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/nix/runtime.nix b/nix/runtime.nix index 9f0ca6d904..46b2d7c2b3 100644 --- a/nix/runtime.nix +++ b/nix/runtime.nix @@ -247,18 +247,17 @@ rec { in { project.name = "ctl-runtime"; - docker-compose.raw = pkgs.lib.recursiveUpdate - { - volumes = { - "${nodeDbVol}" = { }; - "${nodeIpcVol}" = { }; - "${kupoDbVol}" = { }; - } // (if config.blockfrost.enable then { - "${dbSyncStateVol}" = { }; - "${dbSyncTmpVol}" = { }; - } else { }); - } - config.extraDockerCompose; + docker-compose = { + raw = config.extraDockerCompose; + volumes = { + "${nodeDbVol}" = { }; + "${nodeIpcVol}" = { }; + "${kupoDbVol}" = { }; + } // pkgs.lib.optionalAttrs config.blockfrost.enable { + "${dbSyncStateVol}" = { }; + "${dbSyncTmpVol}" = { }; + }; + }; services = pkgs.lib.recursiveUpdate defaultServices config.extraServices; }; From a5879fd4da5bc369353363bc10432a8c9153824c Mon Sep 17 00:00:00 2001 From: Drazen Popovic Date: Mon, 11 Dec 2023 11:42:05 +0100 Subject: [PATCH 73/85] Fixes CIP links to https://cips.cardano.org/cip/CIP-... --- doc/babbage-features.md | 8 ++++---- doc/cip-25-nfts.md | 2 +- doc/key-management.md | 2 +- doc/query-layers.md | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/babbage-features.md b/doc/babbage-features.md index cd123757aa..02a32211a5 100644 --- a/doc/babbage-features.md +++ b/doc/babbage-features.md @@ -14,7 +14,7 @@ This document is a reference/explainer for the new CTL APIs introduced for Babba ## Reference Inputs -[Reference inputs](https://cips.cardano.org/cips/cip31/#referenceinputs) allow looking at an output without spending it in Plutus scripts. +[Reference inputs](https://cips.cardano.org/cip/CIP-0031#reference-inputs) allow looking at an output without spending it in Plutus scripts. There are two ways to use an input as a reference in the constraints API: @@ -28,7 +28,7 @@ There are two ways to use an input as a reference in the constraints API: ## Reference Scripts -[Reference Scripts](https://developers.cardano.org/docs/governance/cardano-improvement-proposals/cip-0033/) allows the use of scripts without attaching them to the transaction (and using a reference instead). +[Reference Scripts](https://cips.cardano.org/cip/CIP-0033) allows the use of scripts without attaching them to the transaction (and using a reference instead). Reference scripts can be utilized in CTL by first creating a reference point for the script to be used later via `mustPayToScriptWithScriptRef` (or its variants). @@ -40,7 +40,7 @@ Then, `mustSpendScriptOutputUsingScriptRef` (or its variants) can be used to use ## Inline Data -[CIP-32](https://developers.cardano.org/docs/governance/cardano-improvement-proposals/cip-0032/) introduces the inline data feature that allows storing datum values directly in transaction outputs, instead of just the hashes. +[CIP-32](https://cips.cardano.org/cip/CIP-0032) introduces the inline data feature that allows storing datum values directly in transaction outputs, instead of just the hashes. In CTL, alternating between datum storage options can be achieved by specifying a `DatumPresence` value with constraints that accept it, like `mustPayToPubKeyWithDatum`. @@ -48,6 +48,6 @@ In CTL, alternating between datum storage options can be achieved by specifying ## Collateral Output -[CIP-40](https://cips.cardano.org/cips/cip40/) introduces explicit collateral output. On validation failure, previously the entire collateral was consumed. Now, if excess collateral is supplied, even with native assets, the surplus can be returned on validation failure. +[CIP-40](https://cips.cardano.org/cip/CIP-0040) introduces explicit collateral output. On validation failure, previously the entire collateral was consumed. Now, if excess collateral is supplied, even with native assets, the surplus can be returned on validation failure. Collateral output is automatically added to transactions in CTL. To trigger a collateral return, the `mustNotBeValid` constraint should be explicitly specified, otherwise a script error would be detected earlier and the transaction will not be sent. diff --git a/doc/cip-25-nfts.md b/doc/cip-25-nfts.md index 4111512317..6c15688914 100644 --- a/doc/cip-25-nfts.md +++ b/doc/cip-25-nfts.md @@ -2,6 +2,6 @@ # CIP-25 NFT Metadata standard -CTL includes [CIP-25](https://cips.cardano.org/cips/cip25/) (v2) domain type definitions that enable creation of standard-compliant applications with ease. The definitions abstract away conversions between PlutusData and PureScript types. +CTL includes [CIP-25](https://cips.cardano.org/cip/CIP-0025) (v2) domain type definitions that enable creation of standard-compliant applications with ease. The definitions abstract away conversions between PlutusData and PureScript types. See [`Contract.Metadata`](https://plutonomicon.github.io/cardano-transaction-lib/Contract.Metadata.html#t:Cip25MetadataEntry) module. diff --git a/doc/key-management.md b/doc/key-management.md index b5e0a90008..f4635b65c5 100644 --- a/doc/key-management.md +++ b/doc/key-management.md @@ -11,7 +11,7 @@ # Key Management -The process of going from private key menmonic to a set of addresses that the wallet can use is well specified in [CIP-1852](https://cips.cardano.org/cips/cip1852/). +The process of going from private key menmonic to a set of addresses that the wallet can use is well specified in [CIP-1852](https://cips.cardano.org/cip/CIP-1852). For an address to be built, the user must provide some entropy for private key derivation and a *derivation path*, that specifies a list of cryptographic operations to perform on the "parent" or "root" key to get the "child" private key that can be used for signing. diff --git a/doc/query-layers.md b/doc/query-layers.md index eb21cd9901..c714c51e5c 100644 --- a/doc/query-layers.md +++ b/doc/query-layers.md @@ -21,7 +21,7 @@ In CTL context, the following query layers can be used, depending on backend cho - [Ogmios](https://ogmios.dev/) ([CTL backend](./runtime.md#ctl-backend)) - [Kupo](https://cardanosolutions.github.io/kupo/) ([CTL backend](./runtime.md#ctl-backend)) - [Blockfrost](https://blockfrost.io/) ([Blockfrost backend](./blockfrost.md)) -- [CIP-30 light wallet browser extensions](https://cips.cardano.org/cips/cip30/) (any backend) +- [CIP-30 light wallet browser extensions](https://cips.cardano.org/cip/CIP-0030) (any backend) ## Wallet/Backend Inconsistency @@ -36,7 +36,7 @@ Thus, the goal of the developers is to ensure that the set of UTxOs available to CTL tries to be smart when dealing with the issue, and it aims to let the user work with both query layers as if it was one. To achieve this guarantee, CTL follows three simple rules: - **Rule 1** Whenever there is a *wallet operation* the result of which depends on the set of available UTxOs, CTL delays the execution until it reaches a state where *all wallet UTxOs are known to the backend*. These operations are assumed to be `getWalletUtxos`, `getWalletCollateral` and `getWalletBalance`. -- **Rule 2** Whenever there is a transaction *`signTx`* [CIP-30](https://cips.cardano.org/cips/cip30/) call, the execution is delayed until all transaction inputs that come from one of the addresses controlled by the wallet *are known to the wallet*. +- **Rule 2** Whenever there is a transaction *`signTx`* [CIP-30](https://cips.cardano.org/cip/CIP-0030) call, the execution is delayed until all transaction inputs that come from one of the addresses controlled by the wallet *are known to the wallet*. - **Rule 3** Whenever CTL is asked to await for *transaction confirmation*, the execution is delayed until the *UTxOs that the transaction creates at wallet addresses* are visible to the wallet. The rules are implemented as 3 callable functions, which we call *synchronization primitives*: From cfcaa6cfc31ab6564479331e9d7067df0b513b31 Mon Sep 17 00:00:00 2001 From: Drazen Popovic Date: Mon, 11 Dec 2023 16:16:44 +0100 Subject: [PATCH 74/85] Trying an upgrade of cardano-node v8.1.1 and pinned cardano-configs --- flake.lock | 1809 ++++++++++++++++++++++++++++++++--------------- flake.nix | 5 +- nix/runtime.nix | 2 +- 3 files changed, 1239 insertions(+), 577 deletions(-) diff --git a/flake.lock b/flake.lock index a4c6aaeb68..a9b6f3b57b 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ "CHaP_2": { "flake": false, "locked": { - "lastModified": 1686070892, - "narHash": "sha256-0yAYqvCg2/aby4AmW0QQK9RKnU1siQczfbUC6hOU02w=", + "lastModified": 1696538731, + "narHash": "sha256-oTsPiABmN7mw9hctagxzNcIDtvmyK4EuBzvMD2iXeeQ=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "596cf203a0a1ba252a083a79d384325000faeb49", + "rev": "4276a203ed968d067b6c31c943b5bae5fc2ec4a2", "type": "github" }, "original": { @@ -182,7 +182,7 @@ }, "agenix": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1641576265, @@ -200,8 +200,8 @@ }, "agenix-cli": { "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_10" + "flake-utils": "flake-utils_8", + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1641404293, @@ -219,8 +219,8 @@ }, "agenix-cli_2": { "inputs": { - "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_12" + "flake-utils": "flake-utils_9", + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1641404293, @@ -238,8 +238,8 @@ }, "agenix-cli_3": { "inputs": { - "flake-utils": "flake-utils_18", - "nixpkgs": "nixpkgs_41" + "flake-utils": "flake-utils_20", + "nixpkgs": "nixpkgs_43" }, "locked": { "lastModified": 1641404293, @@ -257,7 +257,7 @@ }, "agenix_2": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1641576265, @@ -350,7 +350,7 @@ }, "agenix_6": { "inputs": { - "nixpkgs": "nixpkgs_40" + "nixpkgs": "nixpkgs_42" }, "locked": { "lastModified": 1641576265, @@ -418,7 +418,7 @@ "alejandra": { "inputs": { "flakeCompat": "flakeCompat", - "nixpkgs": "nixpkgs_35" + "nixpkgs": "nixpkgs_37" }, "locked": { "lastModified": 1646360966, @@ -534,22 +534,22 @@ "inputs": { "agenix": "agenix", "agenix-cli": "agenix-cli", - "blank": "blank_2", + "blank": "blank_3", "capsules": "capsules", "data-merge": "data-merge", "deploy": "deploy_2", - "fenix": "fenix_4", + "fenix": "fenix_5", "hydra": "hydra_3", - "n2c": "n2c_2", + "n2c": "n2c_3", "nix": "nix_5", - "nixpkgs": "nixpkgs_29", + "nixpkgs": "nixpkgs_31", "nixpkgs-docker": "nixpkgs-docker", "nixpkgs-unstable": "nixpkgs-unstable_3", "nomad-driver-nix": "nomad-driver-nix_2", "nomad-follower": "nomad-follower_2", "ops-lib": "ops-lib_3", "ragenix": "ragenix_3", - "std": "std_2", + "std": "std_3", "terranix": "terranix_2", "utils": "utils_12" }, @@ -629,12 +629,12 @@ "inputs": { "agenix": "agenix_2", "agenix-cli": "agenix-cli_2", - "blank": "blank_3", + "blank": "blank_4", "deploy": "deploy", - "fenix": "fenix_2", + "fenix": "fenix_3", "hydra": "hydra_2", "nix": "nix_2", - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_17", "nixpkgs-unstable": "nixpkgs-unstable_2", "nomad": "nomad", "nomad-driver-nix": "nomad-driver-nix", @@ -663,12 +663,12 @@ "inputs": { "agenix": "agenix_6", "agenix-cli": "agenix-cli_3", - "blank": "blank_4", + "blank": "blank_5", "deploy": "deploy_3", - "fenix": "fenix_6", + "fenix": "fenix_7", "hydra": "hydra_4", "nix": "nix_9", - "nixpkgs": "nixpkgs_44", + "nixpkgs": "nixpkgs_46", "nixpkgs-unstable": "nixpkgs-unstable_4", "nomad": "nomad_2", "nomad-driver-nix": "nomad-driver-nix_3", @@ -768,6 +768,21 @@ "type": "github" } }, + "blank_6": { + "locked": { + "lastModified": 1625557891, + "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", + "owner": "divnix", + "repo": "blank", + "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "blank", + "type": "github" + } + }, "blockfrost": { "inputs": { "nixpkgs": "nixpkgs" @@ -1198,7 +1213,7 @@ "inputs": { "bitte": "bitte_2", "iogo": "iogo", - "nixpkgs": "nixpkgs_23", + "nixpkgs": "nixpkgs_25", "ragenix": "ragenix_2" }, "locked": { @@ -1219,7 +1234,7 @@ "inputs": { "bitte": "bitte_3", "iogo": "iogo_2", - "nixpkgs": "nixpkgs_52", + "nixpkgs": "nixpkgs_54", "ragenix": "ragenix_5" }, "locked": { @@ -1247,10 +1262,7 @@ "cardano-node", "nixpkgs" ], - "tullia": [ - "cardano-node", - "tullia" - ] + "tullia": "tullia" }, "locked": { "lastModified": 1679408951, @@ -1269,16 +1281,17 @@ "cardano-configurations": { "flake": false, "locked": { - "lastModified": 1700184336, - "narHash": "sha256-YhGAINYsk5qmHNOzoaB3vfItytsuADAA6XrFsfOOHQ8=", + "lastModified": 1699561895, + "narHash": "sha256-bLNN6lJUe5dR1EOdtDspReE2fu2EV7hQMHFGDinxf5Y=", "owner": "input-output-hk", "repo": "cardano-configurations", - "rev": "bd40a1ee99782196a70e8fa084a572c276d1d297", + "rev": "d952529afdfdf6d53ce190b1bf8af990a7ae9590", "type": "github" }, "original": { "owner": "input-output-hk", "repo": "cardano-configurations", + "rev": "d952529afdfdf6d53ce190b1bf8af990a7ae9590", "type": "github" } }, @@ -1333,7 +1346,7 @@ }, "cardano-mainnet-mirror": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1642701714, @@ -1358,7 +1371,7 @@ "customConfig": "customConfig", "em": "em", "empty-flake": "empty-flake", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "hackageNix": "hackageNix", "haskellNix": "haskellNix", "hostNixpkgs": [ @@ -1366,32 +1379,27 @@ "nixpkgs" ], "iohkNix": "iohkNix", - "nix2container": "nix2container", + "nix2container": "nix2container_2", "nixpkgs": [ "cardano-node", "haskellNix", "nixpkgs-unstable" ], "ops-lib": "ops-lib", - "std": [ - "cardano-node", - "tullia", - "std" - ], - "tullia": "tullia", + "std": "std_2", "utils": "utils_2" }, "locked": { - "lastModified": 1687190129, - "narHash": "sha256-JCa9+QhZ2RVSIKkhz2WCZqTKCgdUSuezWS2YsQ5vhM4=", + "lastModified": 1696549777, + "narHash": "sha256-ONCnN1fLtYJB9kXDlUbF6nIjTnlqvI7kfppftrOOWAY=", "owner": "input-output-hk", "repo": "cardano-node", - "rev": "6f79e5c3ea109a70cd01910368e011635767305a", + "rev": "f1ce770834bf7150ca29cb647065c9e62d39be1a", "type": "github" }, "original": { "owner": "input-output-hk", - "ref": "8.1.1", + "ref": "8.5.0-pre", "repo": "cardano-node", "type": "github" } @@ -1530,8 +1538,8 @@ "customConfig": "customConfig_2", "ema": "ema", "emanote": "emanote", - "flake-compat": "flake-compat_8", - "flake-utils": "flake-utils_25", + "flake-compat": "flake-compat_9", + "flake-utils": "flake-utils_27", "haskellNix": "haskellNix_2", "hostNixpkgs": [ "db-sync", @@ -1577,13 +1585,13 @@ "cardano-node": "cardano-node_2", "cardano-wallet": "cardano-wallet", "data-merge": "data-merge_3", - "flake-compat": "flake-compat_9", + "flake-compat": "flake-compat_10", "hackage": "hackage_3", "haskell-nix": "haskell-nix_2", "iohk-nix": "iohk-nix", - "n2c": "n2c_3", + "n2c": "n2c_4", "nix-inclusive": "nix-inclusive", - "nixpkgs": "nixpkgs_63", + "nixpkgs": "nixpkgs_65", "nixpkgs-haskell": [ "db-sync", "cardano-world", @@ -1591,7 +1599,7 @@ "nixpkgs-unstable" ], "ogmios": "ogmios", - "std": "std_3", + "std": "std_4", "tullia": "tullia_2" }, "locked": { @@ -1612,14 +1620,14 @@ "inputs": { "alejandra": "alejandra", "data-merge": "data-merge_2", - "devshell": "devshell_8", + "devshell": "devshell_9", "driver": "driver", "follower": "follower", "haskell-nix": "haskell-nix", "inclusive": "inclusive_8", "nix": "nix_8", "nix-cache-proxy": "nix-cache-proxy", - "nixpkgs": "nixpkgs_39", + "nixpkgs": "nixpkgs_41", "poetry2nix": "poetry2nix", "utils": "utils_16" }, @@ -1637,6 +1645,32 @@ "type": "github" } }, + "crane": { + "inputs": { + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_7", + "nixpkgs": [ + "cardano-node", + "std", + "paisano-mdbook-preprocessor", + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1676162383, + "narHash": "sha256-krUCKdz7ebHlFYm/A7IbKDnj2ZmMMm3yIEQcooqm7+E=", + "owner": "ipetkov", + "repo": "crane", + "rev": "6fb400ec631b22ccdbc7090b38207f7fb5cfb5f2", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "customConfig": { "locked": { "lastModified": 1630400035, @@ -1682,7 +1716,7 @@ "data-merge": { "inputs": { "nixlib": "nixlib", - "yants": "yants_2" + "yants": "yants_3" }, "locked": { "lastModified": 1648237091, @@ -1719,7 +1753,7 @@ "data-merge_3": { "inputs": { "nixlib": "nixlib_3", - "yants": "yants_4" + "yants": "yants_5" }, "locked": { "lastModified": 1655854240, @@ -1739,7 +1773,7 @@ "inputs": { "cardano-world": "cardano-world", "customConfig": "customConfig_3", - "flake-compat": "flake-compat_10", + "flake-compat": "flake-compat_11", "haskellNix": "haskellNix_3", "iohkNix": "iohkNix_3", "nixpkgs": [ @@ -1766,8 +1800,8 @@ }, "deploy": { "inputs": { - "fenix": "fenix", - "flake-compat": "flake-compat_4", + "fenix": "fenix_2", + "flake-compat": "flake-compat_5", "nixpkgs": [ "db-sync", "cardano-world", @@ -1796,8 +1830,8 @@ }, "deploy_2": { "inputs": { - "fenix": "fenix_3", - "flake-compat": "flake-compat_5", + "fenix": "fenix_4", + "flake-compat": "flake-compat_6", "nixpkgs": [ "db-sync", "cardano-world", @@ -1824,8 +1858,8 @@ }, "deploy_3": { "inputs": { - "fenix": "fenix_5", - "flake-compat": "flake-compat_6", + "fenix": "fenix_6", + "flake-compat": "flake-compat_7", "nixpkgs": [ "db-sync", "cardano-world", @@ -1855,12 +1889,14 @@ "inputs": { "flake-utils": [ "cardano-node", + "cardano-automation", "tullia", "std", "flake-utils" ], "nixpkgs": [ "cardano-node", + "cardano-automation", "tullia", "std", "nixpkgs" @@ -1881,6 +1917,21 @@ } }, "devshell_10": { + "locked": { + "lastModified": 1632436039, + "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", + "owner": "numtide", + "repo": "devshell", + "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_11": { "locked": { "lastModified": 1636119665, "narHash": "sha256-e11Z9PyH9hdgTm4Vyl8S5iTwrv0um6+srzb1Ba+YUHA=", @@ -1895,7 +1946,7 @@ "type": "github" } }, - "devshell_11": { + "devshell_12": { "locked": { "lastModified": 1636119665, "narHash": "sha256-e11Z9PyH9hdgTm4Vyl8S5iTwrv0um6+srzb1Ba+YUHA=", @@ -1910,7 +1961,7 @@ "type": "github" } }, - "devshell_12": { + "devshell_13": { "locked": { "lastModified": 1632436039, "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", @@ -1925,7 +1976,7 @@ "type": "github" } }, - "devshell_13": { + "devshell_14": { "locked": { "lastModified": 1636119665, "narHash": "sha256-e11Z9PyH9hdgTm4Vyl8S5iTwrv0um6+srzb1Ba+YUHA=", @@ -1940,7 +1991,7 @@ "type": "github" } }, - "devshell_14": { + "devshell_15": { "locked": { "lastModified": 1637098489, "narHash": "sha256-IWBYLSNSENI/fTrXdYDhuCavxcgN9+RERrPM81f6DXY=", @@ -1955,7 +2006,7 @@ "type": "github" } }, - "devshell_15": { + "devshell_16": { "inputs": { "flake-utils": [ "db-sync", @@ -1984,9 +2035,9 @@ "type": "github" } }, - "devshell_16": { + "devshell_17": { "inputs": { - "flake-utils": "flake-utils_31", + "flake-utils": "flake-utils_33", "nixpkgs": [ "db-sync", "cardano-world", @@ -2010,6 +2061,29 @@ } }, "devshell_2": { + "inputs": { + "nixpkgs": [ + "cardano-node", + "std", + "nixpkgs" + ], + "systems": "systems" + }, + "locked": { + "lastModified": 1686680692, + "narHash": "sha256-SsLZz3TDleraAiJq4EkmdyewSyiv5g0LZYc6vaLZOMQ=", + "owner": "numtide", + "repo": "devshell", + "rev": "fd6223370774dd9c33354e87a007004b5fd36442", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_3": { "locked": { "lastModified": 1632436039, "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", @@ -2024,7 +2098,7 @@ "type": "github" } }, - "devshell_3": { + "devshell_4": { "locked": { "lastModified": 1636119665, "narHash": "sha256-e11Z9PyH9hdgTm4Vyl8S5iTwrv0um6+srzb1Ba+YUHA=", @@ -2039,7 +2113,7 @@ "type": "github" } }, - "devshell_4": { + "devshell_5": { "locked": { "lastModified": 1637098489, "narHash": "sha256-IWBYLSNSENI/fTrXdYDhuCavxcgN9+RERrPM81f6DXY=", @@ -2054,7 +2128,7 @@ "type": "github" } }, - "devshell_5": { + "devshell_6": { "locked": { "lastModified": 1632436039, "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", @@ -2069,7 +2143,7 @@ "type": "github" } }, - "devshell_6": { + "devshell_7": { "locked": { "lastModified": 1636119665, "narHash": "sha256-e11Z9PyH9hdgTm4Vyl8S5iTwrv0um6+srzb1Ba+YUHA=", @@ -2084,7 +2158,7 @@ "type": "github" } }, - "devshell_7": { + "devshell_8": { "inputs": { "flake-utils": [ "db-sync", @@ -2115,10 +2189,10 @@ "type": "github" } }, - "devshell_8": { + "devshell_9": { "inputs": { - "flake-utils": "flake-utils_15", - "nixpkgs": "nixpkgs_36" + "flake-utils": "flake-utils_17", + "nixpkgs": "nixpkgs_38" }, "locked": { "lastModified": 1644227066, @@ -2134,31 +2208,18 @@ "type": "github" } }, - "devshell_9": { - "locked": { - "lastModified": 1632436039, - "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", - "owner": "numtide", - "repo": "devshell", - "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "dmerge": { "inputs": { "nixlib": [ "cardano-node", + "cardano-automation", "tullia", "std", "nixpkgs" ], "yants": [ "cardano-node", + "cardano-automation", "tullia", "std", "yants" @@ -2179,6 +2240,40 @@ } }, "dmerge_2": { + "inputs": { + "haumea": [ + "cardano-node", + "std", + "haumea" + ], + "nixlib": [ + "cardano-node", + "std", + "haumea", + "nixpkgs" + ], + "yants": [ + "cardano-node", + "std", + "yants" + ] + }, + "locked": { + "lastModified": 1686862774, + "narHash": "sha256-ojGtRQ9pIOUrxsQEuEPerUkqIJEuod9hIflfNkY+9CE=", + "owner": "divnix", + "repo": "dmerge", + "rev": "9f7f7a8349d33d7bd02e0f2b484b1f076e503a96", + "type": "github" + }, + "original": { + "owner": "divnix", + "ref": "0.2.1", + "repo": "dmerge", + "type": "github" + } + }, + "dmerge_3": { "inputs": { "nixlib": [ "db-sync", @@ -2209,7 +2304,7 @@ "type": "github" } }, - "dmerge_3": { + "dmerge_4": { "inputs": { "nixlib": [ "db-sync", @@ -2240,7 +2335,7 @@ }, "driver": { "inputs": { - "devshell": "devshell_9", + "devshell": "devshell_10", "inclusive": "inclusive_6", "nix": "nix_7", "nixpkgs": [ @@ -2300,9 +2395,9 @@ }, "ema": { "inputs": { - "flake-compat": "flake-compat_7", - "flake-utils": "flake-utils_22", - "nixpkgs": "nixpkgs_54", + "flake-compat": "flake-compat_8", + "flake-utils": "flake-utils_24", + "nixpkgs": "nixpkgs_56", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { @@ -2341,7 +2436,7 @@ "ema": "ema_2", "flake-parts": "flake-parts", "haskell-flake": "haskell-flake", - "nixpkgs": "nixpkgs_57", + "nixpkgs": "nixpkgs_59", "tailwind-haskell": "tailwind-haskell" }, "locked": { @@ -2375,9 +2470,28 @@ }, "fenix": { "inputs": { - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_10", "rust-analyzer-src": "rust-analyzer-src" }, + "locked": { + "lastModified": 1677306201, + "narHash": "sha256-VZ9x7qdTosFvVsrpgFHrtYfT6PU3yMIs7NRYn9ELapI=", + "owner": "nix-community", + "repo": "fenix", + "rev": "0923f0c162f65ae40261ec940406049726cfeab4", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "fenix_2": { + "inputs": { + "nixpkgs": "nixpkgs_15", + "rust-analyzer-src": "rust-analyzer-src_2" + }, "locked": { "lastModified": 1645165506, "narHash": "sha256-PClhTeC1EhkHUQQmP9XyiR7y1d6hlEc7QY8nN1GuAzQ=", @@ -2392,7 +2506,7 @@ "type": "github" } }, - "fenix_2": { + "fenix_3": { "inputs": { "nixpkgs": [ "db-sync", @@ -2402,7 +2516,7 @@ "bitte", "nixpkgs-unstable" ], - "rust-analyzer-src": "rust-analyzer-src_2" + "rust-analyzer-src": "rust-analyzer-src_3" }, "locked": { "lastModified": 1649226351, @@ -2418,10 +2532,10 @@ "type": "github" } }, - "fenix_3": { + "fenix_4": { "inputs": { - "nixpkgs": "nixpkgs_26", - "rust-analyzer-src": "rust-analyzer-src_3" + "nixpkgs": "nixpkgs_28", + "rust-analyzer-src": "rust-analyzer-src_4" }, "locked": { "lastModified": 1645165506, @@ -2437,7 +2551,7 @@ "type": "github" } }, - "fenix_4": { + "fenix_5": { "inputs": { "nixpkgs": [ "db-sync", @@ -2445,7 +2559,7 @@ "bitte", "nixpkgs-unstable" ], - "rust-analyzer-src": "rust-analyzer-src_4" + "rust-analyzer-src": "rust-analyzer-src_5" }, "locked": { "lastModified": 1660631227, @@ -2461,10 +2575,10 @@ "type": "github" } }, - "fenix_5": { + "fenix_6": { "inputs": { - "nixpkgs": "nixpkgs_42", - "rust-analyzer-src": "rust-analyzer-src_5" + "nixpkgs": "nixpkgs_44", + "rust-analyzer-src": "rust-analyzer-src_6" }, "locked": { "lastModified": 1645165506, @@ -2480,7 +2594,7 @@ "type": "github" } }, - "fenix_6": { + "fenix_7": { "inputs": { "nixpkgs": [ "db-sync", @@ -2489,7 +2603,7 @@ "bitte", "nixpkgs-unstable" ], - "rust-analyzer-src": "rust-analyzer-src_6" + "rust-analyzer-src": "rust-analyzer-src_7" }, "locked": { "lastModified": 1649226351, @@ -2508,21 +2622,36 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1647532380, - "narHash": "sha256-wswAxyO8AJTH7d5oU8VK82yBCpqwA+p6kLgpb1f1PAY=", - "owner": "input-output-hk", + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", "repo": "flake-compat", - "rev": "7da118186435255a30b5ffeabba9629c344c0bec", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", "type": "github" }, "original": { - "owner": "input-output-hk", - "ref": "fixes", + "owner": "edolstra", "repo": "flake-compat", "type": "github" } }, "flake-compat_10": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_11": { "flake": false, "locked": { "lastModified": 1647532380, @@ -2539,7 +2668,7 @@ "type": "github" } }, - "flake-compat_11": { + "flake-compat_12": { "flake": false, "locked": { "lastModified": 1696426674, @@ -2555,7 +2684,7 @@ "type": "github" } }, - "flake-compat_12": { + "flake-compat_13": { "flake": false, "locked": { "lastModified": 1672831974, @@ -2572,7 +2701,7 @@ "type": "github" } }, - "flake-compat_13": { + "flake-compat_14": { "flake": false, "locked": { "lastModified": 1673956053, @@ -2588,7 +2717,7 @@ "type": "github" } }, - "flake-compat_14": { + "flake-compat_15": { "flake": false, "locked": { "lastModified": 1673956053, @@ -2607,16 +2736,16 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1672831974, - "narHash": "sha256-z9k3MfslLjWQfnjBtEtJZdq3H7kyi2kQtUThfTgdRk0=", + "lastModified": 1647532380, + "narHash": "sha256-wswAxyO8AJTH7d5oU8VK82yBCpqwA+p6kLgpb1f1PAY=", "owner": "input-output-hk", "repo": "flake-compat", - "rev": "45f2638735f8cdc40fe302742b79f248d23eb368", + "rev": "7da118186435255a30b5ffeabba9629c344c0bec", "type": "github" }, "original": { "owner": "input-output-hk", - "ref": "hkm/gitlab-fix", + "ref": "fixes", "repo": "flake-compat", "type": "github" } @@ -2624,15 +2753,16 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", + "lastModified": 1672831974, + "narHash": "sha256-z9k3MfslLjWQfnjBtEtJZdq3H7kyi2kQtUThfTgdRk0=", + "owner": "input-output-hk", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "45f2638735f8cdc40fe302742b79f248d23eb368", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "input-output-hk", + "ref": "hkm/gitlab-fix", "repo": "flake-compat", "type": "github" } @@ -2640,11 +2770,11 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1627913399, - "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -2688,11 +2818,11 @@ "flake-compat_7": { "flake": false, "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "lastModified": 1627913399, + "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", "type": "github" }, "original": { @@ -2704,15 +2834,15 @@ "flake-compat_8": { "flake": false, "locked": { - "lastModified": 1635892615, - "narHash": "sha256-harGbMZr4hzat2BWBU+Y5OYXlu+fVz7E4WeQzHi5o8A=", - "owner": "input-output-hk", + "lastModified": 1641205782, + "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "owner": "edolstra", "repo": "flake-compat", - "rev": "eca47d3377946315596da653862d341ee5341318", + "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", "type": "github" }, "original": { - "owner": "input-output-hk", + "owner": "edolstra", "repo": "flake-compat", "type": "github" } @@ -2720,22 +2850,22 @@ "flake-compat_9": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", + "lastModified": 1635892615, + "narHash": "sha256-harGbMZr4hzat2BWBU+Y5OYXlu+fVz7E4WeQzHi5o8A=", + "owner": "input-output-hk", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "eca47d3377946315596da653862d341ee5341318", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "input-output-hk", "repo": "flake-compat", "type": "github" } }, "flake-parts": { "inputs": { - "nixpkgs": "nixpkgs_56" + "nixpkgs": "nixpkgs_58" }, "locked": { "lastModified": 1655570068, @@ -2787,6 +2917,36 @@ } }, "flake-utils_10": { + "locked": { + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_11": { + "locked": { + "lastModified": 1634851050, + "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_12": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -2801,7 +2961,7 @@ "type": "github" } }, - "flake-utils_11": { + "flake-utils_13": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -2816,7 +2976,7 @@ "type": "github" } }, - "flake-utils_12": { + "flake-utils_14": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -2831,7 +2991,7 @@ "type": "github" } }, - "flake-utils_13": { + "flake-utils_15": { "locked": { "lastModified": 1656928814, "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", @@ -2846,7 +3006,7 @@ "type": "github" } }, - "flake-utils_14": { + "flake-utils_16": { "locked": { "lastModified": 1634851050, "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", @@ -2861,7 +3021,7 @@ "type": "github" } }, - "flake-utils_15": { + "flake-utils_17": { "locked": { "lastModified": 1642700792, "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", @@ -2876,7 +3036,7 @@ "type": "github" } }, - "flake-utils_16": { + "flake-utils_18": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -2891,7 +3051,7 @@ "type": "github" } }, - "flake-utils_17": { + "flake-utils_19": { "locked": { "lastModified": 1610051610, "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", @@ -2906,13 +3066,13 @@ "type": "github" } }, - "flake-utils_18": { + "flake-utils_2": { "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -2921,7 +3081,7 @@ "type": "github" } }, - "flake-utils_19": { + "flake-utils_20": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -2936,23 +3096,22 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_21": { "locked": { - "lastModified": 1679360468, - "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", - "owner": "hamishmack", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "owner": "numtide", "repo": "flake-utils", - "rev": "e1ea268ff47ad475443dbabcd54744b4e5b9d4f5", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { - "owner": "hamishmack", - "ref": "hkm/nested-hydraJobs", + "owner": "numtide", "repo": "flake-utils", "type": "github" } }, - "flake-utils_20": { + "flake-utils_22": { "locked": { "lastModified": 1634851050, "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", @@ -2967,7 +3126,7 @@ "type": "github" } }, - "flake-utils_21": { + "flake-utils_23": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -2982,7 +3141,7 @@ "type": "github" } }, - "flake-utils_22": { + "flake-utils_24": { "locked": { "lastModified": 1642700792, "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", @@ -2997,7 +3156,7 @@ "type": "github" } }, - "flake-utils_23": { + "flake-utils_25": { "locked": { "lastModified": 1619345332, "narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=", @@ -3012,7 +3171,7 @@ "type": "github" } }, - "flake-utils_24": { + "flake-utils_26": { "locked": { "lastModified": 1652776076, "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", @@ -3028,7 +3187,7 @@ "type": "github" } }, - "flake-utils_25": { + "flake-utils_27": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -3043,7 +3202,7 @@ "type": "github" } }, - "flake-utils_26": { + "flake-utils_28": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -3058,7 +3217,7 @@ "type": "github" } }, - "flake-utils_27": { + "flake-utils_29": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -3073,13 +3232,13 @@ "type": "github" } }, - "flake-utils_28": { + "flake-utils_3": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -3088,13 +3247,13 @@ "type": "github" } }, - "flake-utils_29": { + "flake-utils_30": { "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -3103,13 +3262,13 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_31": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1656928814, + "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", "type": "github" }, "original": { @@ -3118,7 +3277,7 @@ "type": "github" } }, - "flake-utils_30": { + "flake-utils_32": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -3133,7 +3292,7 @@ "type": "github" } }, - "flake-utils_31": { + "flake-utils_33": { "locked": { "lastModified": 1642700792, "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", @@ -3148,7 +3307,7 @@ "type": "github" } }, - "flake-utils_32": { + "flake-utils_34": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -3163,7 +3322,7 @@ "type": "github" } }, - "flake-utils_33": { + "flake-utils_35": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -3180,26 +3339,27 @@ }, "flake-utils_4": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", + "lastModified": 1679360468, + "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", + "owner": "hamishmack", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "e1ea268ff47ad475443dbabcd54744b4e5b9d4f5", "type": "github" }, "original": { - "owner": "numtide", + "owner": "hamishmack", + "ref": "hkm/nested-hydraJobs", "repo": "flake-utils", "type": "github" } }, "flake-utils_5": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -3210,11 +3370,11 @@ }, "flake-utils_6": { "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -3225,11 +3385,11 @@ }, "flake-utils_7": { "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -3255,11 +3415,11 @@ }, "flake-utils_9": { "locked": { - "lastModified": 1634851050, - "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { @@ -3286,7 +3446,7 @@ }, "follower": { "inputs": { - "devshell": "devshell_10", + "devshell": "devshell_11", "inclusive": "inclusive_7", "nixpkgs": [ "db-sync", @@ -3469,7 +3629,7 @@ }, "gomod2nix": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_2", "utils": "utils" }, "locked": { @@ -3521,11 +3681,11 @@ "hackageNix": { "flake": false, "locked": { - "lastModified": 1685492843, - "narHash": "sha256-X8dNs5Gfc2ucfaWAgZ1VmkpBB4Cb44EQZu0b7tkvz2Y=", + "lastModified": 1693182531, + "narHash": "sha256-OejogS2E745biMj8NuUYatN7uoMRsg7giVnRQwfiays=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "e7407bab324eb2445bda58c5ffac393e80dda1e4", + "rev": "34cd9fe31d210f2ff041f490eaa4029f6b2812c4", "type": "github" }, "original": { @@ -3620,7 +3780,7 @@ "cabal-34": "cabal-34_2", "cabal-36": "cabal-36_2", "cardano-shell": "cardano-shell_2", - "flake-utils": "flake-utils_16", + "flake-utils": "flake-utils_18", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_2", "hackage": "hackage", "hpc-coveralls": "hpc-coveralls_2", @@ -3667,7 +3827,7 @@ "cabal-34": "cabal-34_4", "cabal-36": "cabal-36_4", "cardano-shell": "cardano-shell_4", - "flake-utils": "flake-utils_27", + "flake-utils": "flake-utils_29", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_4", "hackage": [ "db-sync", @@ -3712,7 +3872,7 @@ "cabal-34": "cabal-34_6", "cabal-36": "cabal-36_6", "cardano-shell": "cardano-shell_6", - "flake-compat": "flake-compat_12", + "flake-compat": "flake-compat_13", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_6", "ghc98X": "ghc98X", "ghc99": "ghc99", @@ -3720,7 +3880,7 @@ "hackage-nix" ], "hls-1.10": "hls-1.10_2", - "hls-2.0": "hls-2.0", + "hls-2.0": "hls-2.0_2", "hls-2.2": "hls-2.2", "hls-2.3": "hls-2.3", "hls-2.4": "hls-2.4", @@ -3735,7 +3895,7 @@ "nixpkgs-2111": "nixpkgs-2111_6", "nixpkgs-2205": "nixpkgs-2205_3", "nixpkgs-2211": "nixpkgs-2211_2", - "nixpkgs-2305": "nixpkgs-2305", + "nixpkgs-2305": "nixpkgs-2305_2", "nixpkgs-unstable": "nixpkgs-unstable_8", "old-ghc-nix": "old-ghc-nix_6", "stackage": "stackage_6" @@ -3761,7 +3921,7 @@ "cabal-34": "cabal-34_7", "cabal-36": "cabal-36_7", "cardano-shell": "cardano-shell_7", - "flake-utils": "flake-utils_33", + "flake-utils": "flake-utils_35", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_7", "hackage": "hackage_5", "hpc-coveralls": "hpc-coveralls_7", @@ -3801,14 +3961,15 @@ "cabal-34": "cabal-34", "cabal-36": "cabal-36", "cardano-shell": "cardano-shell", - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_4", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", "hackage": [ "cardano-node", "hackageNix" ], "hls-1.10": "hls-1.10", + "hls-2.0": "hls-2.0", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", @@ -3821,16 +3982,17 @@ "nixpkgs-2111": "nixpkgs-2111", "nixpkgs-2205": "nixpkgs-2205", "nixpkgs-2211": "nixpkgs-2211", + "nixpkgs-2305": "nixpkgs-2305", "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": "old-ghc-nix", "stackage": "stackage" }, "locked": { - "lastModified": 1685495397, - "narHash": "sha256-BwbWroS1Qm8BiHatG5+iHMHN5U6kqOccewBROUYuMKw=", + "lastModified": 1690764022, + "narHash": "sha256-+BFPab4/766AF+jfEAo6l3AZH5Zs1lbba2EVOcGhid0=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "d07c42cdb1cf88d0cab27d3090b00cb3899643c9", + "rev": "0f2a6a9dfad636680367c0462dcd50ee64a9bddc", "type": "github" }, "original": { @@ -3846,7 +4008,7 @@ "cabal-34": "cabal-34_3", "cabal-36": "cabal-36_3", "cardano-shell": "cardano-shell_3", - "flake-utils": "flake-utils_26", + "flake-utils": "flake-utils_28", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_3", "hackage": "hackage_2", "hpc-coveralls": "hpc-coveralls_3", @@ -3886,7 +4048,7 @@ "cabal-34": "cabal-34_5", "cabal-36": "cabal-36_5", "cardano-shell": "cardano-shell_5", - "flake-utils": "flake-utils_32", + "flake-utils": "flake-utils_34", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_5", "hackage": "hackage_4", "hpc-coveralls": "hpc-coveralls_5", @@ -3918,15 +4080,34 @@ "type": "github" } }, - "hercules-ci-effects": { + "haumea": { "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_70" + "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1699381651, - "narHash": "sha256-mZlQ54xJs3j5+SJrLhzePPMXzS+Czbx7gNyOnOAQrHA=", - "owner": "hercules-ci", + "lastModified": 1685133229, + "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=", + "owner": "nix-community", + "repo": "haumea", + "rev": "34dd58385092a23018748b50f9b23de6266dffc2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "v0.2.2", + "repo": "haumea", + "type": "github" + } + }, + "hercules-ci-effects": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_72" + }, + "locked": { + "lastModified": 1699381651, + "narHash": "sha256-mZlQ54xJs3j5+SJrLhzePPMXzS+Czbx7gNyOnOAQrHA=", + "owner": "hercules-ci", "repo": "hercules-ci-effects", "rev": "0bd99f5ab7ec7a74c11238bd02bb29e709c14328", "type": "github" @@ -3988,6 +4169,23 @@ "type": "github" } }, + "hls-2.0_2": { + "flake": false, + "locked": { + "lastModified": 1687698105, + "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "783905f211ac63edf982dd1889c671653327e441", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.0.0.1", + "repo": "haskell-language-server", + "type": "github" + } + }, "hls-2.2": { "flake": false, "locked": { @@ -4397,6 +4595,7 @@ "inputs": { "nixlib": [ "cardano-node", + "cardano-automation", "tullia", "std", "nixpkgs" @@ -4416,6 +4615,29 @@ "type": "github" } }, + "incl_2": { + "inputs": { + "nixlib": [ + "cardano-node", + "std", + "haumea", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1669263024, + "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", + "owner": "divnix", + "repo": "incl", + "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "incl", + "type": "github" + } + }, "inclusive": { "inputs": { "stdlib": "stdlib" @@ -4616,9 +4838,9 @@ }, "iogo": { "inputs": { - "devshell": "devshell_4", + "devshell": "devshell_5", "inclusive": "inclusive_3", - "nixpkgs": "nixpkgs_22", + "nixpkgs": "nixpkgs_24", "utils": "utils_8" }, "locked": { @@ -4637,9 +4859,9 @@ }, "iogo_2": { "inputs": { - "devshell": "devshell_14", + "devshell": "devshell_15", "inclusive": "inclusive_11", - "nixpkgs": "nixpkgs_51", + "nixpkgs": "nixpkgs_53", "utils": "utils_22" }, "locked": { @@ -4735,11 +4957,11 @@ "sodium": "sodium" }, "locked": { - "lastModified": 1684223806, - "narHash": "sha256-IyLoP+zhuyygLtr83XXsrvKyqqLQ8FHXTiySFf4FJOI=", + "lastModified": 1696445248, + "narHash": "sha256-2B/fqwyaRAaHVmkf15tKwkFbL5O46TmMw+Rc2viUPEY=", "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "86421fdd89b3af43fa716ccd07638f96c6ecd1e4", + "rev": "e32040e84180b3c27c0f13587025f6a17a4da520", "type": "github" }, "original": { @@ -4795,11 +5017,11 @@ "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1670983692, - "narHash": "sha256-avLo34JnI9HNyOuauK5R69usJm+GfW3MlyGlYxZhTgY=", + "lastModified": 1688517130, + "narHash": "sha256-hUqfxSlo+ffqVdkSZ1EDoB7/ILCL25eYkcCXW9/P3Wc=", "ref": "hkm/remote-iserv", - "rev": "50d0abb3317ac439a4e7495b185a64af9b7b9300", - "revCount": 10, + "rev": "9151db2a9a61d7f5fe52ff8836f18bbd0fd8933c", + "revCount": 13, "type": "git", "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" }, @@ -5163,23 +5385,25 @@ "inputs": { "flake-utils": [ "cardano-node", + "cardano-automation", "tullia", "std", "flake-utils" ], "nixpkgs": [ "cardano-node", + "cardano-automation", "tullia", "std", "nixpkgs" ] }, "locked": { - "lastModified": 1665039323, - "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", + "lastModified": 1677330646, + "narHash": "sha256-hUYCwJneMjnxTvj30Fjow6UMJUITqHlpUGpXMPXUJsU=", "owner": "nlewo", "repo": "nix2container", - "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", + "rev": "ebca8f58d450cae1a19c07701a5a8ae40afc9efc", "type": "github" }, "original": { @@ -5190,8 +5414,35 @@ }, "n2c_2": { "inputs": { - "flake-utils": "flake-utils_11", - "nixpkgs": "nixpkgs_27" + "flake-utils": [ + "cardano-node", + "std", + "flake-utils" + ], + "nixpkgs": [ + "cardano-node", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1685771919, + "narHash": "sha256-3lVKWrhNXjHJB6QkZ2SJaOs4X/mmYXtY6ovPVpDMOHc=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "95e2220911874064b5d809f8d35f7835184c4ddf", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "n2c_3": { + "inputs": { + "flake-utils": "flake-utils_13", + "nixpkgs": "nixpkgs_29" }, "locked": { "lastModified": 1650568002, @@ -5207,10 +5458,10 @@ "type": "github" } }, - "n2c_3": { + "n2c_4": { "inputs": { - "flake-utils": "flake-utils_28", - "nixpkgs": "nixpkgs_62" + "flake-utils": "flake-utils_30", + "nixpkgs": "nixpkgs_64" }, "locked": { "lastModified": 1655533513, @@ -5229,7 +5480,7 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_6", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { @@ -5249,7 +5500,7 @@ }, "nix-cache-proxy": { "inputs": { - "devshell": "devshell_11", + "devshell": "devshell_12", "inclusive": [ "db-sync", "cardano-world", @@ -5300,9 +5551,10 @@ }, "nix-nomad": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat", "flake-utils": [ "cardano-node", + "cardano-automation", "tullia", "nix2container", "flake-utils" @@ -5310,11 +5562,13 @@ "gomod2nix": "gomod2nix", "nixpkgs": [ "cardano-node", + "cardano-automation", "tullia", "nixpkgs" ], "nixpkgs-lib": [ "cardano-node", + "cardano-automation", "tullia", "nixpkgs" ] @@ -5415,15 +5669,15 @@ }, "nix2container": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1671269339, - "narHash": "sha256-KR2SXh4c2Y+bgbCfXjTGJ74O9/u4CAPFA0KYZHhKf5Q=", + "lastModified": 1658567952, + "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", "owner": "nlewo", "repo": "nix2container", - "rev": "6800fff45afecc7e47c334d14cf2b2f4f25601a0", + "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", "type": "github" }, "original": { @@ -5434,15 +5688,15 @@ }, "nix2container_2": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_6" + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1658567952, - "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", + "lastModified": 1671269339, + "narHash": "sha256-KR2SXh4c2Y+bgbCfXjTGJ74O9/u4CAPFA0KYZHhKf5Q=", "owner": "nlewo", "repo": "nix2container", - "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", + "rev": "6800fff45afecc7e47c334d14cf2b2f4f25601a0", "type": "github" }, "original": { @@ -5453,8 +5707,8 @@ }, "nix2container_3": { "inputs": { - "flake-utils": "flake-utils_30", - "nixpkgs": "nixpkgs_65" + "flake-utils": "flake-utils_32", + "nixpkgs": "nixpkgs_67" }, "locked": { "lastModified": 1653427219, @@ -5474,7 +5728,7 @@ "nix_10": { "inputs": { "lowdown-src": "lowdown-src_10", - "nixpkgs": "nixpkgs_45" + "nixpkgs": "nixpkgs_47" }, "locked": { "lastModified": 1604400356, @@ -5493,7 +5747,7 @@ "nix_11": { "inputs": { "lowdown-src": "lowdown-src_11", - "nixpkgs": "nixpkgs_47", + "nixpkgs": "nixpkgs_49", "nixpkgs-regression": "nixpkgs-regression_9" }, "locked": { @@ -5513,7 +5767,7 @@ "nix_12": { "inputs": { "lowdown-src": "lowdown-src_12", - "nixpkgs": "nixpkgs_59", + "nixpkgs": "nixpkgs_61", "nixpkgs-regression": "nixpkgs-regression_10" }, "locked": { @@ -5534,7 +5788,7 @@ "nix_13": { "inputs": { "lowdown-src": "lowdown-src_13", - "nixpkgs": "nixpkgs_61", + "nixpkgs": "nixpkgs_63", "nixpkgs-regression": "nixpkgs-regression_11" }, "locked": { @@ -5555,7 +5809,7 @@ "nix_14": { "inputs": { "lowdown-src": "lowdown-src_14", - "nixpkgs": "nixpkgs_68", + "nixpkgs": "nixpkgs_70", "nixpkgs-regression": "nixpkgs-regression_12" }, "locked": { @@ -5576,7 +5830,7 @@ "nix_15": { "inputs": { "lowdown-src": "lowdown-src_15", - "nixpkgs": "nixpkgs_69", + "nixpkgs": "nixpkgs_71", "nixpkgs-regression": "nixpkgs-regression_13" }, "locked": { @@ -5597,7 +5851,7 @@ "nix_16": { "inputs": { "lowdown-src": "lowdown-src_16", - "nixpkgs": "nixpkgs_71", + "nixpkgs": "nixpkgs_73", "nixpkgs-regression": "nixpkgs-regression_14" }, "locked": { @@ -5618,7 +5872,7 @@ "nix_2": { "inputs": { "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_16", "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { @@ -5639,7 +5893,7 @@ "nix_3": { "inputs": { "lowdown-src": "lowdown-src_3", - "nixpkgs": "nixpkgs_16" + "nixpkgs": "nixpkgs_18" }, "locked": { "lastModified": 1604400356, @@ -5658,7 +5912,7 @@ "nix_4": { "inputs": { "lowdown-src": "lowdown-src_4", - "nixpkgs": "nixpkgs_18", + "nixpkgs": "nixpkgs_20", "nixpkgs-regression": "nixpkgs-regression_3" }, "locked": { @@ -5678,7 +5932,7 @@ "nix_5": { "inputs": { "lowdown-src": "lowdown-src_5", - "nixpkgs": "nixpkgs_28", + "nixpkgs": "nixpkgs_30", "nixpkgs-regression": "nixpkgs-regression_4" }, "locked": { @@ -5699,7 +5953,7 @@ "nix_6": { "inputs": { "lowdown-src": "lowdown-src_6", - "nixpkgs": "nixpkgs_30", + "nixpkgs": "nixpkgs_32", "nixpkgs-regression": "nixpkgs-regression_5" }, "locked": { @@ -5719,7 +5973,7 @@ "nix_7": { "inputs": { "lowdown-src": "lowdown-src_7", - "nixpkgs": "nixpkgs_37", + "nixpkgs": "nixpkgs_39", "nixpkgs-regression": "nixpkgs-regression_6" }, "locked": { @@ -5740,7 +5994,7 @@ "nix_8": { "inputs": { "lowdown-src": "lowdown-src_8", - "nixpkgs": "nixpkgs_38", + "nixpkgs": "nixpkgs_40", "nixpkgs-regression": "nixpkgs-regression_7" }, "locked": { @@ -5761,7 +6015,7 @@ "nix_9": { "inputs": { "lowdown-src": "lowdown-src_9", - "nixpkgs": "nixpkgs_43", + "nixpkgs": "nixpkgs_45", "nixpkgs-regression": "nixpkgs-regression_8" }, "locked": { @@ -5783,29 +6037,32 @@ "inputs": { "flake-utils": [ "cardano-node", + "cardano-automation", "tullia", "std", "flake-utils" ], "nixago-exts": [ "cardano-node", + "cardano-automation", "tullia", "std", "blank" ], "nixpkgs": [ "cardano-node", + "cardano-automation", "tullia", "std", "nixpkgs" ] }, "locked": { - "lastModified": 1661824785, - "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", + "lastModified": 1676075813, + "narHash": "sha256-X/aIT8Qc8UCqnxJvaZykx3CJ0ZnDFvO+dqp/7fglZWo=", "owner": "nix-community", "repo": "nixago", - "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", + "rev": "9cab4dde31ec2f2c05d702ea8648ce580664e906", "type": "github" }, "original": { @@ -5845,6 +6102,38 @@ } }, "nixago_2": { + "inputs": { + "flake-utils": [ + "cardano-node", + "std", + "flake-utils" + ], + "nixago-exts": [ + "cardano-node", + "std", + "blank" + ], + "nixpkgs": [ + "cardano-node", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1683210100, + "narHash": "sha256-bhGDOlkWtlhVECpoOog4fWiFJmLCpVEg09a40aTjCbw=", + "owner": "nix-community", + "repo": "nixago", + "rev": "1da60ad9412135f9ed7a004669fdcf3d378ec630", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixago", + "type": "github" + } + }, + "nixago_3": { "inputs": { "flake-utils": [ "db-sync", @@ -5876,7 +6165,7 @@ "type": "github" } }, - "nixago_3": { + "nixago_4": { "inputs": { "flake-utils": [ "db-sync", @@ -6353,11 +6642,11 @@ }, "nixpkgs-2211": { "locked": { - "lastModified": 1682682915, - "narHash": "sha256-haR0u/j/nUvlMloYlaOYq1FMXTvkNHw+wGxc+0qXisM=", + "lastModified": 1685314633, + "narHash": "sha256-8LXBPqTQXl5ofkjpJ18JcbmLJ/lWDoMxtUwiDYv0wro=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09f1b33fcc0f59263137e23e935c1bb03ec920e4", + "rev": "c8a17ce7abc03c50cd072e9e6c9b389c5f61836b", "type": "github" }, "original": { @@ -6384,6 +6673,22 @@ } }, "nixpkgs-2305": { + "locked": { + "lastModified": 1685338297, + "narHash": "sha256-+Aq4O0Jn1W1q927ZHc3Zn6RO7bwQGmb6O8xYoGy0KrM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6287b47dbfabbb8bfbb9b1b53d198ad58a774de4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-23.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2305_2": { "locked": { "lastModified": 1695416179, "narHash": "sha256-610o1+pwbSu+QuF3GE0NU5xQdTHM3t9wyYhB9l94Cd8=", @@ -6629,11 +6934,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1682656005, - "narHash": "sha256-fYplYo7so1O+rSQ2/aS+SbTPwLTeoUXk4ekKNtSl4P8=", + "lastModified": 1685347552, + "narHash": "sha256-9woSppRyUFo26yUffORTzttJ+apOt8MmCv6RxpPNTU4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6806b63e824f84b0f0e60b6d660d4ae753de0477", + "rev": "f2f1ec390714d303cf84ba086e34e45b450dd8c4", "type": "github" }, "original": { @@ -6772,6 +7077,36 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1677063315, + "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "988cc958c57ce4350ec248d2d53087777f9e1949", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1627969475, + "narHash": "sha256-MhVtkVt1MFfaDY3ObJu54NBcsaPk19vOBZ8ouhjO4qs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "bd27e2e8316ac6eab11aa35c586e743286f23ecf", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_12": { "locked": { "lastModified": 1644972330, "narHash": "sha256-6V2JFpTUzB9G+KcqtUR1yl7f6rd9495YrFECslEmbGw=", @@ -6787,7 +7122,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_13": { "locked": { "lastModified": 1627969475, "narHash": "sha256-MhVtkVt1MFfaDY3ObJu54NBcsaPk19vOBZ8ouhjO4qs=", @@ -6801,7 +7136,7 @@ "type": "indirect" } }, - "nixpkgs_12": { + "nixpkgs_14": { "locked": { "lastModified": 1644972330, "narHash": "sha256-6V2JFpTUzB9G+KcqtUR1yl7f6rd9495YrFECslEmbGw=", @@ -6817,7 +7152,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_15": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -6833,7 +7168,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_16": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -6848,7 +7183,7 @@ "type": "indirect" } }, - "nixpkgs_15": { + "nixpkgs_17": { "locked": { "lastModified": 1638452135, "narHash": "sha256-5Il6hgrTgcWIsB7zug0yDFccYXx7pJCw8cwJdXMuLfM=", @@ -6864,7 +7199,7 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_18": { "locked": { "lastModified": 1602702596, "narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=", @@ -6879,7 +7214,7 @@ "type": "indirect" } }, - "nixpkgs_17": { + "nixpkgs_19": { "locked": { "lastModified": 1638887115, "narHash": "sha256-emjtIeqyJ84Eb3X7APJruTrwcfnHQKs55XGljj62prs=", @@ -6895,7 +7230,23 @@ "type": "github" } }, - "nixpkgs_18": { + "nixpkgs_2": { + "locked": { + "lastModified": 1653581809, + "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_20": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -6910,7 +7261,7 @@ "type": "indirect" } }, - "nixpkgs_19": { + "nixpkgs_21": { "locked": { "lastModified": 1641909823, "narHash": "sha256-Uxo+Wm6c/ijNhaJlYtFLJG9mh75FYZaBreMC2ZE0nEY=", @@ -6926,21 +7277,7 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1642336556, - "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_20": { + "nixpkgs_22": { "locked": { "lastModified": 1647350163, "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", @@ -6956,7 +7293,7 @@ "type": "github" } }, - "nixpkgs_21": { + "nixpkgs_23": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -6972,7 +7309,7 @@ "type": "github" } }, - "nixpkgs_22": { + "nixpkgs_24": { "locked": { "lastModified": 1646506091, "narHash": "sha256-sWNAJE2m+HOh1jtXlHcnhxsj6/sXrHgbqVNcVRlveK4=", @@ -6988,7 +7325,7 @@ "type": "github" } }, - "nixpkgs_23": { + "nixpkgs_25": { "locked": { "lastModified": 1658119717, "narHash": "sha256-4upOZIQQ7Bc4CprqnHsKnqYfw+arJeAuU+QcpjYBXW0=", @@ -7004,7 +7341,7 @@ "type": "github" } }, - "nixpkgs_24": { + "nixpkgs_26": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -7020,7 +7357,7 @@ "type": "github" } }, - "nixpkgs_25": { + "nixpkgs_27": { "locked": { "lastModified": 1652576347, "narHash": "sha256-52Wu7hkcIRcS4UenSSrt01J2sAbbQ6YqxZIDpuEPL/c=", @@ -7035,7 +7372,7 @@ "type": "github" } }, - "nixpkgs_26": { + "nixpkgs_28": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -7051,7 +7388,7 @@ "type": "github" } }, - "nixpkgs_27": { + "nixpkgs_29": { "locked": { "lastModified": 1642451377, "narHash": "sha256-hvAuYDUN8XIrcQKE6wDw4LjTCcwrTp2B1i1i/5vfDMQ=", @@ -7066,7 +7403,22 @@ "type": "github" } }, - "nixpkgs_28": { + "nixpkgs_3": { + "locked": { + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_30": { "locked": { "lastModified": 1645296114, "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", @@ -7081,7 +7433,7 @@ "type": "indirect" } }, - "nixpkgs_29": { + "nixpkgs_31": { "locked": { "lastModified": 1652559422, "narHash": "sha256-jPVTNImBTUIFdtur+d4IVot6eXmsvtOcBm0TzxmhWPk=", @@ -7097,23 +7449,7 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1657693803, - "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.05-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_30": { + "nixpkgs_32": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -7128,7 +7464,7 @@ "type": "indirect" } }, - "nixpkgs_31": { + "nixpkgs_33": { "locked": { "lastModified": 1641909823, "narHash": "sha256-Uxo+Wm6c/ijNhaJlYtFLJG9mh75FYZaBreMC2ZE0nEY=", @@ -7144,7 +7480,7 @@ "type": "github" } }, - "nixpkgs_32": { + "nixpkgs_34": { "locked": { "lastModified": 1647350163, "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", @@ -7160,7 +7496,7 @@ "type": "github" } }, - "nixpkgs_33": { + "nixpkgs_35": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -7176,7 +7512,7 @@ "type": "github" } }, - "nixpkgs_34": { + "nixpkgs_36": { "locked": { "lastModified": 1658311025, "narHash": "sha256-GqagY5YmaZB3YaO41kKcQhe5RcpS83wnsW8iCu5Znqo=", @@ -7192,7 +7528,7 @@ "type": "github" } }, - "nixpkgs_35": { + "nixpkgs_37": { "locked": { "lastModified": 1646331602, "narHash": "sha256-cRuytTfel52z947yKfJcZU7zbQBgM16qqTf+oJkVwtg=", @@ -7208,7 +7544,7 @@ "type": "github" } }, - "nixpkgs_36": { + "nixpkgs_38": { "locked": { "lastModified": 1643381941, "narHash": "sha256-pHTwvnN4tTsEKkWlXQ8JMY423epos8wUOhthpwJjtpc=", @@ -7224,7 +7560,7 @@ "type": "github" } }, - "nixpkgs_37": { + "nixpkgs_39": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -7239,7 +7575,23 @@ "type": "indirect" } }, - "nixpkgs_38": { + "nixpkgs_4": { + "locked": { + "lastModified": 1675940568, + "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_40": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -7254,7 +7606,7 @@ "type": "indirect" } }, - "nixpkgs_39": { + "nixpkgs_41": { "locked": { "lastModified": 1644486793, "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", @@ -7270,22 +7622,7 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1654807842, - "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_40": { + "nixpkgs_42": { "locked": { "lastModified": 1627969475, "narHash": "sha256-MhVtkVt1MFfaDY3ObJu54NBcsaPk19vOBZ8ouhjO4qs=", @@ -7299,7 +7636,7 @@ "type": "indirect" } }, - "nixpkgs_41": { + "nixpkgs_43": { "locked": { "lastModified": 1644972330, "narHash": "sha256-6V2JFpTUzB9G+KcqtUR1yl7f6rd9495YrFECslEmbGw=", @@ -7315,7 +7652,7 @@ "type": "github" } }, - "nixpkgs_42": { + "nixpkgs_44": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -7331,7 +7668,7 @@ "type": "github" } }, - "nixpkgs_43": { + "nixpkgs_45": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -7346,7 +7683,7 @@ "type": "indirect" } }, - "nixpkgs_44": { + "nixpkgs_46": { "locked": { "lastModified": 1638452135, "narHash": "sha256-5Il6hgrTgcWIsB7zug0yDFccYXx7pJCw8cwJdXMuLfM=", @@ -7362,7 +7699,7 @@ "type": "github" } }, - "nixpkgs_45": { + "nixpkgs_47": { "locked": { "lastModified": 1602702596, "narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=", @@ -7377,7 +7714,7 @@ "type": "indirect" } }, - "nixpkgs_46": { + "nixpkgs_48": { "locked": { "lastModified": 1638887115, "narHash": "sha256-emjtIeqyJ84Eb3X7APJruTrwcfnHQKs55XGljj62prs=", @@ -7393,7 +7730,7 @@ "type": "github" } }, - "nixpkgs_47": { + "nixpkgs_49": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -7408,7 +7745,21 @@ "type": "indirect" } }, - "nixpkgs_48": { + "nixpkgs_5": { + "locked": { + "lastModified": 1642336556, + "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_50": { "locked": { "lastModified": 1641909823, "narHash": "sha256-Uxo+Wm6c/ijNhaJlYtFLJG9mh75FYZaBreMC2ZE0nEY=", @@ -7424,7 +7775,7 @@ "type": "github" } }, - "nixpkgs_49": { + "nixpkgs_51": { "locked": { "lastModified": 1647350163, "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", @@ -7440,23 +7791,7 @@ "type": "github" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1653581809, - "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_50": { + "nixpkgs_52": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -7472,7 +7807,7 @@ "type": "github" } }, - "nixpkgs_51": { + "nixpkgs_53": { "locked": { "lastModified": 1646506091, "narHash": "sha256-sWNAJE2m+HOh1jtXlHcnhxsj6/sXrHgbqVNcVRlveK4=", @@ -7488,7 +7823,7 @@ "type": "github" } }, - "nixpkgs_52": { + "nixpkgs_54": { "locked": { "lastModified": 1658119717, "narHash": "sha256-4upOZIQQ7Bc4CprqnHsKnqYfw+arJeAuU+QcpjYBXW0=", @@ -7504,7 +7839,7 @@ "type": "github" } }, - "nixpkgs_53": { + "nixpkgs_55": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -7520,7 +7855,7 @@ "type": "github" } }, - "nixpkgs_54": { + "nixpkgs_56": { "locked": { "lastModified": 1646470760, "narHash": "sha256-dQISyucVCCPaFioUhy5ZgfBz8rOMKGI8k13aPDFTqEs=", @@ -7536,7 +7871,7 @@ "type": "github" } }, - "nixpkgs_55": { + "nixpkgs_57": { "locked": { "lastModified": 1619531122, "narHash": "sha256-ovm5bo6PkZzNKh2YGXbRKYIjega0EjiEP0YDwyeXEYU=", @@ -7550,7 +7885,7 @@ "type": "indirect" } }, - "nixpkgs_56": { + "nixpkgs_58": { "locked": { "lastModified": 1656461576, "narHash": "sha256-rlmmw6lIlkMQIiB+NsnO8wQYWTfle8TA41UREPLP5VY=", @@ -7566,7 +7901,7 @@ "type": "github" } }, - "nixpkgs_57": { + "nixpkgs_59": { "locked": { "lastModified": 1655567057, "narHash": "sha256-Cc5hQSMsTzOHmZnYm8OSJ5RNUp22bd5NADWLHorULWQ=", @@ -7580,7 +7915,23 @@ "type": "indirect" } }, - "nixpkgs_58": { + "nixpkgs_6": { + "locked": { + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.05-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_60": { "locked": { "lastModified": 1656401090, "narHash": "sha256-bUS2nfQsvTQW2z8SK7oEFSElbmoBahOPtbXPm0AL3I4=", @@ -7594,7 +7945,7 @@ "type": "indirect" } }, - "nixpkgs_59": { + "nixpkgs_61": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -7609,22 +7960,7 @@ "type": "indirect" } }, - "nixpkgs_6": { - "locked": { - "lastModified": 1654807842, - "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_60": { + "nixpkgs_62": { "locked": { "lastModified": 1656809537, "narHash": "sha256-pwXBYG3ThN4ccJjvcdNdonQ8Wyv0y/iYdnuesiFUY1U=", @@ -7639,7 +7975,7 @@ "type": "github" } }, - "nixpkgs_61": { + "nixpkgs_63": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -7654,7 +7990,7 @@ "type": "indirect" } }, - "nixpkgs_62": { + "nixpkgs_64": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -7669,7 +8005,7 @@ "type": "github" } }, - "nixpkgs_63": { + "nixpkgs_65": { "locked": { "lastModified": 1656947410, "narHash": "sha256-htDR/PZvjUJGyrRJsVqDmXR8QeoswBaRLzHt13fd0iY=", @@ -7685,7 +8021,7 @@ "type": "github" } }, - "nixpkgs_64": { + "nixpkgs_66": { "locked": { "lastModified": 1658311025, "narHash": "sha256-GqagY5YmaZB3YaO41kKcQhe5RcpS83wnsW8iCu5Znqo=", @@ -7701,7 +8037,7 @@ "type": "github" } }, - "nixpkgs_65": { + "nixpkgs_67": { "locked": { "lastModified": 1642451377, "narHash": "sha256-hvAuYDUN8XIrcQKE6wDw4LjTCcwrTp2B1i1i/5vfDMQ=", @@ -7716,7 +8052,7 @@ "type": "github" } }, - "nixpkgs_66": { + "nixpkgs_68": { "locked": { "lastModified": 1653920503, "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", @@ -7732,7 +8068,7 @@ "type": "github" } }, - "nixpkgs_67": { + "nixpkgs_69": { "locked": { "lastModified": 1650469885, "narHash": "sha256-BuILRZ6pzMnGey8/irbjGq1oo3vIvZa1pitSdZCmIXA=", @@ -7748,7 +8084,22 @@ "type": "github" } }, - "nixpkgs_68": { + "nixpkgs_7": { + "locked": { + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_70": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -7763,7 +8114,7 @@ "type": "indirect" } }, - "nixpkgs_69": { + "nixpkgs_71": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -7779,23 +8130,7 @@ "type": "github" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1674407282, - "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_70": { + "nixpkgs_72": { "locked": { "lastModified": 1697723726, "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", @@ -7811,7 +8146,7 @@ "type": "github" } }, - "nixpkgs_71": { + "nixpkgs_73": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -7828,38 +8163,39 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1665087388, - "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", + "lastModified": 1681001314, + "narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", + "owner": "nix-community", + "repo": "nixpkgs.lib", "type": "github" } }, "nixpkgs_9": { "locked": { - "lastModified": 1627969475, - "narHash": "sha256-MhVtkVt1MFfaDY3ObJu54NBcsaPk19vOBZ8ouhjO4qs=", - "owner": "NixOS", + "lastModified": 1675940568, + "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "bd27e2e8316ac6eab11aa35c586e743286f23ecf", + "rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nomad": { "inputs": { "nix": "nix_3", - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_19", "utils": "utils_4" }, "locked": { @@ -7879,10 +8215,10 @@ }, "nomad-driver-nix": { "inputs": { - "devshell": "devshell_2", + "devshell": "devshell_3", "inclusive": "inclusive", "nix": "nix_4", - "nixpkgs": "nixpkgs_19", + "nixpkgs": "nixpkgs_21", "utils": "utils_5" }, "locked": { @@ -7901,10 +8237,10 @@ }, "nomad-driver-nix_2": { "inputs": { - "devshell": "devshell_5", + "devshell": "devshell_6", "inclusive": "inclusive_4", "nix": "nix_6", - "nixpkgs": "nixpkgs_31", + "nixpkgs": "nixpkgs_33", "utils": "utils_10" }, "locked": { @@ -7923,10 +8259,10 @@ }, "nomad-driver-nix_3": { "inputs": { - "devshell": "devshell_12", + "devshell": "devshell_13", "inclusive": "inclusive_9", "nix": "nix_11", - "nixpkgs": "nixpkgs_48", + "nixpkgs": "nixpkgs_50", "utils": "utils_19" }, "locked": { @@ -7945,9 +8281,9 @@ }, "nomad-follower": { "inputs": { - "devshell": "devshell_3", + "devshell": "devshell_4", "inclusive": "inclusive_2", - "nixpkgs": "nixpkgs_20", + "nixpkgs": "nixpkgs_22", "utils": "utils_6" }, "locked": { @@ -7966,9 +8302,9 @@ }, "nomad-follower_2": { "inputs": { - "devshell": "devshell_6", + "devshell": "devshell_7", "inclusive": "inclusive_5", - "nixpkgs": "nixpkgs_32", + "nixpkgs": "nixpkgs_34", "utils": "utils_11" }, "locked": { @@ -7987,9 +8323,9 @@ }, "nomad-follower_3": { "inputs": { - "devshell": "devshell_13", + "devshell": "devshell_14", "inclusive": "inclusive_10", - "nixpkgs": "nixpkgs_49", + "nixpkgs": "nixpkgs_51", "utils": "utils_20" }, "locked": { @@ -8009,7 +8345,7 @@ "nomad_2": { "inputs": { "nix": "nix_10", - "nixpkgs": "nixpkgs_46", + "nixpkgs": "nixpkgs_48", "utils": "utils_18" }, "locked": { @@ -8029,11 +8365,26 @@ }, "nosys": { "locked": { - "lastModified": 1667881534, - "narHash": "sha256-FhwJ15uPLRsvaxtt/bNuqE/ykMpNAPF0upozFKhTtXM=", + "lastModified": 1668010795, + "narHash": "sha256-JBDVBnos8g0toU7EhIIqQ1If5m/nyBqtHhL3sicdPwI=", "owner": "divnix", "repo": "nosys", - "rev": "2d0d5207f6a230e9d0f660903f8db9807b54814f", + "rev": "feade0141487801c71ff55623b421ed535dbdefa", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "nosys", + "type": "github" + } + }, + "nosys_2": { + "locked": { + "lastModified": 1668010795, + "narHash": "sha256-JBDVBnos8g0toU7EhIIqQ1If5m/nyBqtHhL3sicdPwI=", + "owner": "divnix", + "repo": "nosys", + "rev": "feade0141487801c71ff55623b421ed535dbdefa", "type": "github" }, "original": { @@ -8062,12 +8413,12 @@ "ogmios-nixos": { "inputs": { "CHaP": "CHaP_3", - "blank": "blank_5", + "blank": "blank_6", "cardano-configurations": "cardano-configurations_2", "cardano-node": [ "cardano-node" ], - "flake-compat": "flake-compat_13", + "flake-compat": "flake-compat_14", "haskell-nix": [ "haskell-nix" ], @@ -8251,48 +8602,218 @@ "ops-lib_2": { "flake": false, "locked": { - "lastModified": 1649848729, - "narHash": "sha256-5zN9gpn+DwdB67bcHfDD8zgMnR0EaJd2JVNMyL6J1N0=", - "owner": "input-output-hk", - "repo": "ops-lib", - "rev": "517c747f4d5d56e626f62618803bfccb09f14019", + "lastModified": 1649848729, + "narHash": "sha256-5zN9gpn+DwdB67bcHfDD8zgMnR0EaJd2JVNMyL6J1N0=", + "owner": "input-output-hk", + "repo": "ops-lib", + "rev": "517c747f4d5d56e626f62618803bfccb09f14019", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "ops-lib", + "type": "github" + } + }, + "ops-lib_3": { + "flake": false, + "locked": { + "lastModified": 1649848729, + "narHash": "sha256-5zN9gpn+DwdB67bcHfDD8zgMnR0EaJd2JVNMyL6J1N0=", + "owner": "input-output-hk", + "repo": "ops-lib", + "rev": "517c747f4d5d56e626f62618803bfccb09f14019", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "ops-lib", + "type": "github" + } + }, + "ops-lib_4": { + "flake": false, + "locked": { + "lastModified": 1649848729, + "narHash": "sha256-5zN9gpn+DwdB67bcHfDD8zgMnR0EaJd2JVNMyL6J1N0=", + "owner": "input-output-hk", + "repo": "ops-lib", + "rev": "517c747f4d5d56e626f62618803bfccb09f14019", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "ops-lib", + "type": "github" + } + }, + "paisano": { + "inputs": { + "nixpkgs": [ + "cardano-node", + "cardano-automation", + "tullia", + "std", + "nixpkgs" + ], + "nosys": "nosys", + "yants": [ + "cardano-node", + "cardano-automation", + "tullia", + "std", + "yants" + ] + }, + "locked": { + "lastModified": 1677437285, + "narHash": "sha256-YGfMothgUq1T9wMJYEhOSvdIiD/8gLXO1YcZA6hyIWU=", + "owner": "paisano-nix", + "repo": "core", + "rev": "5f2fc05e98e001cb1cf9535ded09e05d90cec131", + "type": "github" + }, + "original": { + "owner": "paisano-nix", + "repo": "core", + "type": "github" + } + }, + "paisano-actions": { + "inputs": { + "nixpkgs": [ + "cardano-node", + "std", + "paisano-mdbook-preprocessor", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1677306424, + "narHash": "sha256-H9/dI2rGEbKo4KEisqbRPHFG2ajF8Tm111NPdKGIf28=", + "owner": "paisano-nix", + "repo": "actions", + "rev": "65ec4e080b3480167fc1a748c89a05901eea9a9b", + "type": "github" + }, + "original": { + "owner": "paisano-nix", + "repo": "actions", + "type": "github" + } + }, + "paisano-mdbook-preprocessor": { + "inputs": { + "crane": "crane", + "fenix": "fenix", + "nixpkgs": [ + "cardano-node", + "std", + "nixpkgs" + ], + "paisano-actions": "paisano-actions", + "std": [ + "cardano-node", + "std" + ] + }, + "locked": { + "lastModified": 1680654400, + "narHash": "sha256-Qdpio+ldhUK3zfl22Mhf8HUULdUOJXDWDdO7MIK69OU=", + "owner": "paisano-nix", + "repo": "mdbook-paisano-preprocessor", + "rev": "11a8fc47f574f194a7ae7b8b98001f6143ba4cf1", + "type": "github" + }, + "original": { + "owner": "paisano-nix", + "repo": "mdbook-paisano-preprocessor", + "type": "github" + } + }, + "paisano-tui": { + "inputs": { + "nixpkgs": [ + "cardano-node", + "cardano-automation", + "tullia", + "std", + "blank" + ], + "std": [ + "cardano-node", + "cardano-automation", + "tullia", + "std" + ] + }, + "locked": { + "lastModified": 1677533603, + "narHash": "sha256-Nq1dH/qn7Wg/Tj1+id+ZM3o0fzqonW73jAgY3mCp35M=", + "owner": "paisano-nix", + "repo": "tui", + "rev": "802958d123b0a5437441be0cab1dee487b0ed3eb", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "ops-lib", + "owner": "paisano-nix", + "repo": "tui", "type": "github" } }, - "ops-lib_3": { - "flake": false, + "paisano-tui_2": { + "inputs": { + "nixpkgs": [ + "cardano-node", + "std", + "blank" + ], + "std": [ + "cardano-node", + "std" + ] + }, "locked": { - "lastModified": 1649848729, - "narHash": "sha256-5zN9gpn+DwdB67bcHfDD8zgMnR0EaJd2JVNMyL6J1N0=", - "owner": "input-output-hk", - "repo": "ops-lib", - "rev": "517c747f4d5d56e626f62618803bfccb09f14019", + "lastModified": 1681847764, + "narHash": "sha256-mdd7PJW1BZvxy0cIKsPfAO+ohVl/V7heE5ZTAHzTdv8=", + "owner": "paisano-nix", + "repo": "tui", + "rev": "3096bad91cae73ab8ab3367d31f8a143d248a244", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "ops-lib", + "owner": "paisano-nix", + "ref": "0.1.1", + "repo": "tui", "type": "github" } }, - "ops-lib_4": { - "flake": false, + "paisano_2": { + "inputs": { + "nixpkgs": [ + "cardano-node", + "std", + "nixpkgs" + ], + "nosys": "nosys_2", + "yants": [ + "cardano-node", + "std", + "yants" + ] + }, "locked": { - "lastModified": 1649848729, - "narHash": "sha256-5zN9gpn+DwdB67bcHfDD8zgMnR0EaJd2JVNMyL6J1N0=", - "owner": "input-output-hk", - "repo": "ops-lib", - "rev": "517c747f4d5d56e626f62618803bfccb09f14019", + "lastModified": 1686862844, + "narHash": "sha256-m8l/HpRBJnZ3c0F1u0IyQ3nYGWE0R9V5kfORuqZPzgk=", + "owner": "paisano-nix", + "repo": "core", + "rev": "6674b3d3577212c1eeecd30d62d52edbd000e726", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "ops-lib", + "owner": "paisano-nix", + "ref": "0.1.1", + "repo": "core", "type": "github" } }, @@ -8302,7 +8823,7 @@ "cardano-node": [ "cardano-node" ], - "flake-compat": "flake-compat_14", + "flake-compat": "flake-compat_15", "hackage-nix": [ "hackage-nix" ], @@ -8333,7 +8854,7 @@ }, "poetry2nix": { "inputs": { - "flake-utils": "flake-utils_17", + "flake-utils": "flake-utils_19", "nixpkgs": [ "db-sync", "cardano-world", @@ -8359,8 +8880,8 @@ }, "pre-commit-hooks": { "inputs": { - "flake-utils": "flake-utils_23", - "nixpkgs": "nixpkgs_55" + "flake-utils": "flake-utils_25", + "nixpkgs": "nixpkgs_57" }, "locked": { "lastModified": 1639823344, @@ -8379,9 +8900,9 @@ "ragenix": { "inputs": { "agenix": "agenix_3", - "flake-utils": "flake-utils_8", - "nixpkgs": "nixpkgs_21", - "rust-overlay": "rust-overlay" + "flake-utils": "flake-utils_10", + "nixpkgs": "nixpkgs_23", + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1641119695, @@ -8400,9 +8921,9 @@ "ragenix_2": { "inputs": { "agenix": "agenix_4", - "flake-utils": "flake-utils_10", - "nixpkgs": "nixpkgs_24", - "rust-overlay": "rust-overlay_2" + "flake-utils": "flake-utils_12", + "nixpkgs": "nixpkgs_26", + "rust-overlay": "rust-overlay_3" }, "locked": { "lastModified": 1645147603, @@ -8421,9 +8942,9 @@ "ragenix_3": { "inputs": { "agenix": "agenix_5", - "flake-utils": "flake-utils_12", - "nixpkgs": "nixpkgs_33", - "rust-overlay": "rust-overlay_3" + "flake-utils": "flake-utils_14", + "nixpkgs": "nixpkgs_35", + "rust-overlay": "rust-overlay_4" }, "locked": { "lastModified": 1641119695, @@ -8442,9 +8963,9 @@ "ragenix_4": { "inputs": { "agenix": "agenix_7", - "flake-utils": "flake-utils_19", - "nixpkgs": "nixpkgs_50", - "rust-overlay": "rust-overlay_4" + "flake-utils": "flake-utils_21", + "nixpkgs": "nixpkgs_52", + "rust-overlay": "rust-overlay_5" }, "locked": { "lastModified": 1641119695, @@ -8463,9 +8984,9 @@ "ragenix_5": { "inputs": { "agenix": "agenix_8", - "flake-utils": "flake-utils_21", - "nixpkgs": "nixpkgs_53", - "rust-overlay": "rust-overlay_5" + "flake-utils": "flake-utils_23", + "nixpkgs": "nixpkgs_55", + "rust-overlay": "rust-overlay_6" }, "locked": { "lastModified": 1645147603, @@ -8489,7 +9010,7 @@ "cardano-node": "cardano-node", "db-sync": "db-sync", "easy-purescript-nix": "easy-purescript-nix", - "flake-compat": "flake-compat_11", + "flake-compat": "flake-compat_12", "hackage-nix": "hackage-nix", "haskell-nix": "haskell-nix_3", "hercules-ci-effects": "hercules-ci-effects", @@ -8506,6 +9027,23 @@ } }, "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1677221702, + "narHash": "sha256-1M+58rC4eTCWNmmX0hQVZP20t3tfYNunl9D/PrGUyGE=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "f5401f620699b26ed9d47a1d2e838143a18dbe3b", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-analyzer-src_2": { "flake": false, "locked": { "lastModified": 1645024434, @@ -8522,7 +9060,7 @@ "type": "github" } }, - "rust-analyzer-src_2": { + "rust-analyzer-src_3": { "flake": false, "locked": { "lastModified": 1649178056, @@ -8539,7 +9077,7 @@ "type": "github" } }, - "rust-analyzer-src_3": { + "rust-analyzer-src_4": { "flake": false, "locked": { "lastModified": 1645024434, @@ -8556,7 +9094,7 @@ "type": "github" } }, - "rust-analyzer-src_4": { + "rust-analyzer-src_5": { "flake": false, "locked": { "lastModified": 1660579619, @@ -8573,7 +9111,7 @@ "type": "github" } }, - "rust-analyzer-src_5": { + "rust-analyzer-src_6": { "flake": false, "locked": { "lastModified": 1645024434, @@ -8590,7 +9128,7 @@ "type": "github" } }, - "rust-analyzer-src_6": { + "rust-analyzer-src_7": { "flake": false, "locked": { "lastModified": 1649178056, @@ -8608,6 +9146,37 @@ } }, "rust-overlay": { + "inputs": { + "flake-utils": [ + "cardano-node", + "std", + "paisano-mdbook-preprocessor", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "cardano-node", + "std", + "paisano-mdbook-preprocessor", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1675391458, + "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { "inputs": { "flake-utils": [ "db-sync", @@ -8642,7 +9211,7 @@ "type": "github" } }, - "rust-overlay_2": { + "rust-overlay_3": { "inputs": { "flake-utils": [ "db-sync", @@ -8675,7 +9244,7 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_4": { "inputs": { "flake-utils": [ "db-sync", @@ -8706,7 +9275,7 @@ "type": "github" } }, - "rust-overlay_4": { + "rust-overlay_5": { "inputs": { "flake-utils": [ "db-sync", @@ -8739,7 +9308,7 @@ "type": "github" } }, - "rust-overlay_5": { + "rust-overlay_6": { "inputs": { "flake-utils": [ "db-sync", @@ -8841,11 +9410,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1685491814, - "narHash": "sha256-OQX+h5hcDptW6HVrYkBL7dtgqiaiz9zn6iMYv+0CDzc=", + "lastModified": 1690762200, + "narHash": "sha256-UB02izyJREbLmS7+pyJvKF3mDePI6fTasqtg3fltJA0=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "678b4297ccef8bbcd83294e47e1a9042034bdbd0", + "rev": "c91713e7ca38abba6a90686df895acda53fd5038", "type": "github" }, "original": { @@ -8954,6 +9523,7 @@ "inputs": { "arion": [ "cardano-node", + "cardano-automation", "tullia", "std", "blank" @@ -8961,32 +9531,35 @@ "blank": "blank", "devshell": "devshell", "dmerge": "dmerge", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_3", "incl": "incl", "makes": [ "cardano-node", + "cardano-automation", "tullia", "std", "blank" ], "microvm": [ "cardano-node", + "cardano-automation", "tullia", "std", "blank" ], "n2c": "n2c", "nixago": "nixago", - "nixpkgs": "nixpkgs_8", - "nosys": "nosys", + "nixpkgs": "nixpkgs_4", + "paisano": "paisano", + "paisano-tui": "paisano-tui", "yants": "yants" }, "locked": { - "lastModified": 1674526466, - "narHash": "sha256-tMTaS0bqLx6VJ+K+ZT6xqsXNpzvSXJTmogkraBGzymg=", + "lastModified": 1677533652, + "narHash": "sha256-H37dcuWAGZs6Yl9mewMNVcmSaUXR90/bABYFLT/nwhk=", "owner": "divnix", "repo": "std", - "rev": "516387e3d8d059b50e742a2ff1909ed3c8f82826", + "rev": "490542f624412662e0411d8cb5a9af988ef56633", "type": "github" }, "original": { @@ -8997,13 +9570,58 @@ }, "std_2": { "inputs": { - "devshell": "devshell_7", + "arion": [ + "cardano-node", + "std", + "blank" + ], + "blank": "blank_2", + "devshell": "devshell_2", "dmerge": "dmerge_2", - "flake-utils": "flake-utils_13", - "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor", + "flake-utils": "flake-utils_6", + "haumea": "haumea", + "incl": "incl_2", + "makes": [ + "cardano-node", + "std", + "blank" + ], + "microvm": [ + "cardano-node", + "std", + "blank" + ], + "n2c": "n2c_2", "nixago": "nixago_2", - "nixpkgs": "nixpkgs_34", - "yants": "yants_3" + "nixpkgs": "nixpkgs_9", + "paisano": "paisano_2", + "paisano-mdbook-preprocessor": "paisano-mdbook-preprocessor", + "paisano-tui": "paisano-tui_2", + "yants": "yants_2" + }, + "locked": { + "lastModified": 1687300684, + "narHash": "sha256-oBqbss0j+B568GoO3nF2BCoPEgPxUjxfZQGynW6mhEk=", + "owner": "divnix", + "repo": "std", + "rev": "80e5792eae98353a97ab1e85f3fba2784e4a3690", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "std", + "type": "github" + } + }, + "std_3": { + "inputs": { + "devshell": "devshell_8", + "dmerge": "dmerge_3", + "flake-utils": "flake-utils_15", + "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor", + "nixago": "nixago_3", + "nixpkgs": "nixpkgs_36", + "yants": "yants_4" }, "locked": { "lastModified": 1661370377, @@ -9019,15 +9637,15 @@ "type": "github" } }, - "std_3": { + "std_4": { "inputs": { - "devshell": "devshell_15", - "dmerge": "dmerge_3", - "flake-utils": "flake-utils_29", + "devshell": "devshell_16", + "dmerge": "dmerge_4", + "flake-utils": "flake-utils_31", "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor_2", - "nixago": "nixago_3", - "nixpkgs": "nixpkgs_64", - "yants": "yants_5" + "nixago": "nixago_4", + "nixpkgs": "nixpkgs_66", + "yants": "yants_6" }, "locked": { "lastModified": 1661367957, @@ -9043,11 +9661,11 @@ "type": "github" } }, - "std_4": { + "std_5": { "inputs": { - "devshell": "devshell_16", - "nixpkgs": "nixpkgs_67", - "yants": "yants_6" + "devshell": "devshell_17", + "nixpkgs": "nixpkgs_69", + "yants": "yants_7" }, "locked": { "lastModified": 1652784712, @@ -9243,10 +9861,25 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tailwind-haskell": { "inputs": { - "flake-utils": "flake-utils_24", - "nixpkgs": "nixpkgs_58" + "flake-utils": "flake-utils_26", + "nixpkgs": "nixpkgs_60" }, "locked": { "lastModified": 1654211622, @@ -9267,7 +9900,7 @@ "inputs": { "bats-assert": "bats-assert", "bats-support": "bats-support", - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_11", "nixpkgs": [ "db-sync", "cardano-world", @@ -9341,7 +9974,7 @@ "inputs": { "bats-assert": "bats-assert_2", "bats-support": "bats-support_2", - "flake-utils": "flake-utils_14", + "flake-utils": "flake-utils_16", "nixpkgs": [ "db-sync", "cardano-world", @@ -9368,7 +10001,7 @@ "inputs": { "bats-assert": "bats-assert_3", "bats-support": "bats-support_3", - "flake-utils": "flake-utils_20", + "flake-utils": "flake-utils_22", "nixpkgs": [ "db-sync", "cardano-world", @@ -9395,16 +10028,20 @@ "tullia": { "inputs": { "nix-nomad": "nix-nomad", - "nix2container": "nix2container_2", - "nixpkgs": "nixpkgs_7", + "nix2container": "nix2container", + "nixpkgs": [ + "cardano-node", + "cardano-automation", + "nixpkgs" + ], "std": "std" }, "locked": { - "lastModified": 1675695930, - "narHash": "sha256-B7rEZ/DBUMlK1AcJ9ajnAPPxqXY6zW2SBX+51bZV0Ac=", + "lastModified": 1684859161, + "narHash": "sha256-wOKutImA7CRL0rN+Ng80E72fD5FkVub7LLP2k9NICpg=", "owner": "input-output-hk", "repo": "tullia", - "rev": "621365f2c725608f381b3ad5b57afef389fd4c31", + "rev": "2964cff1a16eefe301bdddb508c49d94d04603d6", "type": "github" }, "original": { @@ -9416,8 +10053,8 @@ "tullia_2": { "inputs": { "nix2container": "nix2container_3", - "nixpkgs": "nixpkgs_66", - "std": "std_4" + "nixpkgs": "nixpkgs_68", + "std": "std_5" }, "locked": { "lastModified": 1657811465, @@ -9816,6 +10453,7 @@ "inputs": { "nixpkgs": [ "cardano-node", + "cardano-automation", "tullia", "std", "nixpkgs" @@ -9837,7 +10475,30 @@ }, "yants_2": { "inputs": { - "nixpkgs": "nixpkgs_25" + "nixpkgs": [ + "cardano-node", + "std", + "haumea", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1686863218, + "narHash": "sha256-kooxYm3/3ornWtVBNHM3Zh020gACUyFX2G0VQXnB+mk=", + "owner": "divnix", + "repo": "yants", + "rev": "8f0da0dba57149676aa4817ec0c880fbde7a648d", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "yants", + "type": "github" + } + }, + "yants_3": { + "inputs": { + "nixpkgs": "nixpkgs_27" }, "locked": { "lastModified": 1645126146, @@ -9853,7 +10514,7 @@ "type": "github" } }, - "yants_3": { + "yants_4": { "inputs": { "nixpkgs": [ "db-sync", @@ -9877,9 +10538,9 @@ "type": "github" } }, - "yants_4": { + "yants_5": { "inputs": { - "nixpkgs": "nixpkgs_60" + "nixpkgs": "nixpkgs_62" }, "locked": { "lastModified": 1645126146, @@ -9895,7 +10556,7 @@ "type": "github" } }, - "yants_5": { + "yants_6": { "inputs": { "nixpkgs": [ "db-sync", @@ -9918,7 +10579,7 @@ "type": "github" } }, - "yants_6": { + "yants_7": { "inputs": { "nixpkgs": [ "db-sync", diff --git a/flake.nix b/flake.nix index 1b9aa279d1..ee2f6c46f9 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,7 @@ flake = false; }; - cardano-node.url = "github:input-output-hk/cardano-node/8.1.1"; + cardano-node.url = "github:input-output-hk/cardano-node/8.5.0-pre"; ogmios-nixos = { url = "github:mlabs-haskell/ogmios-nixos/78e829e9ebd50c5891024dcd1004c2ac51facd80"; @@ -61,9 +61,10 @@ }; # Repository with network parameters + # NOTE(bladyjoker): Cardano configurations (yaml/json) often change format and break, that's why we pin to a specific known version. cardano-configurations = { # Override with "path:/path/to/cardano-configurations"; - url = "github:input-output-hk/cardano-configurations"; + url = "github:input-output-hk/cardano-configurations?rev=d952529afdfdf6d53ce190b1bf8af990a7ae9590"; flake = false; }; easy-purescript-nix = { diff --git a/nix/runtime.nix b/nix/runtime.nix index 46b2d7c2b3..c85bcc0e28 100644 --- a/nix/runtime.nix +++ b/nix/runtime.nix @@ -17,7 +17,7 @@ rec { port = 3001; # the version of the node to use, corresponds to the image version tag, # i.e. `"inputoutput/cardano-node:${tag}"` - tag = "1.35.4"; + tag = "8.1.1"; }; ogmios = { port = 1337; }; postgres = { From 7a6c76302b85d156540d3f2c434e6696e99bc88a Mon Sep 17 00:00:00 2001 From: Drazen Popovic Date: Mon, 11 Dec 2023 17:23:37 +0100 Subject: [PATCH 75/85] Trying out plutip?ref=gergley/version-bump --- flake.lock | 2 +- flake.nix | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index a9b6f3b57b..309915c8c4 100644 --- a/flake.lock +++ b/flake.lock @@ -8847,8 +8847,8 @@ }, "original": { "owner": "mlabs-haskell", + "ref": "gergely/version-bump", "repo": "plutip", - "rev": "1bf0b547cd3689c727586abb8385c008fb2a3d1c", "type": "github" } }, diff --git a/flake.nix b/flake.nix index ee2f6c46f9..a97cd65676 100644 --- a/flake.nix +++ b/flake.nix @@ -77,7 +77,8 @@ # Plutip server related inputs plutip = { - url = "github:mlabs-haskell/plutip/1bf0b547cd3689c727586abb8385c008fb2a3d1c"; + url = "github:mlabs-haskell/plutip?ref=gergely/version-bump"; + # TODO(bladyjoker): Why are we overriding inputs here? inputs = { nixpkgs.follows = "nixpkgs"; iohk-nix.follows = "iohk-nix"; From ea6c393f5c7febb60c45b575cef0136e1d0ede66 Mon Sep 17 00:00:00 2001 From: Drazen Popovic Date: Tue, 12 Dec 2023 11:21:05 +0100 Subject: [PATCH 76/85] Uses cardano-node 8.1.1 from flake inputs in all places (no dockerhub) --- flake.lock | 1802 +++++++++-------------------- flake.nix | 6 +- nix/runtime.nix | 25 +- plutip-server/cabal.project | 9 +- plutip-server/plutip-server.cabal | 1 + plutip-server/src/Api.hs | 3 +- 6 files changed, 589 insertions(+), 1257 deletions(-) diff --git a/flake.lock b/flake.lock index 309915c8c4..58b19d7653 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ "CHaP_2": { "flake": false, "locked": { - "lastModified": 1696538731, - "narHash": "sha256-oTsPiABmN7mw9hctagxzNcIDtvmyK4EuBzvMD2iXeeQ=", + "lastModified": 1686070892, + "narHash": "sha256-0yAYqvCg2/aby4AmW0QQK9RKnU1siQczfbUC6hOU02w=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "4276a203ed968d067b6c31c943b5bae5fc2ec4a2", + "rev": "596cf203a0a1ba252a083a79d384325000faeb49", "type": "github" }, "original": { @@ -182,7 +182,7 @@ }, "agenix": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1641576265, @@ -200,8 +200,8 @@ }, "agenix-cli": { "inputs": { - "flake-utils": "flake-utils_8", - "nixpkgs": "nixpkgs_12" + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1641404293, @@ -219,8 +219,8 @@ }, "agenix-cli_2": { "inputs": { - "flake-utils": "flake-utils_9", - "nixpkgs": "nixpkgs_14" + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1641404293, @@ -238,8 +238,8 @@ }, "agenix-cli_3": { "inputs": { - "flake-utils": "flake-utils_20", - "nixpkgs": "nixpkgs_43" + "flake-utils": "flake-utils_18", + "nixpkgs": "nixpkgs_41" }, "locked": { "lastModified": 1641404293, @@ -257,7 +257,7 @@ }, "agenix_2": { "inputs": { - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1641576265, @@ -350,7 +350,7 @@ }, "agenix_6": { "inputs": { - "nixpkgs": "nixpkgs_42" + "nixpkgs": "nixpkgs_40" }, "locked": { "lastModified": 1641576265, @@ -418,7 +418,7 @@ "alejandra": { "inputs": { "flakeCompat": "flakeCompat", - "nixpkgs": "nixpkgs_37" + "nixpkgs": "nixpkgs_35" }, "locked": { "lastModified": 1646360966, @@ -534,22 +534,22 @@ "inputs": { "agenix": "agenix", "agenix-cli": "agenix-cli", - "blank": "blank_3", + "blank": "blank_2", "capsules": "capsules", "data-merge": "data-merge", "deploy": "deploy_2", - "fenix": "fenix_5", + "fenix": "fenix_4", "hydra": "hydra_3", - "n2c": "n2c_3", + "n2c": "n2c_2", "nix": "nix_5", - "nixpkgs": "nixpkgs_31", + "nixpkgs": "nixpkgs_29", "nixpkgs-docker": "nixpkgs-docker", "nixpkgs-unstable": "nixpkgs-unstable_3", "nomad-driver-nix": "nomad-driver-nix_2", "nomad-follower": "nomad-follower_2", "ops-lib": "ops-lib_3", "ragenix": "ragenix_3", - "std": "std_3", + "std": "std_2", "terranix": "terranix_2", "utils": "utils_12" }, @@ -629,12 +629,12 @@ "inputs": { "agenix": "agenix_2", "agenix-cli": "agenix-cli_2", - "blank": "blank_4", + "blank": "blank_3", "deploy": "deploy", - "fenix": "fenix_3", + "fenix": "fenix_2", "hydra": "hydra_2", "nix": "nix_2", - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_15", "nixpkgs-unstable": "nixpkgs-unstable_2", "nomad": "nomad", "nomad-driver-nix": "nomad-driver-nix", @@ -663,12 +663,12 @@ "inputs": { "agenix": "agenix_6", "agenix-cli": "agenix-cli_3", - "blank": "blank_5", + "blank": "blank_4", "deploy": "deploy_3", - "fenix": "fenix_7", + "fenix": "fenix_6", "hydra": "hydra_4", "nix": "nix_9", - "nixpkgs": "nixpkgs_46", + "nixpkgs": "nixpkgs_44", "nixpkgs-unstable": "nixpkgs-unstable_4", "nomad": "nomad_2", "nomad-driver-nix": "nomad-driver-nix_3", @@ -768,21 +768,6 @@ "type": "github" } }, - "blank_6": { - "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "blank", - "type": "github" - } - }, "blockfrost": { "inputs": { "nixpkgs": "nixpkgs" @@ -1213,7 +1198,7 @@ "inputs": { "bitte": "bitte_2", "iogo": "iogo", - "nixpkgs": "nixpkgs_25", + "nixpkgs": "nixpkgs_23", "ragenix": "ragenix_2" }, "locked": { @@ -1234,7 +1219,7 @@ "inputs": { "bitte": "bitte_3", "iogo": "iogo_2", - "nixpkgs": "nixpkgs_54", + "nixpkgs": "nixpkgs_52", "ragenix": "ragenix_5" }, "locked": { @@ -1262,7 +1247,10 @@ "cardano-node", "nixpkgs" ], - "tullia": "tullia" + "tullia": [ + "cardano-node", + "tullia" + ] }, "locked": { "lastModified": 1679408951, @@ -1346,7 +1334,7 @@ }, "cardano-mainnet-mirror": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1642701714, @@ -1371,7 +1359,7 @@ "customConfig": "customConfig", "em": "em", "empty-flake": "empty-flake", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "hackageNix": "hackageNix", "haskellNix": "haskellNix", "hostNixpkgs": [ @@ -1379,27 +1367,32 @@ "nixpkgs" ], "iohkNix": "iohkNix", - "nix2container": "nix2container_2", + "nix2container": "nix2container", "nixpkgs": [ "cardano-node", "haskellNix", "nixpkgs-unstable" ], "ops-lib": "ops-lib", - "std": "std_2", + "std": [ + "cardano-node", + "tullia", + "std" + ], + "tullia": "tullia", "utils": "utils_2" }, "locked": { - "lastModified": 1696549777, - "narHash": "sha256-ONCnN1fLtYJB9kXDlUbF6nIjTnlqvI7kfppftrOOWAY=", + "lastModified": 1687190129, + "narHash": "sha256-JCa9+QhZ2RVSIKkhz2WCZqTKCgdUSuezWS2YsQ5vhM4=", "owner": "input-output-hk", "repo": "cardano-node", - "rev": "f1ce770834bf7150ca29cb647065c9e62d39be1a", + "rev": "6f79e5c3ea109a70cd01910368e011635767305a", "type": "github" }, "original": { "owner": "input-output-hk", - "ref": "8.5.0-pre", + "ref": "8.1.1", "repo": "cardano-node", "type": "github" } @@ -1538,8 +1531,8 @@ "customConfig": "customConfig_2", "ema": "ema", "emanote": "emanote", - "flake-compat": "flake-compat_9", - "flake-utils": "flake-utils_27", + "flake-compat": "flake-compat_8", + "flake-utils": "flake-utils_25", "haskellNix": "haskellNix_2", "hostNixpkgs": [ "db-sync", @@ -1585,13 +1578,13 @@ "cardano-node": "cardano-node_2", "cardano-wallet": "cardano-wallet", "data-merge": "data-merge_3", - "flake-compat": "flake-compat_10", + "flake-compat": "flake-compat_9", "hackage": "hackage_3", "haskell-nix": "haskell-nix_2", "iohk-nix": "iohk-nix", - "n2c": "n2c_4", + "n2c": "n2c_3", "nix-inclusive": "nix-inclusive", - "nixpkgs": "nixpkgs_65", + "nixpkgs": "nixpkgs_63", "nixpkgs-haskell": [ "db-sync", "cardano-world", @@ -1599,7 +1592,7 @@ "nixpkgs-unstable" ], "ogmios": "ogmios", - "std": "std_4", + "std": "std_3", "tullia": "tullia_2" }, "locked": { @@ -1620,14 +1613,14 @@ "inputs": { "alejandra": "alejandra", "data-merge": "data-merge_2", - "devshell": "devshell_9", + "devshell": "devshell_8", "driver": "driver", "follower": "follower", "haskell-nix": "haskell-nix", "inclusive": "inclusive_8", "nix": "nix_8", "nix-cache-proxy": "nix-cache-proxy", - "nixpkgs": "nixpkgs_41", + "nixpkgs": "nixpkgs_39", "poetry2nix": "poetry2nix", "utils": "utils_16" }, @@ -1645,32 +1638,6 @@ "type": "github" } }, - "crane": { - "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_7", - "nixpkgs": [ - "cardano-node", - "std", - "paisano-mdbook-preprocessor", - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1676162383, - "narHash": "sha256-krUCKdz7ebHlFYm/A7IbKDnj2ZmMMm3yIEQcooqm7+E=", - "owner": "ipetkov", - "repo": "crane", - "rev": "6fb400ec631b22ccdbc7090b38207f7fb5cfb5f2", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "customConfig": { "locked": { "lastModified": 1630400035, @@ -1716,7 +1683,7 @@ "data-merge": { "inputs": { "nixlib": "nixlib", - "yants": "yants_3" + "yants": "yants_2" }, "locked": { "lastModified": 1648237091, @@ -1753,7 +1720,7 @@ "data-merge_3": { "inputs": { "nixlib": "nixlib_3", - "yants": "yants_5" + "yants": "yants_4" }, "locked": { "lastModified": 1655854240, @@ -1773,7 +1740,7 @@ "inputs": { "cardano-world": "cardano-world", "customConfig": "customConfig_3", - "flake-compat": "flake-compat_11", + "flake-compat": "flake-compat_10", "haskellNix": "haskellNix_3", "iohkNix": "iohkNix_3", "nixpkgs": [ @@ -1800,8 +1767,8 @@ }, "deploy": { "inputs": { - "fenix": "fenix_2", - "flake-compat": "flake-compat_5", + "fenix": "fenix", + "flake-compat": "flake-compat_4", "nixpkgs": [ "db-sync", "cardano-world", @@ -1830,8 +1797,8 @@ }, "deploy_2": { "inputs": { - "fenix": "fenix_4", - "flake-compat": "flake-compat_6", + "fenix": "fenix_3", + "flake-compat": "flake-compat_5", "nixpkgs": [ "db-sync", "cardano-world", @@ -1858,8 +1825,8 @@ }, "deploy_3": { "inputs": { - "fenix": "fenix_6", - "flake-compat": "flake-compat_7", + "fenix": "fenix_5", + "flake-compat": "flake-compat_6", "nixpkgs": [ "db-sync", "cardano-world", @@ -1889,14 +1856,12 @@ "inputs": { "flake-utils": [ "cardano-node", - "cardano-automation", "tullia", "std", "flake-utils" ], "nixpkgs": [ "cardano-node", - "cardano-automation", "tullia", "std", "nixpkgs" @@ -1917,21 +1882,6 @@ } }, "devshell_10": { - "locked": { - "lastModified": 1632436039, - "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", - "owner": "numtide", - "repo": "devshell", - "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_11": { "locked": { "lastModified": 1636119665, "narHash": "sha256-e11Z9PyH9hdgTm4Vyl8S5iTwrv0um6+srzb1Ba+YUHA=", @@ -1946,7 +1896,7 @@ "type": "github" } }, - "devshell_12": { + "devshell_11": { "locked": { "lastModified": 1636119665, "narHash": "sha256-e11Z9PyH9hdgTm4Vyl8S5iTwrv0um6+srzb1Ba+YUHA=", @@ -1961,7 +1911,7 @@ "type": "github" } }, - "devshell_13": { + "devshell_12": { "locked": { "lastModified": 1632436039, "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", @@ -1976,7 +1926,7 @@ "type": "github" } }, - "devshell_14": { + "devshell_13": { "locked": { "lastModified": 1636119665, "narHash": "sha256-e11Z9PyH9hdgTm4Vyl8S5iTwrv0um6+srzb1Ba+YUHA=", @@ -1991,7 +1941,7 @@ "type": "github" } }, - "devshell_15": { + "devshell_14": { "locked": { "lastModified": 1637098489, "narHash": "sha256-IWBYLSNSENI/fTrXdYDhuCavxcgN9+RERrPM81f6DXY=", @@ -2006,7 +1956,7 @@ "type": "github" } }, - "devshell_16": { + "devshell_15": { "inputs": { "flake-utils": [ "db-sync", @@ -2035,9 +1985,9 @@ "type": "github" } }, - "devshell_17": { + "devshell_16": { "inputs": { - "flake-utils": "flake-utils_33", + "flake-utils": "flake-utils_31", "nixpkgs": [ "db-sync", "cardano-world", @@ -2061,29 +2011,6 @@ } }, "devshell_2": { - "inputs": { - "nixpkgs": [ - "cardano-node", - "std", - "nixpkgs" - ], - "systems": "systems" - }, - "locked": { - "lastModified": 1686680692, - "narHash": "sha256-SsLZz3TDleraAiJq4EkmdyewSyiv5g0LZYc6vaLZOMQ=", - "owner": "numtide", - "repo": "devshell", - "rev": "fd6223370774dd9c33354e87a007004b5fd36442", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_3": { "locked": { "lastModified": 1632436039, "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", @@ -2098,7 +2025,7 @@ "type": "github" } }, - "devshell_4": { + "devshell_3": { "locked": { "lastModified": 1636119665, "narHash": "sha256-e11Z9PyH9hdgTm4Vyl8S5iTwrv0um6+srzb1Ba+YUHA=", @@ -2113,7 +2040,7 @@ "type": "github" } }, - "devshell_5": { + "devshell_4": { "locked": { "lastModified": 1637098489, "narHash": "sha256-IWBYLSNSENI/fTrXdYDhuCavxcgN9+RERrPM81f6DXY=", @@ -2128,7 +2055,7 @@ "type": "github" } }, - "devshell_6": { + "devshell_5": { "locked": { "lastModified": 1632436039, "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", @@ -2143,7 +2070,7 @@ "type": "github" } }, - "devshell_7": { + "devshell_6": { "locked": { "lastModified": 1636119665, "narHash": "sha256-e11Z9PyH9hdgTm4Vyl8S5iTwrv0um6+srzb1Ba+YUHA=", @@ -2158,7 +2085,7 @@ "type": "github" } }, - "devshell_8": { + "devshell_7": { "inputs": { "flake-utils": [ "db-sync", @@ -2189,10 +2116,10 @@ "type": "github" } }, - "devshell_9": { + "devshell_8": { "inputs": { - "flake-utils": "flake-utils_17", - "nixpkgs": "nixpkgs_38" + "flake-utils": "flake-utils_15", + "nixpkgs": "nixpkgs_36" }, "locked": { "lastModified": 1644227066, @@ -2208,18 +2135,31 @@ "type": "github" } }, + "devshell_9": { + "locked": { + "lastModified": 1632436039, + "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", + "owner": "numtide", + "repo": "devshell", + "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "dmerge": { "inputs": { "nixlib": [ "cardano-node", - "cardano-automation", "tullia", "std", "nixpkgs" ], "yants": [ "cardano-node", - "cardano-automation", "tullia", "std", "yants" @@ -2240,40 +2180,6 @@ } }, "dmerge_2": { - "inputs": { - "haumea": [ - "cardano-node", - "std", - "haumea" - ], - "nixlib": [ - "cardano-node", - "std", - "haumea", - "nixpkgs" - ], - "yants": [ - "cardano-node", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1686862774, - "narHash": "sha256-ojGtRQ9pIOUrxsQEuEPerUkqIJEuod9hIflfNkY+9CE=", - "owner": "divnix", - "repo": "dmerge", - "rev": "9f7f7a8349d33d7bd02e0f2b484b1f076e503a96", - "type": "github" - }, - "original": { - "owner": "divnix", - "ref": "0.2.1", - "repo": "dmerge", - "type": "github" - } - }, - "dmerge_3": { "inputs": { "nixlib": [ "db-sync", @@ -2304,7 +2210,7 @@ "type": "github" } }, - "dmerge_4": { + "dmerge_3": { "inputs": { "nixlib": [ "db-sync", @@ -2335,7 +2241,7 @@ }, "driver": { "inputs": { - "devshell": "devshell_10", + "devshell": "devshell_9", "inclusive": "inclusive_6", "nix": "nix_7", "nixpkgs": [ @@ -2395,9 +2301,9 @@ }, "ema": { "inputs": { - "flake-compat": "flake-compat_8", - "flake-utils": "flake-utils_24", - "nixpkgs": "nixpkgs_56", + "flake-compat": "flake-compat_7", + "flake-utils": "flake-utils_22", + "nixpkgs": "nixpkgs_54", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { @@ -2436,7 +2342,7 @@ "ema": "ema_2", "flake-parts": "flake-parts", "haskell-flake": "haskell-flake", - "nixpkgs": "nixpkgs_59", + "nixpkgs": "nixpkgs_57", "tailwind-haskell": "tailwind-haskell" }, "locked": { @@ -2470,28 +2376,9 @@ }, "fenix": { "inputs": { - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_13", "rust-analyzer-src": "rust-analyzer-src" }, - "locked": { - "lastModified": 1677306201, - "narHash": "sha256-VZ9x7qdTosFvVsrpgFHrtYfT6PU3yMIs7NRYn9ELapI=", - "owner": "nix-community", - "repo": "fenix", - "rev": "0923f0c162f65ae40261ec940406049726cfeab4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "fenix_2": { - "inputs": { - "nixpkgs": "nixpkgs_15", - "rust-analyzer-src": "rust-analyzer-src_2" - }, "locked": { "lastModified": 1645165506, "narHash": "sha256-PClhTeC1EhkHUQQmP9XyiR7y1d6hlEc7QY8nN1GuAzQ=", @@ -2506,7 +2393,7 @@ "type": "github" } }, - "fenix_3": { + "fenix_2": { "inputs": { "nixpkgs": [ "db-sync", @@ -2516,7 +2403,7 @@ "bitte", "nixpkgs-unstable" ], - "rust-analyzer-src": "rust-analyzer-src_3" + "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { "lastModified": 1649226351, @@ -2532,10 +2419,10 @@ "type": "github" } }, - "fenix_4": { + "fenix_3": { "inputs": { - "nixpkgs": "nixpkgs_28", - "rust-analyzer-src": "rust-analyzer-src_4" + "nixpkgs": "nixpkgs_26", + "rust-analyzer-src": "rust-analyzer-src_3" }, "locked": { "lastModified": 1645165506, @@ -2551,7 +2438,7 @@ "type": "github" } }, - "fenix_5": { + "fenix_4": { "inputs": { "nixpkgs": [ "db-sync", @@ -2559,7 +2446,7 @@ "bitte", "nixpkgs-unstable" ], - "rust-analyzer-src": "rust-analyzer-src_5" + "rust-analyzer-src": "rust-analyzer-src_4" }, "locked": { "lastModified": 1660631227, @@ -2575,10 +2462,10 @@ "type": "github" } }, - "fenix_6": { + "fenix_5": { "inputs": { - "nixpkgs": "nixpkgs_44", - "rust-analyzer-src": "rust-analyzer-src_6" + "nixpkgs": "nixpkgs_42", + "rust-analyzer-src": "rust-analyzer-src_5" }, "locked": { "lastModified": 1645165506, @@ -2594,7 +2481,7 @@ "type": "github" } }, - "fenix_7": { + "fenix_6": { "inputs": { "nixpkgs": [ "db-sync", @@ -2603,7 +2490,7 @@ "bitte", "nixpkgs-unstable" ], - "rust-analyzer-src": "rust-analyzer-src_7" + "rust-analyzer-src": "rust-analyzer-src_6" }, "locked": { "lastModified": 1649226351, @@ -2622,36 +2509,21 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", + "lastModified": 1647532380, + "narHash": "sha256-wswAxyO8AJTH7d5oU8VK82yBCpqwA+p6kLgpb1f1PAY=", + "owner": "input-output-hk", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "7da118186435255a30b5ffeabba9629c344c0bec", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "input-output-hk", + "ref": "fixes", "repo": "flake-compat", "type": "github" } }, "flake-compat_10": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_11": { "flake": false, "locked": { "lastModified": 1647532380, @@ -2668,7 +2540,7 @@ "type": "github" } }, - "flake-compat_12": { + "flake-compat_11": { "flake": false, "locked": { "lastModified": 1696426674, @@ -2684,7 +2556,7 @@ "type": "github" } }, - "flake-compat_13": { + "flake-compat_12": { "flake": false, "locked": { "lastModified": 1672831974, @@ -2701,7 +2573,7 @@ "type": "github" } }, - "flake-compat_14": { + "flake-compat_13": { "flake": false, "locked": { "lastModified": 1673956053, @@ -2717,7 +2589,7 @@ "type": "github" } }, - "flake-compat_15": { + "flake-compat_14": { "flake": false, "locked": { "lastModified": 1673956053, @@ -2734,23 +2606,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1647532380, - "narHash": "sha256-wswAxyO8AJTH7d5oU8VK82yBCpqwA+p6kLgpb1f1PAY=", - "owner": "input-output-hk", - "repo": "flake-compat", - "rev": "7da118186435255a30b5ffeabba9629c344c0bec", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "fixes", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1672831974, @@ -2767,14 +2622,14 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", "type": "github" }, "original": { @@ -2783,7 +2638,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1627913399, @@ -2799,7 +2654,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1627913399, @@ -2815,7 +2670,7 @@ "type": "github" } }, - "flake-compat_7": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1627913399, @@ -2831,7 +2686,7 @@ "type": "github" } }, - "flake-compat_8": { + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1641205782, @@ -2847,7 +2702,7 @@ "type": "github" } }, - "flake-compat_9": { + "flake-compat_8": { "flake": false, "locked": { "lastModified": 1635892615, @@ -2863,9 +2718,25 @@ "type": "github" } }, + "flake-compat_9": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { - "nixpkgs": "nixpkgs_58" + "nixpkgs": "nixpkgs_56" }, "locked": { "lastModified": 1655570068, @@ -2917,36 +2788,6 @@ } }, "flake-utils_10": { - "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_11": { - "locked": { - "lastModified": 1634851050, - "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_12": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -2961,7 +2802,7 @@ "type": "github" } }, - "flake-utils_13": { + "flake-utils_11": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -2976,7 +2817,7 @@ "type": "github" } }, - "flake-utils_14": { + "flake-utils_12": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -2991,7 +2832,7 @@ "type": "github" } }, - "flake-utils_15": { + "flake-utils_13": { "locked": { "lastModified": 1656928814, "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", @@ -3006,7 +2847,7 @@ "type": "github" } }, - "flake-utils_16": { + "flake-utils_14": { "locked": { "lastModified": 1634851050, "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", @@ -3021,7 +2862,7 @@ "type": "github" } }, - "flake-utils_17": { + "flake-utils_15": { "locked": { "lastModified": 1642700792, "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", @@ -3036,7 +2877,7 @@ "type": "github" } }, - "flake-utils_18": { + "flake-utils_16": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -3051,7 +2892,7 @@ "type": "github" } }, - "flake-utils_19": { + "flake-utils_17": { "locked": { "lastModified": 1610051610, "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", @@ -3066,13 +2907,13 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_18": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { @@ -3081,7 +2922,7 @@ "type": "github" } }, - "flake-utils_20": { + "flake-utils_19": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -3096,22 +2937,23 @@ "type": "github" } }, - "flake-utils_21": { + "flake-utils_2": { "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", + "lastModified": 1679360468, + "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", + "owner": "hamishmack", "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "rev": "e1ea268ff47ad475443dbabcd54744b4e5b9d4f5", "type": "github" }, "original": { - "owner": "numtide", + "owner": "hamishmack", + "ref": "hkm/nested-hydraJobs", "repo": "flake-utils", "type": "github" } }, - "flake-utils_22": { + "flake-utils_20": { "locked": { "lastModified": 1634851050, "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", @@ -3126,7 +2968,7 @@ "type": "github" } }, - "flake-utils_23": { + "flake-utils_21": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -3141,7 +2983,7 @@ "type": "github" } }, - "flake-utils_24": { + "flake-utils_22": { "locked": { "lastModified": 1642700792, "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", @@ -3156,7 +2998,7 @@ "type": "github" } }, - "flake-utils_25": { + "flake-utils_23": { "locked": { "lastModified": 1619345332, "narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=", @@ -3171,7 +3013,7 @@ "type": "github" } }, - "flake-utils_26": { + "flake-utils_24": { "locked": { "lastModified": 1652776076, "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", @@ -3187,7 +3029,7 @@ "type": "github" } }, - "flake-utils_27": { + "flake-utils_25": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -3202,7 +3044,7 @@ "type": "github" } }, - "flake-utils_28": { + "flake-utils_26": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -3217,7 +3059,7 @@ "type": "github" } }, - "flake-utils_29": { + "flake-utils_27": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -3232,13 +3074,13 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_28": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -3247,13 +3089,13 @@ "type": "github" } }, - "flake-utils_30": { + "flake-utils_29": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1656928814, + "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", "type": "github" }, "original": { @@ -3262,13 +3104,13 @@ "type": "github" } }, - "flake-utils_31": { + "flake-utils_3": { "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -3277,7 +3119,7 @@ "type": "github" } }, - "flake-utils_32": { + "flake-utils_30": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -3292,7 +3134,7 @@ "type": "github" } }, - "flake-utils_33": { + "flake-utils_31": { "locked": { "lastModified": 1642700792, "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", @@ -3307,7 +3149,7 @@ "type": "github" } }, - "flake-utils_34": { + "flake-utils_32": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -3322,7 +3164,7 @@ "type": "github" } }, - "flake-utils_35": { + "flake-utils_33": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -3339,27 +3181,26 @@ }, "flake-utils_4": { "locked": { - "lastModified": 1679360468, - "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", - "owner": "hamishmack", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", "repo": "flake-utils", - "rev": "e1ea268ff47ad475443dbabcd54744b4e5b9d4f5", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { - "owner": "hamishmack", - "ref": "hkm/nested-hydraJobs", + "owner": "numtide", "repo": "flake-utils", "type": "github" } }, "flake-utils_5": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -3370,11 +3211,11 @@ }, "flake-utils_6": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { @@ -3385,11 +3226,11 @@ }, "flake-utils_7": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { @@ -3415,11 +3256,11 @@ }, "flake-utils_9": { "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "lastModified": 1634851050, + "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", "owner": "numtide", "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", "type": "github" }, "original": { @@ -3446,7 +3287,7 @@ }, "follower": { "inputs": { - "devshell": "devshell_11", + "devshell": "devshell_10", "inclusive": "inclusive_7", "nixpkgs": [ "db-sync", @@ -3629,7 +3470,7 @@ }, "gomod2nix": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_5", "utils": "utils" }, "locked": { @@ -3681,11 +3522,11 @@ "hackageNix": { "flake": false, "locked": { - "lastModified": 1693182531, - "narHash": "sha256-OejogS2E745biMj8NuUYatN7uoMRsg7giVnRQwfiays=", + "lastModified": 1685492843, + "narHash": "sha256-X8dNs5Gfc2ucfaWAgZ1VmkpBB4Cb44EQZu0b7tkvz2Y=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "34cd9fe31d210f2ff041f490eaa4029f6b2812c4", + "rev": "e7407bab324eb2445bda58c5ffac393e80dda1e4", "type": "github" }, "original": { @@ -3780,7 +3621,7 @@ "cabal-34": "cabal-34_2", "cabal-36": "cabal-36_2", "cardano-shell": "cardano-shell_2", - "flake-utils": "flake-utils_18", + "flake-utils": "flake-utils_16", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_2", "hackage": "hackage", "hpc-coveralls": "hpc-coveralls_2", @@ -3827,7 +3668,7 @@ "cabal-34": "cabal-34_4", "cabal-36": "cabal-36_4", "cardano-shell": "cardano-shell_4", - "flake-utils": "flake-utils_29", + "flake-utils": "flake-utils_27", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_4", "hackage": [ "db-sync", @@ -3872,7 +3713,7 @@ "cabal-34": "cabal-34_6", "cabal-36": "cabal-36_6", "cardano-shell": "cardano-shell_6", - "flake-compat": "flake-compat_13", + "flake-compat": "flake-compat_12", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_6", "ghc98X": "ghc98X", "ghc99": "ghc99", @@ -3880,7 +3721,7 @@ "hackage-nix" ], "hls-1.10": "hls-1.10_2", - "hls-2.0": "hls-2.0_2", + "hls-2.0": "hls-2.0", "hls-2.2": "hls-2.2", "hls-2.3": "hls-2.3", "hls-2.4": "hls-2.4", @@ -3895,7 +3736,7 @@ "nixpkgs-2111": "nixpkgs-2111_6", "nixpkgs-2205": "nixpkgs-2205_3", "nixpkgs-2211": "nixpkgs-2211_2", - "nixpkgs-2305": "nixpkgs-2305_2", + "nixpkgs-2305": "nixpkgs-2305", "nixpkgs-unstable": "nixpkgs-unstable_8", "old-ghc-nix": "old-ghc-nix_6", "stackage": "stackage_6" @@ -3921,7 +3762,7 @@ "cabal-34": "cabal-34_7", "cabal-36": "cabal-36_7", "cardano-shell": "cardano-shell_7", - "flake-utils": "flake-utils_35", + "flake-utils": "flake-utils_33", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_7", "hackage": "hackage_5", "hpc-coveralls": "hpc-coveralls_7", @@ -3961,15 +3802,14 @@ "cabal-34": "cabal-34", "cabal-36": "cabal-36", "cardano-shell": "cardano-shell", - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_4", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", "hackage": [ "cardano-node", "hackageNix" ], "hls-1.10": "hls-1.10", - "hls-2.0": "hls-2.0", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", @@ -3982,17 +3822,16 @@ "nixpkgs-2111": "nixpkgs-2111", "nixpkgs-2205": "nixpkgs-2205", "nixpkgs-2211": "nixpkgs-2211", - "nixpkgs-2305": "nixpkgs-2305", "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": "old-ghc-nix", "stackage": "stackage" }, "locked": { - "lastModified": 1690764022, - "narHash": "sha256-+BFPab4/766AF+jfEAo6l3AZH5Zs1lbba2EVOcGhid0=", + "lastModified": 1685495397, + "narHash": "sha256-BwbWroS1Qm8BiHatG5+iHMHN5U6kqOccewBROUYuMKw=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "0f2a6a9dfad636680367c0462dcd50ee64a9bddc", + "rev": "d07c42cdb1cf88d0cab27d3090b00cb3899643c9", "type": "github" }, "original": { @@ -4008,7 +3847,7 @@ "cabal-34": "cabal-34_3", "cabal-36": "cabal-36_3", "cardano-shell": "cardano-shell_3", - "flake-utils": "flake-utils_28", + "flake-utils": "flake-utils_26", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_3", "hackage": "hackage_2", "hpc-coveralls": "hpc-coveralls_3", @@ -4048,7 +3887,7 @@ "cabal-34": "cabal-34_5", "cabal-36": "cabal-36_5", "cardano-shell": "cardano-shell_5", - "flake-utils": "flake-utils_34", + "flake-utils": "flake-utils_32", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_5", "hackage": "hackage_4", "hpc-coveralls": "hpc-coveralls_5", @@ -4080,29 +3919,10 @@ "type": "github" } }, - "haumea": { + "hercules-ci-effects": { "inputs": { - "nixpkgs": "nixpkgs_8" - }, - "locked": { - "lastModified": 1685133229, - "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=", - "owner": "nix-community", - "repo": "haumea", - "rev": "34dd58385092a23018748b50f9b23de6266dffc2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "v0.2.2", - "repo": "haumea", - "type": "github" - } - }, - "hercules-ci-effects": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_72" + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_70" }, "locked": { "lastModified": 1699381651, @@ -4169,23 +3989,6 @@ "type": "github" } }, - "hls-2.0_2": { - "flake": false, - "locked": { - "lastModified": 1687698105, - "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "783905f211ac63edf982dd1889c671653327e441", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.0.0.1", - "repo": "haskell-language-server", - "type": "github" - } - }, "hls-2.2": { "flake": false, "locked": { @@ -4595,7 +4398,6 @@ "inputs": { "nixlib": [ "cardano-node", - "cardano-automation", "tullia", "std", "nixpkgs" @@ -4615,29 +4417,6 @@ "type": "github" } }, - "incl_2": { - "inputs": { - "nixlib": [ - "cardano-node", - "std", - "haumea", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1669263024, - "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", - "owner": "divnix", - "repo": "incl", - "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "incl", - "type": "github" - } - }, "inclusive": { "inputs": { "stdlib": "stdlib" @@ -4838,9 +4617,9 @@ }, "iogo": { "inputs": { - "devshell": "devshell_5", + "devshell": "devshell_4", "inclusive": "inclusive_3", - "nixpkgs": "nixpkgs_24", + "nixpkgs": "nixpkgs_22", "utils": "utils_8" }, "locked": { @@ -4859,9 +4638,9 @@ }, "iogo_2": { "inputs": { - "devshell": "devshell_15", + "devshell": "devshell_14", "inclusive": "inclusive_11", - "nixpkgs": "nixpkgs_53", + "nixpkgs": "nixpkgs_51", "utils": "utils_22" }, "locked": { @@ -4957,11 +4736,11 @@ "sodium": "sodium" }, "locked": { - "lastModified": 1696445248, - "narHash": "sha256-2B/fqwyaRAaHVmkf15tKwkFbL5O46TmMw+Rc2viUPEY=", + "lastModified": 1684223806, + "narHash": "sha256-IyLoP+zhuyygLtr83XXsrvKyqqLQ8FHXTiySFf4FJOI=", "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "e32040e84180b3c27c0f13587025f6a17a4da520", + "rev": "86421fdd89b3af43fa716ccd07638f96c6ecd1e4", "type": "github" }, "original": { @@ -5017,11 +4796,11 @@ "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1688517130, - "narHash": "sha256-hUqfxSlo+ffqVdkSZ1EDoB7/ILCL25eYkcCXW9/P3Wc=", + "lastModified": 1670983692, + "narHash": "sha256-avLo34JnI9HNyOuauK5R69usJm+GfW3MlyGlYxZhTgY=", "ref": "hkm/remote-iserv", - "rev": "9151db2a9a61d7f5fe52ff8836f18bbd0fd8933c", - "revCount": 13, + "rev": "50d0abb3317ac439a4e7495b185a64af9b7b9300", + "revCount": 10, "type": "git", "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" }, @@ -5385,25 +5164,23 @@ "inputs": { "flake-utils": [ "cardano-node", - "cardano-automation", "tullia", "std", "flake-utils" ], "nixpkgs": [ "cardano-node", - "cardano-automation", "tullia", "std", "nixpkgs" ] }, "locked": { - "lastModified": 1677330646, - "narHash": "sha256-hUYCwJneMjnxTvj30Fjow6UMJUITqHlpUGpXMPXUJsU=", + "lastModified": 1665039323, + "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", "owner": "nlewo", "repo": "nix2container", - "rev": "ebca8f58d450cae1a19c07701a5a8ae40afc9efc", + "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", "type": "github" }, "original": { @@ -5414,35 +5191,8 @@ }, "n2c_2": { "inputs": { - "flake-utils": [ - "cardano-node", - "std", - "flake-utils" - ], - "nixpkgs": [ - "cardano-node", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1685771919, - "narHash": "sha256-3lVKWrhNXjHJB6QkZ2SJaOs4X/mmYXtY6ovPVpDMOHc=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "95e2220911874064b5d809f8d35f7835184c4ddf", - "type": "github" - }, - "original": { - "owner": "nlewo", - "repo": "nix2container", - "type": "github" - } - }, - "n2c_3": { - "inputs": { - "flake-utils": "flake-utils_13", - "nixpkgs": "nixpkgs_29" + "flake-utils": "flake-utils_11", + "nixpkgs": "nixpkgs_27" }, "locked": { "lastModified": 1650568002, @@ -5458,10 +5208,10 @@ "type": "github" } }, - "n2c_4": { + "n2c_3": { "inputs": { - "flake-utils": "flake-utils_30", - "nixpkgs": "nixpkgs_64" + "flake-utils": "flake-utils_28", + "nixpkgs": "nixpkgs_62" }, "locked": { "lastModified": 1655533513, @@ -5480,7 +5230,7 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_3", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { @@ -5500,7 +5250,7 @@ }, "nix-cache-proxy": { "inputs": { - "devshell": "devshell_12", + "devshell": "devshell_11", "inclusive": [ "db-sync", "cardano-world", @@ -5551,10 +5301,9 @@ }, "nix-nomad": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_3", "flake-utils": [ "cardano-node", - "cardano-automation", "tullia", "nix2container", "flake-utils" @@ -5562,13 +5311,11 @@ "gomod2nix": "gomod2nix", "nixpkgs": [ "cardano-node", - "cardano-automation", "tullia", "nixpkgs" ], "nixpkgs-lib": [ "cardano-node", - "cardano-automation", "tullia", "nixpkgs" ] @@ -5669,15 +5416,15 @@ }, "nix2container": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1658567952, - "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", + "lastModified": 1671269339, + "narHash": "sha256-KR2SXh4c2Y+bgbCfXjTGJ74O9/u4CAPFA0KYZHhKf5Q=", "owner": "nlewo", "repo": "nix2container", - "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", + "rev": "6800fff45afecc7e47c334d14cf2b2f4f25601a0", "type": "github" }, "original": { @@ -5688,15 +5435,15 @@ }, "nix2container_2": { "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_7" + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1671269339, - "narHash": "sha256-KR2SXh4c2Y+bgbCfXjTGJ74O9/u4CAPFA0KYZHhKf5Q=", + "lastModified": 1658567952, + "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", "owner": "nlewo", "repo": "nix2container", - "rev": "6800fff45afecc7e47c334d14cf2b2f4f25601a0", + "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", "type": "github" }, "original": { @@ -5707,8 +5454,8 @@ }, "nix2container_3": { "inputs": { - "flake-utils": "flake-utils_32", - "nixpkgs": "nixpkgs_67" + "flake-utils": "flake-utils_30", + "nixpkgs": "nixpkgs_65" }, "locked": { "lastModified": 1653427219, @@ -5728,7 +5475,7 @@ "nix_10": { "inputs": { "lowdown-src": "lowdown-src_10", - "nixpkgs": "nixpkgs_47" + "nixpkgs": "nixpkgs_45" }, "locked": { "lastModified": 1604400356, @@ -5747,7 +5494,7 @@ "nix_11": { "inputs": { "lowdown-src": "lowdown-src_11", - "nixpkgs": "nixpkgs_49", + "nixpkgs": "nixpkgs_47", "nixpkgs-regression": "nixpkgs-regression_9" }, "locked": { @@ -5767,7 +5514,7 @@ "nix_12": { "inputs": { "lowdown-src": "lowdown-src_12", - "nixpkgs": "nixpkgs_61", + "nixpkgs": "nixpkgs_59", "nixpkgs-regression": "nixpkgs-regression_10" }, "locked": { @@ -5788,7 +5535,7 @@ "nix_13": { "inputs": { "lowdown-src": "lowdown-src_13", - "nixpkgs": "nixpkgs_63", + "nixpkgs": "nixpkgs_61", "nixpkgs-regression": "nixpkgs-regression_11" }, "locked": { @@ -5809,7 +5556,7 @@ "nix_14": { "inputs": { "lowdown-src": "lowdown-src_14", - "nixpkgs": "nixpkgs_70", + "nixpkgs": "nixpkgs_68", "nixpkgs-regression": "nixpkgs-regression_12" }, "locked": { @@ -5830,7 +5577,7 @@ "nix_15": { "inputs": { "lowdown-src": "lowdown-src_15", - "nixpkgs": "nixpkgs_71", + "nixpkgs": "nixpkgs_69", "nixpkgs-regression": "nixpkgs-regression_13" }, "locked": { @@ -5851,7 +5598,7 @@ "nix_16": { "inputs": { "lowdown-src": "lowdown-src_16", - "nixpkgs": "nixpkgs_73", + "nixpkgs": "nixpkgs_71", "nixpkgs-regression": "nixpkgs-regression_14" }, "locked": { @@ -5872,7 +5619,7 @@ "nix_2": { "inputs": { "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_14", "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { @@ -5893,7 +5640,7 @@ "nix_3": { "inputs": { "lowdown-src": "lowdown-src_3", - "nixpkgs": "nixpkgs_18" + "nixpkgs": "nixpkgs_16" }, "locked": { "lastModified": 1604400356, @@ -5912,7 +5659,7 @@ "nix_4": { "inputs": { "lowdown-src": "lowdown-src_4", - "nixpkgs": "nixpkgs_20", + "nixpkgs": "nixpkgs_18", "nixpkgs-regression": "nixpkgs-regression_3" }, "locked": { @@ -5932,7 +5679,7 @@ "nix_5": { "inputs": { "lowdown-src": "lowdown-src_5", - "nixpkgs": "nixpkgs_30", + "nixpkgs": "nixpkgs_28", "nixpkgs-regression": "nixpkgs-regression_4" }, "locked": { @@ -5953,7 +5700,7 @@ "nix_6": { "inputs": { "lowdown-src": "lowdown-src_6", - "nixpkgs": "nixpkgs_32", + "nixpkgs": "nixpkgs_30", "nixpkgs-regression": "nixpkgs-regression_5" }, "locked": { @@ -5973,7 +5720,7 @@ "nix_7": { "inputs": { "lowdown-src": "lowdown-src_7", - "nixpkgs": "nixpkgs_39", + "nixpkgs": "nixpkgs_37", "nixpkgs-regression": "nixpkgs-regression_6" }, "locked": { @@ -5994,7 +5741,7 @@ "nix_8": { "inputs": { "lowdown-src": "lowdown-src_8", - "nixpkgs": "nixpkgs_40", + "nixpkgs": "nixpkgs_38", "nixpkgs-regression": "nixpkgs-regression_7" }, "locked": { @@ -6015,7 +5762,7 @@ "nix_9": { "inputs": { "lowdown-src": "lowdown-src_9", - "nixpkgs": "nixpkgs_45", + "nixpkgs": "nixpkgs_43", "nixpkgs-regression": "nixpkgs-regression_8" }, "locked": { @@ -6037,32 +5784,29 @@ "inputs": { "flake-utils": [ "cardano-node", - "cardano-automation", "tullia", "std", "flake-utils" ], "nixago-exts": [ "cardano-node", - "cardano-automation", "tullia", "std", "blank" ], "nixpkgs": [ "cardano-node", - "cardano-automation", "tullia", "std", "nixpkgs" ] }, "locked": { - "lastModified": 1676075813, - "narHash": "sha256-X/aIT8Qc8UCqnxJvaZykx3CJ0ZnDFvO+dqp/7fglZWo=", + "lastModified": 1661824785, + "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", "owner": "nix-community", "repo": "nixago", - "rev": "9cab4dde31ec2f2c05d702ea8648ce580664e906", + "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", "type": "github" }, "original": { @@ -6102,38 +5846,6 @@ } }, "nixago_2": { - "inputs": { - "flake-utils": [ - "cardano-node", - "std", - "flake-utils" - ], - "nixago-exts": [ - "cardano-node", - "std", - "blank" - ], - "nixpkgs": [ - "cardano-node", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1683210100, - "narHash": "sha256-bhGDOlkWtlhVECpoOog4fWiFJmLCpVEg09a40aTjCbw=", - "owner": "nix-community", - "repo": "nixago", - "rev": "1da60ad9412135f9ed7a004669fdcf3d378ec630", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixago", - "type": "github" - } - }, - "nixago_3": { "inputs": { "flake-utils": [ "db-sync", @@ -6165,7 +5877,7 @@ "type": "github" } }, - "nixago_4": { + "nixago_3": { "inputs": { "flake-utils": [ "db-sync", @@ -6642,11 +6354,11 @@ }, "nixpkgs-2211": { "locked": { - "lastModified": 1685314633, - "narHash": "sha256-8LXBPqTQXl5ofkjpJ18JcbmLJ/lWDoMxtUwiDYv0wro=", + "lastModified": 1682682915, + "narHash": "sha256-haR0u/j/nUvlMloYlaOYq1FMXTvkNHw+wGxc+0qXisM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8a17ce7abc03c50cd072e9e6c9b389c5f61836b", + "rev": "09f1b33fcc0f59263137e23e935c1bb03ec920e4", "type": "github" }, "original": { @@ -6673,22 +6385,6 @@ } }, "nixpkgs-2305": { - "locked": { - "lastModified": 1685338297, - "narHash": "sha256-+Aq4O0Jn1W1q927ZHc3Zn6RO7bwQGmb6O8xYoGy0KrM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6287b47dbfabbb8bfbb9b1b53d198ad58a774de4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-23.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2305_2": { "locked": { "lastModified": 1695416179, "narHash": "sha256-610o1+pwbSu+QuF3GE0NU5xQdTHM3t9wyYhB9l94Cd8=", @@ -6934,11 +6630,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1685347552, - "narHash": "sha256-9woSppRyUFo26yUffORTzttJ+apOt8MmCv6RxpPNTU4=", + "lastModified": 1682656005, + "narHash": "sha256-fYplYo7so1O+rSQ2/aS+SbTPwLTeoUXk4ekKNtSl4P8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f2f1ec390714d303cf84ba086e34e45b450dd8c4", + "rev": "6806b63e824f84b0f0e60b6d660d4ae753de0477", "type": "github" }, "original": { @@ -7077,36 +6773,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1677063315, - "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "988cc958c57ce4350ec248d2d53087777f9e1949", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1627969475, - "narHash": "sha256-MhVtkVt1MFfaDY3ObJu54NBcsaPk19vOBZ8ouhjO4qs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bd27e2e8316ac6eab11aa35c586e743286f23ecf", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_12": { "locked": { "lastModified": 1644972330, "narHash": "sha256-6V2JFpTUzB9G+KcqtUR1yl7f6rd9495YrFECslEmbGw=", @@ -7122,7 +6788,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_11": { "locked": { "lastModified": 1627969475, "narHash": "sha256-MhVtkVt1MFfaDY3ObJu54NBcsaPk19vOBZ8ouhjO4qs=", @@ -7136,7 +6802,7 @@ "type": "indirect" } }, - "nixpkgs_14": { + "nixpkgs_12": { "locked": { "lastModified": 1644972330, "narHash": "sha256-6V2JFpTUzB9G+KcqtUR1yl7f6rd9495YrFECslEmbGw=", @@ -7152,7 +6818,7 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_13": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -7168,7 +6834,7 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_14": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -7183,7 +6849,7 @@ "type": "indirect" } }, - "nixpkgs_17": { + "nixpkgs_15": { "locked": { "lastModified": 1638452135, "narHash": "sha256-5Il6hgrTgcWIsB7zug0yDFccYXx7pJCw8cwJdXMuLfM=", @@ -7199,7 +6865,7 @@ "type": "github" } }, - "nixpkgs_18": { + "nixpkgs_16": { "locked": { "lastModified": 1602702596, "narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=", @@ -7214,7 +6880,7 @@ "type": "indirect" } }, - "nixpkgs_19": { + "nixpkgs_17": { "locked": { "lastModified": 1638887115, "narHash": "sha256-emjtIeqyJ84Eb3X7APJruTrwcfnHQKs55XGljj62prs=", @@ -7230,23 +6896,7 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1653581809, - "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_20": { + "nixpkgs_18": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -7261,7 +6911,7 @@ "type": "indirect" } }, - "nixpkgs_21": { + "nixpkgs_19": { "locked": { "lastModified": 1641909823, "narHash": "sha256-Uxo+Wm6c/ijNhaJlYtFLJG9mh75FYZaBreMC2ZE0nEY=", @@ -7277,7 +6927,21 @@ "type": "github" } }, - "nixpkgs_22": { + "nixpkgs_2": { + "locked": { + "lastModified": 1642336556, + "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_20": { "locked": { "lastModified": 1647350163, "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", @@ -7293,7 +6957,7 @@ "type": "github" } }, - "nixpkgs_23": { + "nixpkgs_21": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -7309,7 +6973,7 @@ "type": "github" } }, - "nixpkgs_24": { + "nixpkgs_22": { "locked": { "lastModified": 1646506091, "narHash": "sha256-sWNAJE2m+HOh1jtXlHcnhxsj6/sXrHgbqVNcVRlveK4=", @@ -7325,7 +6989,7 @@ "type": "github" } }, - "nixpkgs_25": { + "nixpkgs_23": { "locked": { "lastModified": 1658119717, "narHash": "sha256-4upOZIQQ7Bc4CprqnHsKnqYfw+arJeAuU+QcpjYBXW0=", @@ -7341,7 +7005,7 @@ "type": "github" } }, - "nixpkgs_26": { + "nixpkgs_24": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -7357,7 +7021,7 @@ "type": "github" } }, - "nixpkgs_27": { + "nixpkgs_25": { "locked": { "lastModified": 1652576347, "narHash": "sha256-52Wu7hkcIRcS4UenSSrt01J2sAbbQ6YqxZIDpuEPL/c=", @@ -7372,7 +7036,7 @@ "type": "github" } }, - "nixpkgs_28": { + "nixpkgs_26": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -7388,7 +7052,7 @@ "type": "github" } }, - "nixpkgs_29": { + "nixpkgs_27": { "locked": { "lastModified": 1642451377, "narHash": "sha256-hvAuYDUN8XIrcQKE6wDw4LjTCcwrTp2B1i1i/5vfDMQ=", @@ -7403,22 +7067,7 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1654807842, - "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_30": { + "nixpkgs_28": { "locked": { "lastModified": 1645296114, "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", @@ -7433,7 +7082,7 @@ "type": "indirect" } }, - "nixpkgs_31": { + "nixpkgs_29": { "locked": { "lastModified": 1652559422, "narHash": "sha256-jPVTNImBTUIFdtur+d4IVot6eXmsvtOcBm0TzxmhWPk=", @@ -7449,7 +7098,23 @@ "type": "github" } }, - "nixpkgs_32": { + "nixpkgs_3": { + "locked": { + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.05-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_30": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -7464,7 +7129,7 @@ "type": "indirect" } }, - "nixpkgs_33": { + "nixpkgs_31": { "locked": { "lastModified": 1641909823, "narHash": "sha256-Uxo+Wm6c/ijNhaJlYtFLJG9mh75FYZaBreMC2ZE0nEY=", @@ -7480,7 +7145,7 @@ "type": "github" } }, - "nixpkgs_34": { + "nixpkgs_32": { "locked": { "lastModified": 1647350163, "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", @@ -7496,7 +7161,7 @@ "type": "github" } }, - "nixpkgs_35": { + "nixpkgs_33": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -7512,7 +7177,7 @@ "type": "github" } }, - "nixpkgs_36": { + "nixpkgs_34": { "locked": { "lastModified": 1658311025, "narHash": "sha256-GqagY5YmaZB3YaO41kKcQhe5RcpS83wnsW8iCu5Znqo=", @@ -7528,7 +7193,7 @@ "type": "github" } }, - "nixpkgs_37": { + "nixpkgs_35": { "locked": { "lastModified": 1646331602, "narHash": "sha256-cRuytTfel52z947yKfJcZU7zbQBgM16qqTf+oJkVwtg=", @@ -7544,7 +7209,7 @@ "type": "github" } }, - "nixpkgs_38": { + "nixpkgs_36": { "locked": { "lastModified": 1643381941, "narHash": "sha256-pHTwvnN4tTsEKkWlXQ8JMY423epos8wUOhthpwJjtpc=", @@ -7560,7 +7225,7 @@ "type": "github" } }, - "nixpkgs_39": { + "nixpkgs_37": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -7575,23 +7240,7 @@ "type": "indirect" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1675940568, - "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_40": { + "nixpkgs_38": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -7606,7 +7255,7 @@ "type": "indirect" } }, - "nixpkgs_41": { + "nixpkgs_39": { "locked": { "lastModified": 1644486793, "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", @@ -7622,7 +7271,22 @@ "type": "github" } }, - "nixpkgs_42": { + "nixpkgs_4": { + "locked": { + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_40": { "locked": { "lastModified": 1627969475, "narHash": "sha256-MhVtkVt1MFfaDY3ObJu54NBcsaPk19vOBZ8ouhjO4qs=", @@ -7636,7 +7300,7 @@ "type": "indirect" } }, - "nixpkgs_43": { + "nixpkgs_41": { "locked": { "lastModified": 1644972330, "narHash": "sha256-6V2JFpTUzB9G+KcqtUR1yl7f6rd9495YrFECslEmbGw=", @@ -7652,7 +7316,7 @@ "type": "github" } }, - "nixpkgs_44": { + "nixpkgs_42": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -7668,7 +7332,7 @@ "type": "github" } }, - "nixpkgs_45": { + "nixpkgs_43": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -7683,7 +7347,7 @@ "type": "indirect" } }, - "nixpkgs_46": { + "nixpkgs_44": { "locked": { "lastModified": 1638452135, "narHash": "sha256-5Il6hgrTgcWIsB7zug0yDFccYXx7pJCw8cwJdXMuLfM=", @@ -7699,7 +7363,7 @@ "type": "github" } }, - "nixpkgs_47": { + "nixpkgs_45": { "locked": { "lastModified": 1602702596, "narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=", @@ -7714,7 +7378,7 @@ "type": "indirect" } }, - "nixpkgs_48": { + "nixpkgs_46": { "locked": { "lastModified": 1638887115, "narHash": "sha256-emjtIeqyJ84Eb3X7APJruTrwcfnHQKs55XGljj62prs=", @@ -7730,7 +7394,7 @@ "type": "github" } }, - "nixpkgs_49": { + "nixpkgs_47": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -7745,21 +7409,7 @@ "type": "indirect" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1642336556, - "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_50": { + "nixpkgs_48": { "locked": { "lastModified": 1641909823, "narHash": "sha256-Uxo+Wm6c/ijNhaJlYtFLJG9mh75FYZaBreMC2ZE0nEY=", @@ -7775,7 +7425,7 @@ "type": "github" } }, - "nixpkgs_51": { + "nixpkgs_49": { "locked": { "lastModified": 1647350163, "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", @@ -7791,7 +7441,23 @@ "type": "github" } }, - "nixpkgs_52": { + "nixpkgs_5": { + "locked": { + "lastModified": 1653581809, + "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_50": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -7807,7 +7473,7 @@ "type": "github" } }, - "nixpkgs_53": { + "nixpkgs_51": { "locked": { "lastModified": 1646506091, "narHash": "sha256-sWNAJE2m+HOh1jtXlHcnhxsj6/sXrHgbqVNcVRlveK4=", @@ -7823,7 +7489,7 @@ "type": "github" } }, - "nixpkgs_54": { + "nixpkgs_52": { "locked": { "lastModified": 1658119717, "narHash": "sha256-4upOZIQQ7Bc4CprqnHsKnqYfw+arJeAuU+QcpjYBXW0=", @@ -7839,7 +7505,7 @@ "type": "github" } }, - "nixpkgs_55": { + "nixpkgs_53": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -7855,7 +7521,7 @@ "type": "github" } }, - "nixpkgs_56": { + "nixpkgs_54": { "locked": { "lastModified": 1646470760, "narHash": "sha256-dQISyucVCCPaFioUhy5ZgfBz8rOMKGI8k13aPDFTqEs=", @@ -7871,7 +7537,7 @@ "type": "github" } }, - "nixpkgs_57": { + "nixpkgs_55": { "locked": { "lastModified": 1619531122, "narHash": "sha256-ovm5bo6PkZzNKh2YGXbRKYIjega0EjiEP0YDwyeXEYU=", @@ -7885,7 +7551,7 @@ "type": "indirect" } }, - "nixpkgs_58": { + "nixpkgs_56": { "locked": { "lastModified": 1656461576, "narHash": "sha256-rlmmw6lIlkMQIiB+NsnO8wQYWTfle8TA41UREPLP5VY=", @@ -7901,7 +7567,7 @@ "type": "github" } }, - "nixpkgs_59": { + "nixpkgs_57": { "locked": { "lastModified": 1655567057, "narHash": "sha256-Cc5hQSMsTzOHmZnYm8OSJ5RNUp22bd5NADWLHorULWQ=", @@ -7915,23 +7581,7 @@ "type": "indirect" } }, - "nixpkgs_6": { - "locked": { - "lastModified": 1657693803, - "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.05-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_60": { + "nixpkgs_58": { "locked": { "lastModified": 1656401090, "narHash": "sha256-bUS2nfQsvTQW2z8SK7oEFSElbmoBahOPtbXPm0AL3I4=", @@ -7945,7 +7595,7 @@ "type": "indirect" } }, - "nixpkgs_61": { + "nixpkgs_59": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -7960,7 +7610,22 @@ "type": "indirect" } }, - "nixpkgs_62": { + "nixpkgs_6": { + "locked": { + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_60": { "locked": { "lastModified": 1656809537, "narHash": "sha256-pwXBYG3ThN4ccJjvcdNdonQ8Wyv0y/iYdnuesiFUY1U=", @@ -7975,7 +7640,7 @@ "type": "github" } }, - "nixpkgs_63": { + "nixpkgs_61": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -7990,7 +7655,7 @@ "type": "indirect" } }, - "nixpkgs_64": { + "nixpkgs_62": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -8005,7 +7670,7 @@ "type": "github" } }, - "nixpkgs_65": { + "nixpkgs_63": { "locked": { "lastModified": 1656947410, "narHash": "sha256-htDR/PZvjUJGyrRJsVqDmXR8QeoswBaRLzHt13fd0iY=", @@ -8021,7 +7686,7 @@ "type": "github" } }, - "nixpkgs_66": { + "nixpkgs_64": { "locked": { "lastModified": 1658311025, "narHash": "sha256-GqagY5YmaZB3YaO41kKcQhe5RcpS83wnsW8iCu5Znqo=", @@ -8037,7 +7702,7 @@ "type": "github" } }, - "nixpkgs_67": { + "nixpkgs_65": { "locked": { "lastModified": 1642451377, "narHash": "sha256-hvAuYDUN8XIrcQKE6wDw4LjTCcwrTp2B1i1i/5vfDMQ=", @@ -8052,7 +7717,7 @@ "type": "github" } }, - "nixpkgs_68": { + "nixpkgs_66": { "locked": { "lastModified": 1653920503, "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", @@ -8068,7 +7733,7 @@ "type": "github" } }, - "nixpkgs_69": { + "nixpkgs_67": { "locked": { "lastModified": 1650469885, "narHash": "sha256-BuILRZ6pzMnGey8/irbjGq1oo3vIvZa1pitSdZCmIXA=", @@ -8084,22 +7749,7 @@ "type": "github" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1654807842, - "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_70": { + "nixpkgs_68": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -8114,7 +7764,7 @@ "type": "indirect" } }, - "nixpkgs_71": { + "nixpkgs_69": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -8130,7 +7780,23 @@ "type": "github" } }, - "nixpkgs_72": { + "nixpkgs_7": { + "locked": { + "lastModified": 1674407282, + "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_70": { "locked": { "lastModified": 1697723726, "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", @@ -8146,7 +7812,7 @@ "type": "github" } }, - "nixpkgs_73": { + "nixpkgs_71": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -8163,39 +7829,38 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1681001314, - "narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4", + "lastModified": 1665087388, + "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", "type": "github" } }, "nixpkgs_9": { "locked": { - "lastModified": 1675940568, - "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", - "owner": "nixos", + "lastModified": 1627969475, + "narHash": "sha256-MhVtkVt1MFfaDY3ObJu54NBcsaPk19vOBZ8ouhjO4qs=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71", + "rev": "bd27e2e8316ac6eab11aa35c586e743286f23ecf", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nomad": { "inputs": { "nix": "nix_3", - "nixpkgs": "nixpkgs_19", + "nixpkgs": "nixpkgs_17", "utils": "utils_4" }, "locked": { @@ -8215,10 +7880,10 @@ }, "nomad-driver-nix": { "inputs": { - "devshell": "devshell_3", + "devshell": "devshell_2", "inclusive": "inclusive", "nix": "nix_4", - "nixpkgs": "nixpkgs_21", + "nixpkgs": "nixpkgs_19", "utils": "utils_5" }, "locked": { @@ -8237,10 +7902,10 @@ }, "nomad-driver-nix_2": { "inputs": { - "devshell": "devshell_6", + "devshell": "devshell_5", "inclusive": "inclusive_4", "nix": "nix_6", - "nixpkgs": "nixpkgs_33", + "nixpkgs": "nixpkgs_31", "utils": "utils_10" }, "locked": { @@ -8259,10 +7924,10 @@ }, "nomad-driver-nix_3": { "inputs": { - "devshell": "devshell_13", + "devshell": "devshell_12", "inclusive": "inclusive_9", "nix": "nix_11", - "nixpkgs": "nixpkgs_50", + "nixpkgs": "nixpkgs_48", "utils": "utils_19" }, "locked": { @@ -8281,9 +7946,9 @@ }, "nomad-follower": { "inputs": { - "devshell": "devshell_4", + "devshell": "devshell_3", "inclusive": "inclusive_2", - "nixpkgs": "nixpkgs_22", + "nixpkgs": "nixpkgs_20", "utils": "utils_6" }, "locked": { @@ -8302,9 +7967,9 @@ }, "nomad-follower_2": { "inputs": { - "devshell": "devshell_7", + "devshell": "devshell_6", "inclusive": "inclusive_5", - "nixpkgs": "nixpkgs_34", + "nixpkgs": "nixpkgs_32", "utils": "utils_11" }, "locked": { @@ -8323,9 +7988,9 @@ }, "nomad-follower_3": { "inputs": { - "devshell": "devshell_14", + "devshell": "devshell_13", "inclusive": "inclusive_10", - "nixpkgs": "nixpkgs_51", + "nixpkgs": "nixpkgs_49", "utils": "utils_20" }, "locked": { @@ -8345,7 +8010,7 @@ "nomad_2": { "inputs": { "nix": "nix_10", - "nixpkgs": "nixpkgs_48", + "nixpkgs": "nixpkgs_46", "utils": "utils_18" }, "locked": { @@ -8365,26 +8030,11 @@ }, "nosys": { "locked": { - "lastModified": 1668010795, - "narHash": "sha256-JBDVBnos8g0toU7EhIIqQ1If5m/nyBqtHhL3sicdPwI=", + "lastModified": 1667881534, + "narHash": "sha256-FhwJ15uPLRsvaxtt/bNuqE/ykMpNAPF0upozFKhTtXM=", "owner": "divnix", "repo": "nosys", - "rev": "feade0141487801c71ff55623b421ed535dbdefa", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "nosys", - "type": "github" - } - }, - "nosys_2": { - "locked": { - "lastModified": 1668010795, - "narHash": "sha256-JBDVBnos8g0toU7EhIIqQ1If5m/nyBqtHhL3sicdPwI=", - "owner": "divnix", - "repo": "nosys", - "rev": "feade0141487801c71ff55623b421ed535dbdefa", + "rev": "2d0d5207f6a230e9d0f660903f8db9807b54814f", "type": "github" }, "original": { @@ -8413,12 +8063,12 @@ "ogmios-nixos": { "inputs": { "CHaP": "CHaP_3", - "blank": "blank_6", + "blank": "blank_5", "cardano-configurations": "cardano-configurations_2", "cardano-node": [ "cardano-node" ], - "flake-compat": "flake-compat_14", + "flake-compat": "flake-compat_13", "haskell-nix": [ "haskell-nix" ], @@ -8598,222 +8248,52 @@ "repo": "ops-lib", "type": "github" } - }, - "ops-lib_2": { - "flake": false, - "locked": { - "lastModified": 1649848729, - "narHash": "sha256-5zN9gpn+DwdB67bcHfDD8zgMnR0EaJd2JVNMyL6J1N0=", - "owner": "input-output-hk", - "repo": "ops-lib", - "rev": "517c747f4d5d56e626f62618803bfccb09f14019", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "ops-lib", - "type": "github" - } - }, - "ops-lib_3": { - "flake": false, - "locked": { - "lastModified": 1649848729, - "narHash": "sha256-5zN9gpn+DwdB67bcHfDD8zgMnR0EaJd2JVNMyL6J1N0=", - "owner": "input-output-hk", - "repo": "ops-lib", - "rev": "517c747f4d5d56e626f62618803bfccb09f14019", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "ops-lib", - "type": "github" - } - }, - "ops-lib_4": { - "flake": false, - "locked": { - "lastModified": 1649848729, - "narHash": "sha256-5zN9gpn+DwdB67bcHfDD8zgMnR0EaJd2JVNMyL6J1N0=", - "owner": "input-output-hk", - "repo": "ops-lib", - "rev": "517c747f4d5d56e626f62618803bfccb09f14019", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "ops-lib", - "type": "github" - } - }, - "paisano": { - "inputs": { - "nixpkgs": [ - "cardano-node", - "cardano-automation", - "tullia", - "std", - "nixpkgs" - ], - "nosys": "nosys", - "yants": [ - "cardano-node", - "cardano-automation", - "tullia", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1677437285, - "narHash": "sha256-YGfMothgUq1T9wMJYEhOSvdIiD/8gLXO1YcZA6hyIWU=", - "owner": "paisano-nix", - "repo": "core", - "rev": "5f2fc05e98e001cb1cf9535ded09e05d90cec131", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "repo": "core", - "type": "github" - } - }, - "paisano-actions": { - "inputs": { - "nixpkgs": [ - "cardano-node", - "std", - "paisano-mdbook-preprocessor", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1677306424, - "narHash": "sha256-H9/dI2rGEbKo4KEisqbRPHFG2ajF8Tm111NPdKGIf28=", - "owner": "paisano-nix", - "repo": "actions", - "rev": "65ec4e080b3480167fc1a748c89a05901eea9a9b", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "repo": "actions", - "type": "github" - } - }, - "paisano-mdbook-preprocessor": { - "inputs": { - "crane": "crane", - "fenix": "fenix", - "nixpkgs": [ - "cardano-node", - "std", - "nixpkgs" - ], - "paisano-actions": "paisano-actions", - "std": [ - "cardano-node", - "std" - ] - }, - "locked": { - "lastModified": 1680654400, - "narHash": "sha256-Qdpio+ldhUK3zfl22Mhf8HUULdUOJXDWDdO7MIK69OU=", - "owner": "paisano-nix", - "repo": "mdbook-paisano-preprocessor", - "rev": "11a8fc47f574f194a7ae7b8b98001f6143ba4cf1", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "repo": "mdbook-paisano-preprocessor", - "type": "github" - } - }, - "paisano-tui": { - "inputs": { - "nixpkgs": [ - "cardano-node", - "cardano-automation", - "tullia", - "std", - "blank" - ], - "std": [ - "cardano-node", - "cardano-automation", - "tullia", - "std" - ] - }, + }, + "ops-lib_2": { + "flake": false, "locked": { - "lastModified": 1677533603, - "narHash": "sha256-Nq1dH/qn7Wg/Tj1+id+ZM3o0fzqonW73jAgY3mCp35M=", - "owner": "paisano-nix", - "repo": "tui", - "rev": "802958d123b0a5437441be0cab1dee487b0ed3eb", + "lastModified": 1649848729, + "narHash": "sha256-5zN9gpn+DwdB67bcHfDD8zgMnR0EaJd2JVNMyL6J1N0=", + "owner": "input-output-hk", + "repo": "ops-lib", + "rev": "517c747f4d5d56e626f62618803bfccb09f14019", "type": "github" }, "original": { - "owner": "paisano-nix", - "repo": "tui", + "owner": "input-output-hk", + "repo": "ops-lib", "type": "github" } }, - "paisano-tui_2": { - "inputs": { - "nixpkgs": [ - "cardano-node", - "std", - "blank" - ], - "std": [ - "cardano-node", - "std" - ] - }, + "ops-lib_3": { + "flake": false, "locked": { - "lastModified": 1681847764, - "narHash": "sha256-mdd7PJW1BZvxy0cIKsPfAO+ohVl/V7heE5ZTAHzTdv8=", - "owner": "paisano-nix", - "repo": "tui", - "rev": "3096bad91cae73ab8ab3367d31f8a143d248a244", + "lastModified": 1649848729, + "narHash": "sha256-5zN9gpn+DwdB67bcHfDD8zgMnR0EaJd2JVNMyL6J1N0=", + "owner": "input-output-hk", + "repo": "ops-lib", + "rev": "517c747f4d5d56e626f62618803bfccb09f14019", "type": "github" }, "original": { - "owner": "paisano-nix", - "ref": "0.1.1", - "repo": "tui", + "owner": "input-output-hk", + "repo": "ops-lib", "type": "github" } }, - "paisano_2": { - "inputs": { - "nixpkgs": [ - "cardano-node", - "std", - "nixpkgs" - ], - "nosys": "nosys_2", - "yants": [ - "cardano-node", - "std", - "yants" - ] - }, + "ops-lib_4": { + "flake": false, "locked": { - "lastModified": 1686862844, - "narHash": "sha256-m8l/HpRBJnZ3c0F1u0IyQ3nYGWE0R9V5kfORuqZPzgk=", - "owner": "paisano-nix", - "repo": "core", - "rev": "6674b3d3577212c1eeecd30d62d52edbd000e726", + "lastModified": 1649848729, + "narHash": "sha256-5zN9gpn+DwdB67bcHfDD8zgMnR0EaJd2JVNMyL6J1N0=", + "owner": "input-output-hk", + "repo": "ops-lib", + "rev": "517c747f4d5d56e626f62618803bfccb09f14019", "type": "github" }, "original": { - "owner": "paisano-nix", - "ref": "0.1.1", - "repo": "core", + "owner": "input-output-hk", + "repo": "ops-lib", "type": "github" } }, @@ -8823,7 +8303,7 @@ "cardano-node": [ "cardano-node" ], - "flake-compat": "flake-compat_15", + "flake-compat": "flake-compat_14", "hackage-nix": [ "hackage-nix" ], @@ -8854,7 +8334,7 @@ }, "poetry2nix": { "inputs": { - "flake-utils": "flake-utils_19", + "flake-utils": "flake-utils_17", "nixpkgs": [ "db-sync", "cardano-world", @@ -8880,8 +8360,8 @@ }, "pre-commit-hooks": { "inputs": { - "flake-utils": "flake-utils_25", - "nixpkgs": "nixpkgs_57" + "flake-utils": "flake-utils_23", + "nixpkgs": "nixpkgs_55" }, "locked": { "lastModified": 1639823344, @@ -8900,9 +8380,9 @@ "ragenix": { "inputs": { "agenix": "agenix_3", - "flake-utils": "flake-utils_10", - "nixpkgs": "nixpkgs_23", - "rust-overlay": "rust-overlay_2" + "flake-utils": "flake-utils_8", + "nixpkgs": "nixpkgs_21", + "rust-overlay": "rust-overlay" }, "locked": { "lastModified": 1641119695, @@ -8921,9 +8401,9 @@ "ragenix_2": { "inputs": { "agenix": "agenix_4", - "flake-utils": "flake-utils_12", - "nixpkgs": "nixpkgs_26", - "rust-overlay": "rust-overlay_3" + "flake-utils": "flake-utils_10", + "nixpkgs": "nixpkgs_24", + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1645147603, @@ -8942,9 +8422,9 @@ "ragenix_3": { "inputs": { "agenix": "agenix_5", - "flake-utils": "flake-utils_14", - "nixpkgs": "nixpkgs_35", - "rust-overlay": "rust-overlay_4" + "flake-utils": "flake-utils_12", + "nixpkgs": "nixpkgs_33", + "rust-overlay": "rust-overlay_3" }, "locked": { "lastModified": 1641119695, @@ -8963,9 +8443,9 @@ "ragenix_4": { "inputs": { "agenix": "agenix_7", - "flake-utils": "flake-utils_21", - "nixpkgs": "nixpkgs_52", - "rust-overlay": "rust-overlay_5" + "flake-utils": "flake-utils_19", + "nixpkgs": "nixpkgs_50", + "rust-overlay": "rust-overlay_4" }, "locked": { "lastModified": 1641119695, @@ -8984,9 +8464,9 @@ "ragenix_5": { "inputs": { "agenix": "agenix_8", - "flake-utils": "flake-utils_23", - "nixpkgs": "nixpkgs_55", - "rust-overlay": "rust-overlay_6" + "flake-utils": "flake-utils_21", + "nixpkgs": "nixpkgs_53", + "rust-overlay": "rust-overlay_5" }, "locked": { "lastModified": 1645147603, @@ -9010,7 +8490,7 @@ "cardano-node": "cardano-node", "db-sync": "db-sync", "easy-purescript-nix": "easy-purescript-nix", - "flake-compat": "flake-compat_12", + "flake-compat": "flake-compat_11", "hackage-nix": "hackage-nix", "haskell-nix": "haskell-nix_3", "hercules-ci-effects": "hercules-ci-effects", @@ -9027,23 +8507,6 @@ } }, "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1677221702, - "narHash": "sha256-1M+58rC4eTCWNmmX0hQVZP20t3tfYNunl9D/PrGUyGE=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "f5401f620699b26ed9d47a1d2e838143a18dbe3b", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-analyzer-src_2": { "flake": false, "locked": { "lastModified": 1645024434, @@ -9060,7 +8523,7 @@ "type": "github" } }, - "rust-analyzer-src_3": { + "rust-analyzer-src_2": { "flake": false, "locked": { "lastModified": 1649178056, @@ -9077,7 +8540,7 @@ "type": "github" } }, - "rust-analyzer-src_4": { + "rust-analyzer-src_3": { "flake": false, "locked": { "lastModified": 1645024434, @@ -9094,7 +8557,7 @@ "type": "github" } }, - "rust-analyzer-src_5": { + "rust-analyzer-src_4": { "flake": false, "locked": { "lastModified": 1660579619, @@ -9111,7 +8574,7 @@ "type": "github" } }, - "rust-analyzer-src_6": { + "rust-analyzer-src_5": { "flake": false, "locked": { "lastModified": 1645024434, @@ -9128,7 +8591,7 @@ "type": "github" } }, - "rust-analyzer-src_7": { + "rust-analyzer-src_6": { "flake": false, "locked": { "lastModified": 1649178056, @@ -9146,37 +8609,6 @@ } }, "rust-overlay": { - "inputs": { - "flake-utils": [ - "cardano-node", - "std", - "paisano-mdbook-preprocessor", - "crane", - "flake-utils" - ], - "nixpkgs": [ - "cardano-node", - "std", - "paisano-mdbook-preprocessor", - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1675391458, - "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "flake-utils": [ "db-sync", @@ -9211,7 +8643,7 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_2": { "inputs": { "flake-utils": [ "db-sync", @@ -9244,7 +8676,7 @@ "type": "github" } }, - "rust-overlay_4": { + "rust-overlay_3": { "inputs": { "flake-utils": [ "db-sync", @@ -9275,7 +8707,7 @@ "type": "github" } }, - "rust-overlay_5": { + "rust-overlay_4": { "inputs": { "flake-utils": [ "db-sync", @@ -9308,7 +8740,7 @@ "type": "github" } }, - "rust-overlay_6": { + "rust-overlay_5": { "inputs": { "flake-utils": [ "db-sync", @@ -9410,11 +8842,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1690762200, - "narHash": "sha256-UB02izyJREbLmS7+pyJvKF3mDePI6fTasqtg3fltJA0=", + "lastModified": 1685491814, + "narHash": "sha256-OQX+h5hcDptW6HVrYkBL7dtgqiaiz9zn6iMYv+0CDzc=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "c91713e7ca38abba6a90686df895acda53fd5038", + "rev": "678b4297ccef8bbcd83294e47e1a9042034bdbd0", "type": "github" }, "original": { @@ -9523,7 +8955,6 @@ "inputs": { "arion": [ "cardano-node", - "cardano-automation", "tullia", "std", "blank" @@ -9531,35 +8962,32 @@ "blank": "blank", "devshell": "devshell", "dmerge": "dmerge", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_5", "incl": "incl", "makes": [ "cardano-node", - "cardano-automation", "tullia", "std", "blank" ], "microvm": [ "cardano-node", - "cardano-automation", "tullia", "std", "blank" ], "n2c": "n2c", "nixago": "nixago", - "nixpkgs": "nixpkgs_4", - "paisano": "paisano", - "paisano-tui": "paisano-tui", + "nixpkgs": "nixpkgs_8", + "nosys": "nosys", "yants": "yants" }, "locked": { - "lastModified": 1677533652, - "narHash": "sha256-H37dcuWAGZs6Yl9mewMNVcmSaUXR90/bABYFLT/nwhk=", + "lastModified": 1674526466, + "narHash": "sha256-tMTaS0bqLx6VJ+K+ZT6xqsXNpzvSXJTmogkraBGzymg=", "owner": "divnix", "repo": "std", - "rev": "490542f624412662e0411d8cb5a9af988ef56633", + "rev": "516387e3d8d059b50e742a2ff1909ed3c8f82826", "type": "github" }, "original": { @@ -9570,58 +8998,13 @@ }, "std_2": { "inputs": { - "arion": [ - "cardano-node", - "std", - "blank" - ], - "blank": "blank_2", - "devshell": "devshell_2", + "devshell": "devshell_7", "dmerge": "dmerge_2", - "flake-utils": "flake-utils_6", - "haumea": "haumea", - "incl": "incl_2", - "makes": [ - "cardano-node", - "std", - "blank" - ], - "microvm": [ - "cardano-node", - "std", - "blank" - ], - "n2c": "n2c_2", - "nixago": "nixago_2", - "nixpkgs": "nixpkgs_9", - "paisano": "paisano_2", - "paisano-mdbook-preprocessor": "paisano-mdbook-preprocessor", - "paisano-tui": "paisano-tui_2", - "yants": "yants_2" - }, - "locked": { - "lastModified": 1687300684, - "narHash": "sha256-oBqbss0j+B568GoO3nF2BCoPEgPxUjxfZQGynW6mhEk=", - "owner": "divnix", - "repo": "std", - "rev": "80e5792eae98353a97ab1e85f3fba2784e4a3690", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "std", - "type": "github" - } - }, - "std_3": { - "inputs": { - "devshell": "devshell_8", - "dmerge": "dmerge_3", - "flake-utils": "flake-utils_15", + "flake-utils": "flake-utils_13", "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor", - "nixago": "nixago_3", - "nixpkgs": "nixpkgs_36", - "yants": "yants_4" + "nixago": "nixago_2", + "nixpkgs": "nixpkgs_34", + "yants": "yants_3" }, "locked": { "lastModified": 1661370377, @@ -9637,15 +9020,15 @@ "type": "github" } }, - "std_4": { + "std_3": { "inputs": { - "devshell": "devshell_16", - "dmerge": "dmerge_4", - "flake-utils": "flake-utils_31", + "devshell": "devshell_15", + "dmerge": "dmerge_3", + "flake-utils": "flake-utils_29", "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor_2", - "nixago": "nixago_4", - "nixpkgs": "nixpkgs_66", - "yants": "yants_6" + "nixago": "nixago_3", + "nixpkgs": "nixpkgs_64", + "yants": "yants_5" }, "locked": { "lastModified": 1661367957, @@ -9661,11 +9044,11 @@ "type": "github" } }, - "std_5": { + "std_4": { "inputs": { - "devshell": "devshell_17", - "nixpkgs": "nixpkgs_69", - "yants": "yants_7" + "devshell": "devshell_16", + "nixpkgs": "nixpkgs_67", + "yants": "yants_6" }, "locked": { "lastModified": 1652784712, @@ -9861,25 +9244,10 @@ "type": "github" } }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tailwind-haskell": { "inputs": { - "flake-utils": "flake-utils_26", - "nixpkgs": "nixpkgs_60" + "flake-utils": "flake-utils_24", + "nixpkgs": "nixpkgs_58" }, "locked": { "lastModified": 1654211622, @@ -9900,7 +9268,7 @@ "inputs": { "bats-assert": "bats-assert", "bats-support": "bats-support", - "flake-utils": "flake-utils_11", + "flake-utils": "flake-utils_9", "nixpkgs": [ "db-sync", "cardano-world", @@ -9974,7 +9342,7 @@ "inputs": { "bats-assert": "bats-assert_2", "bats-support": "bats-support_2", - "flake-utils": "flake-utils_16", + "flake-utils": "flake-utils_14", "nixpkgs": [ "db-sync", "cardano-world", @@ -10001,7 +9369,7 @@ "inputs": { "bats-assert": "bats-assert_3", "bats-support": "bats-support_3", - "flake-utils": "flake-utils_22", + "flake-utils": "flake-utils_20", "nixpkgs": [ "db-sync", "cardano-world", @@ -10028,20 +9396,16 @@ "tullia": { "inputs": { "nix-nomad": "nix-nomad", - "nix2container": "nix2container", - "nixpkgs": [ - "cardano-node", - "cardano-automation", - "nixpkgs" - ], + "nix2container": "nix2container_2", + "nixpkgs": "nixpkgs_7", "std": "std" }, "locked": { - "lastModified": 1684859161, - "narHash": "sha256-wOKutImA7CRL0rN+Ng80E72fD5FkVub7LLP2k9NICpg=", + "lastModified": 1675695930, + "narHash": "sha256-B7rEZ/DBUMlK1AcJ9ajnAPPxqXY6zW2SBX+51bZV0Ac=", "owner": "input-output-hk", "repo": "tullia", - "rev": "2964cff1a16eefe301bdddb508c49d94d04603d6", + "rev": "621365f2c725608f381b3ad5b57afef389fd4c31", "type": "github" }, "original": { @@ -10053,8 +9417,8 @@ "tullia_2": { "inputs": { "nix2container": "nix2container_3", - "nixpkgs": "nixpkgs_68", - "std": "std_5" + "nixpkgs": "nixpkgs_66", + "std": "std_4" }, "locked": { "lastModified": 1657811465, @@ -10453,7 +9817,6 @@ "inputs": { "nixpkgs": [ "cardano-node", - "cardano-automation", "tullia", "std", "nixpkgs" @@ -10475,30 +9838,7 @@ }, "yants_2": { "inputs": { - "nixpkgs": [ - "cardano-node", - "std", - "haumea", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1686863218, - "narHash": "sha256-kooxYm3/3ornWtVBNHM3Zh020gACUyFX2G0VQXnB+mk=", - "owner": "divnix", - "repo": "yants", - "rev": "8f0da0dba57149676aa4817ec0c880fbde7a648d", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "yants", - "type": "github" - } - }, - "yants_3": { - "inputs": { - "nixpkgs": "nixpkgs_27" + "nixpkgs": "nixpkgs_25" }, "locked": { "lastModified": 1645126146, @@ -10514,7 +9854,7 @@ "type": "github" } }, - "yants_4": { + "yants_3": { "inputs": { "nixpkgs": [ "db-sync", @@ -10538,9 +9878,9 @@ "type": "github" } }, - "yants_5": { + "yants_4": { "inputs": { - "nixpkgs": "nixpkgs_62" + "nixpkgs": "nixpkgs_60" }, "locked": { "lastModified": 1645126146, @@ -10556,7 +9896,7 @@ "type": "github" } }, - "yants_6": { + "yants_5": { "inputs": { "nixpkgs": [ "db-sync", @@ -10579,7 +9919,7 @@ "type": "github" } }, - "yants_7": { + "yants_6": { "inputs": { "nixpkgs": [ "db-sync", diff --git a/flake.nix b/flake.nix index a97cd65676..50328367e2 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,7 @@ flake = false; }; - cardano-node.url = "github:input-output-hk/cardano-node/8.5.0-pre"; + cardano-node.url = "github:input-output-hk/cardano-node/8.1.1"; ogmios-nixos = { url = "github:mlabs-haskell/ogmios-nixos/78e829e9ebd50c5891024dcd1004c2ac51facd80"; @@ -332,8 +332,8 @@ # it (i.e. `nix develop`) default = (psProjectFor (nixpkgsFor system)).devShell; - # This can be used with `nix develop .#hsDevShell - hsDevShell = self.hsFlake.${system}.devShell; + # This can be used with `nix develop .#devPlutipServer` to work with `./plutip-server` + devPlutipServer = ((plutipServerFor system).flake { }).devShell; }); packages = perSystem (system: diff --git a/nix/runtime.nix b/nix/runtime.nix index c85bcc0e28..6920d9c83c 100644 --- a/nix/runtime.nix +++ b/nix/runtime.nix @@ -15,9 +15,6 @@ rec { # to change the values after calling `buildCtlRuntime` node = { port = 3001; - # the version of the node to use, corresponds to the image version tag, - # i.e. `"inputoutput/cardano-node:${tag}"` - tag = "8.1.1"; }; ogmios = { port = 1337; }; postgres = { @@ -98,10 +95,9 @@ rec { nodeSocketPath = "/ipc/node.socket"; bindPort = port: "${toString port}:${toString port}"; defaultServices = with config; { - # TODO make this use `cardano-node` from flake inputs cardano-node = { service = { - image = "inputoutput/cardano-node:${node.tag}"; + useHostStore = true; ports = [ (bindPort node.port) ]; volumes = [ "${config.cardano-configurations}/network/${config.network.name}/cardano-node:/config" @@ -110,15 +106,15 @@ rec { "${nodeIpcVol}:/ipc" ]; command = [ - "run" - "--config" - "/config/config.json" - "--database-path" - "/data/db" - "--socket-path" - "${nodeSocketPath}" - "--topology" - "/config/topology.json" + "${pkgs.bash}/bin/sh" + "-c" + '' + ${inputs.cardano-node.packages."${pkgs.system}".cardano-node}/bin/cardano-node run \ + --config /config/config.json \ + --database-path /data/db \ + --socket-path "${nodeSocketPath}" \ + --topology /config/topology.json + '' ]; }; }; @@ -152,7 +148,6 @@ rec { ); }; }; - # TODO make this use `ogmios` from flake inputs ogmios = { service = { useHostStore = true; diff --git a/plutip-server/cabal.project b/plutip-server/cabal.project index 8f005a3662..c1a038651d 100644 --- a/plutip-server/cabal.project +++ b/plutip-server/cabal.project @@ -12,10 +12,6 @@ repository cardano-haskell-packages -- Align index-states with cardano-wallet index-state: 2023-06-06T00:00:00Z -index-state: - , hackage.haskell.org 2023-06-06T00:00:00Z - , cardano-haskell-packages 2023-06-05T06:39:32Z - packages: ./. tests: true @@ -111,9 +107,8 @@ source-repository-package --sha256: 04q58c82wy6x9nkwqbvcxbv6s61fx08h5kf62sb511aqp08id4bb subdir: generated - source-repository-package type: git location: https://github.com/mlabs-haskell/plutip.git - tag: d060231ebf20383cbdc854a4664fd66a5815aedc - --sha256: 0yydxf1f0mdx2ypnas987bnr7fmz0l1255rid5l9f4ajagd4bfry + tag: 1bf0b547cd3689c727586abb8385c008fb2a3d1c + --sha256: sha256-7ZhZUDhlFvV2us4G27iAk6lHezKS/4WA07NQn88VtQU= diff --git a/plutip-server/plutip-server.cabal b/plutip-server/plutip-server.cabal index da121dc1b2..495825b762 100644 --- a/plutip-server/plutip-server.cabal +++ b/plutip-server/plutip-server.cabal @@ -87,6 +87,7 @@ executable plutip-server , wai-cors , wai-logger , warp + , wai-extra other-modules: Api diff --git a/plutip-server/src/Api.hs b/plutip-server/src/Api.hs index b3c6fcc938..f3de22776b 100644 --- a/plutip-server/src/Api.hs +++ b/plutip-server/src/Api.hs @@ -7,6 +7,7 @@ import Api.Handlers ( import Control.Monad.IO.Class (liftIO) import Control.Monad.Reader (runReaderT) import Data.Kind (Type) +import Network.Wai.Middleware.RequestLogger as Logger import Network.Wai.Middleware.Cors qualified as Cors import Servant ( Application, @@ -42,7 +43,7 @@ type Api = :> Post '[JSON] StopClusterResponse app :: Env -> Application -app = Cors.cors (const $ Just policy) . serve api . appServer +app = Logger.logStdout . Cors.cors (const $ Just policy) . serve api . appServer where policy :: Cors.CorsResourcePolicy policy = From 5c97dcf8cca2e7220fcba7317aaf8ee398191bd3 Mon Sep 17 00:00:00 2001 From: Drazen Popovic Date: Tue, 12 Dec 2023 11:42:21 +0100 Subject: [PATCH 77/85] Uses Kupo from flake inputs and fixes cardano-node --- nix/runtime.nix | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/nix/runtime.nix b/nix/runtime.nix index 6920d9c83c..c03e5bc572 100644 --- a/nix/runtime.nix +++ b/nix/runtime.nix @@ -96,6 +96,12 @@ rec { bindPort = port: "${toString port}:${toString port}"; defaultServices = with config; { cardano-node = { + image.contents = [ + # Note: Required, fixes issue with "Failed to start all.. subscriptions". + # Creates the /etc/services file. + pkgs.iana-etc + pkgs.coreutils + ]; service = { useHostStore = true; ports = [ (bindPort node.port) ]; @@ -109,19 +115,18 @@ rec { "${pkgs.bash}/bin/sh" "-c" '' - ${inputs.cardano-node.packages."${pkgs.system}".cardano-node}/bin/cardano-node run \ - --config /config/config.json \ - --database-path /data/db \ - --socket-path "${nodeSocketPath}" \ - --topology /config/topology.json + ${inputs.cardano-node.packages."${pkgs.system}".cardano-node}/bin/cardano-node run \ + --config /config/config.json \ + --database-path /data/db \ + --socket-path "${nodeSocketPath}" \ + --topology /config/topology.json '' ]; }; }; - # TODO make this use `kupo` from flake inputs kupo = { service = { - image = "cardanosolutions/kupo:${kupo.tag}"; + useHostStore = true; ports = [ (bindPort kupo.port) ]; volumes = [ "${config.cardano-configurations}/network/${config.network.name}:/config" @@ -129,23 +134,18 @@ rec { "${kupoDbVol}:/kupo-db" ]; command = [ - "--node-config" - "/config/cardano-node/config.json" - "--node-socket" - "${nodeSocketPath}" - "--since" - "${kupo.since}" - "--match" - "${"${kupo.match}"}" - "--host" - "0.0.0.0" - "--workdir" - "kupo-db" - ] ++ ( - pkgs.lib.lists.optional kupo.pruneUtxo "--prune-utxo" - ) ++ ( - pkgs.lib.lists.optional kupo.deferDbIndexes "--defer-db-indexes" - ); + "${pkgs.bash}/bin/sh" + "-c" + '' + ${inputs.kupo-nixos.packages.${pkgs.system}.kupo}/bin/kupo \ + --node-config /config/cardano-node/config.json \ + --node-socket "${nodeSocketPath}" \ + --since "${kupo.since}" \ + --match "${kupo.match}" \ + --host "0.0.0.0" \ + --workdir kupo-db ${pkgs.lib.strings.optionalString kupo.pruneUtxo "--prune-utxo"} ${pkgs.lib.strings.optionalString kupo.deferDbIndexes "--defer-db-indexes"} + '' + ]; }; }; ogmios = { From 774c005ae9ebd228e9b6c31a636b3470d11064dd Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Wed, 13 Dec 2023 22:53:08 +0400 Subject: [PATCH 78/85] Remove duplicate logging from plutip --- plutip-server/plutip-server.cabal | 1 - plutip-server/src/Api.hs | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/plutip-server/plutip-server.cabal b/plutip-server/plutip-server.cabal index 495825b762..da121dc1b2 100644 --- a/plutip-server/plutip-server.cabal +++ b/plutip-server/plutip-server.cabal @@ -87,7 +87,6 @@ executable plutip-server , wai-cors , wai-logger , warp - , wai-extra other-modules: Api diff --git a/plutip-server/src/Api.hs b/plutip-server/src/Api.hs index f3de22776b..b3c6fcc938 100644 --- a/plutip-server/src/Api.hs +++ b/plutip-server/src/Api.hs @@ -7,7 +7,6 @@ import Api.Handlers ( import Control.Monad.IO.Class (liftIO) import Control.Monad.Reader (runReaderT) import Data.Kind (Type) -import Network.Wai.Middleware.RequestLogger as Logger import Network.Wai.Middleware.Cors qualified as Cors import Servant ( Application, @@ -43,7 +42,7 @@ type Api = :> Post '[JSON] StopClusterResponse app :: Env -> Application -app = Logger.logStdout . Cors.cors (const $ Just policy) . serve api . appServer +app = Cors.cors (const $ Just policy) . serve api . appServer where policy :: Cors.CorsResourcePolicy policy = From 7f43c004f2e64d481d4bf891f860ce8b6bb68480 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Wed, 13 Dec 2023 23:17:30 +0400 Subject: [PATCH 79/85] Update the template --- templates/ctl-scaffold/flake.lock | 13288 +++++++------------- templates/ctl-scaffold/flake.nix | 2 +- templates/ctl-scaffold/packages.dhall | 2 +- templates/ctl-scaffold/spago-packages.nix | 6 +- 4 files changed, 4323 insertions(+), 8975 deletions(-) diff --git a/templates/ctl-scaffold/flake.lock b/templates/ctl-scaffold/flake.lock index 4d2832a530..e4fbc9170b 100644 --- a/templates/ctl-scaffold/flake.lock +++ b/templates/ctl-scaffold/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1678160279, - "narHash": "sha256-IKbD0uqteVoo4KRcYh/QrLQ/HQJXwgCQS2Mq7grhSdM=", + "lastModified": 1702290471, + "narHash": "sha256-uivAP05RENSzQDbDjAU3Fbq+AiDDpcNaHAzvOZM1fik=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "e20bffc8ac331810efa671a1bb49932595fa21f6", + "rev": "1ff7483a6d2670c8627de92779a2b92a989293cd", "type": "github" }, "original": { @@ -20,11 +20,11 @@ "CHaP_2": { "flake": false, "locked": { - "lastModified": 1669917887, - "narHash": "sha256-9bsEaFh2lb26dZNUL+P4/LIzkTZH5NC7n9SprKzB/2A=", + "lastModified": 1686070892, + "narHash": "sha256-0yAYqvCg2/aby4AmW0QQK9RKnU1siQczfbUC6hOU02w=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "85510200dd0dc758d72bc1ada11ff5855e5d46b7", + "rev": "596cf203a0a1ba252a083a79d384325000faeb49", "type": "github" }, "original": { @@ -37,11 +37,11 @@ "CHaP_3": { "flake": false, "locked": { - "lastModified": 1666726035, - "narHash": "sha256-EBodp9DJb8Z+aVbuezVwLJ9Q9XIJUXFd/n2skay3FeU=", + "lastModified": 1695160702, + "narHash": "sha256-+Mfc6eGA1ZwQ/ZjKzMoMWkHzd+sgR1JbxY0i849HjEU=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "b074321c4c8cbf2c3789436ab11eaa43e1c441a7", + "rev": "9932690af3713ef034c928850252eb1b88450ee6", "type": "github" }, "original": { @@ -54,28 +54,11 @@ "CHaP_4": { "flake": false, "locked": { - "lastModified": 1666726035, - "narHash": "sha256-EBodp9DJb8Z+aVbuezVwLJ9Q9XIJUXFd/n2skay3FeU=", + "lastModified": 1694601145, + "narHash": "sha256-p7ZxorrOvoow6N+JKvfrCiRYFtUSPiEMgt8MR+rcTT4=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "b074321c4c8cbf2c3789436ab11eaa43e1c441a7", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "cardano-haskell-packages", - "rev": "b074321c4c8cbf2c3789436ab11eaa43e1c441a7", - "type": "github" - } - }, - "CHaP_5": { - "flake": false, - "locked": { - "lastModified": 1672829743, - "narHash": "sha256-lM3s0UQDxfipHbEFhmW2d5QcmKIPVsLT2ai6RnHAP84=", - "owner": "input-output-hk", - "repo": "cardano-haskell-packages", - "rev": "551630b2c90ed9107079ab402534ed3b56db6f04", + "rev": "e8298604717dbaa311c1e42e021b571670f4b039", "type": "github" }, "original": { @@ -101,134 +84,6 @@ "type": "github" } }, - "HTTP_10": { - "flake": false, - "locked": { - "lastModified": 1451647621, - "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", - "owner": "phadej", - "repo": "HTTP", - "rev": "9bc0996d412fef1787449d841277ef663ad9a915", - "type": "github" - }, - "original": { - "owner": "phadej", - "repo": "HTTP", - "type": "github" - } - }, - "HTTP_11": { - "flake": false, - "locked": { - "lastModified": 1451647621, - "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", - "owner": "phadej", - "repo": "HTTP", - "rev": "9bc0996d412fef1787449d841277ef663ad9a915", - "type": "github" - }, - "original": { - "owner": "phadej", - "repo": "HTTP", - "type": "github" - } - }, - "HTTP_12": { - "flake": false, - "locked": { - "lastModified": 1451647621, - "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", - "owner": "phadej", - "repo": "HTTP", - "rev": "9bc0996d412fef1787449d841277ef663ad9a915", - "type": "github" - }, - "original": { - "owner": "phadej", - "repo": "HTTP", - "type": "github" - } - }, - "HTTP_13": { - "flake": false, - "locked": { - "lastModified": 1451647621, - "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", - "owner": "phadej", - "repo": "HTTP", - "rev": "9bc0996d412fef1787449d841277ef663ad9a915", - "type": "github" - }, - "original": { - "owner": "phadej", - "repo": "HTTP", - "type": "github" - } - }, - "HTTP_14": { - "flake": false, - "locked": { - "lastModified": 1451647621, - "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", - "owner": "phadej", - "repo": "HTTP", - "rev": "9bc0996d412fef1787449d841277ef663ad9a915", - "type": "github" - }, - "original": { - "owner": "phadej", - "repo": "HTTP", - "type": "github" - } - }, - "HTTP_15": { - "flake": false, - "locked": { - "lastModified": 1451647621, - "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", - "owner": "phadej", - "repo": "HTTP", - "rev": "9bc0996d412fef1787449d841277ef663ad9a915", - "type": "github" - }, - "original": { - "owner": "phadej", - "repo": "HTTP", - "type": "github" - } - }, - "HTTP_16": { - "flake": false, - "locked": { - "lastModified": 1451647621, - "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", - "owner": "phadej", - "repo": "HTTP", - "rev": "9bc0996d412fef1787449d841277ef663ad9a915", - "type": "github" - }, - "original": { - "owner": "phadej", - "repo": "HTTP", - "type": "github" - } - }, - "HTTP_17": { - "flake": false, - "locked": { - "lastModified": 1451647621, - "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", - "owner": "phadej", - "repo": "HTTP", - "rev": "9bc0996d412fef1787449d841277ef663ad9a915", - "type": "github" - }, - "original": { - "owner": "phadej", - "repo": "HTTP", - "type": "github" - } - }, "HTTP_2": { "flake": false, "locked": { @@ -325,41 +180,9 @@ "type": "github" } }, - "HTTP_8": { - "flake": false, - "locked": { - "lastModified": 1451647621, - "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", - "owner": "phadej", - "repo": "HTTP", - "rev": "9bc0996d412fef1787449d841277ef663ad9a915", - "type": "github" - }, - "original": { - "owner": "phadej", - "repo": "HTTP", - "type": "github" - } - }, - "HTTP_9": { - "flake": false, - "locked": { - "lastModified": 1451647621, - "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", - "owner": "phadej", - "repo": "HTTP", - "rev": "9bc0996d412fef1787449d841277ef663ad9a915", - "type": "github" - }, - "original": { - "owner": "phadej", - "repo": "HTTP", - "type": "github" - } - }, "agenix": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1641576265, @@ -377,8 +200,8 @@ }, "agenix-cli": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3" + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1641404293, @@ -396,8 +219,8 @@ }, "agenix-cli_2": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_5" + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1641404293, @@ -415,8 +238,8 @@ }, "agenix-cli_3": { "inputs": { - "flake-utils": "flake-utils_13", - "nixpkgs": "nixpkgs_34" + "flake-utils": "flake-utils_18", + "nixpkgs": "nixpkgs_41" }, "locked": { "lastModified": 1641404293, @@ -434,7 +257,7 @@ }, "agenix_2": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1641576265, @@ -530,7 +353,7 @@ }, "agenix_6": { "inputs": { - "nixpkgs": "nixpkgs_33" + "nixpkgs": "nixpkgs_40" }, "locked": { "lastModified": 1641576265, @@ -600,7 +423,7 @@ "alejandra": { "inputs": { "flakeCompat": "flakeCompat", - "nixpkgs": "nixpkgs_28" + "nixpkgs": "nixpkgs_35" }, "locked": { "lastModified": 1646360966, @@ -716,24 +539,24 @@ "inputs": { "agenix": "agenix", "agenix-cli": "agenix-cli", - "blank": "blank", + "blank": "blank_2", "capsules": "capsules", "data-merge": "data-merge", "deploy": "deploy_2", "fenix": "fenix_4", - "hydra": "hydra_2", - "n2c": "n2c", - "nix": "nix_4", - "nixpkgs": "nixpkgs_22", + "hydra": "hydra_3", + "n2c": "n2c_2", + "nix": "nix_5", + "nixpkgs": "nixpkgs_29", "nixpkgs-docker": "nixpkgs-docker", - "nixpkgs-unstable": "nixpkgs-unstable_2", + "nixpkgs-unstable": "nixpkgs-unstable_3", "nomad-driver-nix": "nomad-driver-nix_2", "nomad-follower": "nomad-follower_2", - "ops-lib": "ops-lib_2", + "ops-lib": "ops-lib_3", "ragenix": "ragenix_3", - "std": "std", + "std": "std_2", "terranix": "terranix_2", - "utils": "utils_10" + "utils": "utils_12" }, "locked": { "lastModified": 1661790449, @@ -819,20 +642,20 @@ "inputs": { "agenix": "agenix_2", "agenix-cli": "agenix-cli_2", - "blank": "blank_2", + "blank": "blank_3", "deploy": "deploy", "fenix": "fenix_2", - "hydra": "hydra", - "nix": "nix", - "nixpkgs": "nixpkgs_8", - "nixpkgs-unstable": "nixpkgs-unstable", + "hydra": "hydra_2", + "nix": "nix_2", + "nixpkgs": "nixpkgs_15", + "nixpkgs-unstable": "nixpkgs-unstable_2", "nomad": "nomad", "nomad-driver-nix": "nomad-driver-nix", "nomad-follower": "nomad-follower", - "ops-lib": "ops-lib", + "ops-lib": "ops-lib_2", "ragenix": "ragenix", "terranix": "terranix", - "utils": "utils_5", + "utils": "utils_7", "vulnix": "vulnix" }, "locked": { @@ -853,20 +676,20 @@ "inputs": { "agenix": "agenix_6", "agenix-cli": "agenix-cli_3", - "blank": "blank_3", + "blank": "blank_4", "deploy": "deploy_3", "fenix": "fenix_6", - "hydra": "hydra_3", - "nix": "nix_8", - "nixpkgs": "nixpkgs_37", - "nixpkgs-unstable": "nixpkgs-unstable_3", + "hydra": "hydra_4", + "nix": "nix_9", + "nixpkgs": "nixpkgs_44", + "nixpkgs-unstable": "nixpkgs-unstable_4", "nomad": "nomad_2", "nomad-driver-nix": "nomad-driver-nix_3", "nomad-follower": "nomad-follower_3", - "ops-lib": "ops-lib_3", + "ops-lib": "ops-lib_4", "ragenix": "ragenix_4", "terranix": "terranix_3", - "utils": "utils_19", + "utils": "utils_21", "vulnix": "vulnix_2" }, "locked": { @@ -958,52 +781,56 @@ "type": "github" } }, - "blank_6": { + "blockfrost": { + "inputs": { + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "lastModified": 1693412637, + "narHash": "sha256-uA2U7ZCdWv2Rxmi10uaMNNw8tiMbgcu2nnO6NTNp3VE=", + "owner": "blockfrost", + "repo": "blockfrost-backend-ryo", + "rev": "8d455ab1f710b7bd27d2aa87c82f0c5129101647", "type": "github" }, "original": { - "owner": "divnix", - "repo": "blank", + "owner": "blockfrost", + "ref": "v1.7.0", + "repo": "blockfrost-backend-ryo", "type": "github" } }, - "blank_7": { + "blst": { + "flake": false, "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "lastModified": 1656163412, + "narHash": "sha256-xero1aTe2v4IhWIJaEDUsVDOfE77dOV5zKeHWntHogY=", + "owner": "supranational", + "repo": "blst", + "rev": "03b5124029979755c752eec45f3c29674b558446", "type": "github" }, "original": { - "owner": "divnix", - "repo": "blank", + "owner": "supranational", + "repo": "blst", + "rev": "03b5124029979755c752eec45f3c29674b558446", "type": "github" } }, - "blockfrost": { - "inputs": { - "nixpkgs": "nixpkgs" - }, + "blst_2": { + "flake": false, "locked": { - "lastModified": 1684305087, - "narHash": "sha256-8MvK2AxG3bGWkxWutsCWRk9MYxf/FdQu/DkAvemjqHM=", - "owner": "blockfrost", - "repo": "blockfrost-backend-ryo", - "rev": "113ddfc2dbea9beba3a428aa274965237f31b858", + "lastModified": 1656163412, + "narHash": "sha256-xero1aTe2v4IhWIJaEDUsVDOfE77dOV5zKeHWntHogY=", + "owner": "supranational", + "repo": "blst", + "rev": "03b5124029979755c752eec45f3c29674b558446", "type": "github" }, "original": { - "owner": "blockfrost", - "repo": "blockfrost-backend-ryo", - "rev": "113ddfc2dbea9beba3a428aa274965237f31b858", + "owner": "supranational", + "repo": "blst", + "rev": "03b5124029979755c752eec45f3c29674b558446", "type": "github" } }, @@ -1040,14 +867,14 @@ "type": "github" } }, - "cabal-32_10": { + "cabal-32_2": { "flake": false, "locked": { "lastModified": 1603716527, - "narHash": "sha256-sDbrmur9Zfp4mPKohCD8IDZfXJ0Tjxpmr2R+kg5PpSY=", + "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", "owner": "haskell", "repo": "cabal", - "rev": "94aaa8e4720081f9c75497e2735b90f6a819b08e", + "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", "type": "github" }, "original": { @@ -1057,7 +884,7 @@ "type": "github" } }, - "cabal-32_11": { + "cabal-32_3": { "flake": false, "locked": { "lastModified": 1603716527, @@ -1074,7 +901,7 @@ "type": "github" } }, - "cabal-32_12": { + "cabal-32_4": { "flake": false, "locked": { "lastModified": 1603716527, @@ -1091,14 +918,14 @@ "type": "github" } }, - "cabal-32_13": { + "cabal-32_5": { "flake": false, "locked": { "lastModified": 1603716527, - "narHash": "sha256-sDbrmur9Zfp4mPKohCD8IDZfXJ0Tjxpmr2R+kg5PpSY=", + "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", "owner": "haskell", "repo": "cabal", - "rev": "94aaa8e4720081f9c75497e2735b90f6a819b08e", + "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", "type": "github" }, "original": { @@ -1108,14 +935,14 @@ "type": "github" } }, - "cabal-32_14": { + "cabal-32_6": { "flake": false, "locked": { "lastModified": 1603716527, - "narHash": "sha256-sDbrmur9Zfp4mPKohCD8IDZfXJ0Tjxpmr2R+kg5PpSY=", + "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", "owner": "haskell", "repo": "cabal", - "rev": "94aaa8e4720081f9c75497e2735b90f6a819b08e", + "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", "type": "github" }, "original": { @@ -1125,14 +952,14 @@ "type": "github" } }, - "cabal-32_15": { + "cabal-32_7": { "flake": false, "locked": { "lastModified": 1603716527, - "narHash": "sha256-sDbrmur9Zfp4mPKohCD8IDZfXJ0Tjxpmr2R+kg5PpSY=", + "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", "owner": "haskell", "repo": "cabal", - "rev": "94aaa8e4720081f9c75497e2735b90f6a819b08e", + "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", "type": "github" }, "original": { @@ -1142,9704 +969,5836 @@ "type": "github" } }, - "cabal-32_16": { + "cabal-34": { "flake": false, "locked": { - "lastModified": 1603716527, - "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", + "lastModified": 1645834128, + "narHash": "sha256-wG3d+dOt14z8+ydz4SL7pwGfe7SiimxcD/LOuPCV6xM=", "owner": "haskell", "repo": "cabal", - "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", + "rev": "5ff598c67f53f7c4f48e31d722ba37172230c462", "type": "github" }, "original": { "owner": "haskell", - "ref": "3.2", + "ref": "3.4", "repo": "cabal", "type": "github" } }, - "cabal-32_17": { + "cabal-34_2": { "flake": false, "locked": { - "lastModified": 1603716527, - "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", + "lastModified": 1640353650, + "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=", "owner": "haskell", "repo": "cabal", - "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", + "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd", "type": "github" }, "original": { "owner": "haskell", - "ref": "3.2", + "ref": "3.4", "repo": "cabal", "type": "github" } }, - "cabal-32_2": { + "cabal-34_3": { "flake": false, "locked": { - "lastModified": 1603716527, - "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", + "lastModified": 1640353650, + "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=", "owner": "haskell", "repo": "cabal", - "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", + "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd", "type": "github" }, "original": { "owner": "haskell", - "ref": "3.2", + "ref": "3.4", "repo": "cabal", "type": "github" } }, - "cabal-32_3": { + "cabal-34_4": { "flake": false, "locked": { - "lastModified": 1603716527, - "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", + "lastModified": 1640353650, + "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=", "owner": "haskell", "repo": "cabal", - "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", + "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd", "type": "github" }, "original": { "owner": "haskell", - "ref": "3.2", + "ref": "3.4", "repo": "cabal", "type": "github" } }, - "cabal-32_4": { + "cabal-34_5": { "flake": false, "locked": { - "lastModified": 1603716527, - "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", + "lastModified": 1640353650, + "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=", "owner": "haskell", "repo": "cabal", - "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", + "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd", "type": "github" }, "original": { "owner": "haskell", - "ref": "3.2", + "ref": "3.4", "repo": "cabal", "type": "github" } }, - "cabal-32_5": { + "cabal-34_6": { "flake": false, "locked": { - "lastModified": 1603716527, - "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", + "lastModified": 1645834128, + "narHash": "sha256-wG3d+dOt14z8+ydz4SL7pwGfe7SiimxcD/LOuPCV6xM=", "owner": "haskell", "repo": "cabal", - "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", + "rev": "5ff598c67f53f7c4f48e31d722ba37172230c462", "type": "github" }, "original": { "owner": "haskell", - "ref": "3.2", + "ref": "3.4", "repo": "cabal", "type": "github" } }, - "cabal-32_6": { + "cabal-34_7": { "flake": false, "locked": { - "lastModified": 1603716527, - "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", + "lastModified": 1640353650, + "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=", "owner": "haskell", "repo": "cabal", - "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", + "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd", "type": "github" }, "original": { "owner": "haskell", - "ref": "3.2", + "ref": "3.4", "repo": "cabal", "type": "github" } }, - "cabal-32_7": { + "cabal-36": { "flake": false, "locked": { - "lastModified": 1603716527, - "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", + "lastModified": 1669081697, + "narHash": "sha256-I5or+V7LZvMxfbYgZATU4awzkicBwwok4mVoje+sGmU=", "owner": "haskell", "repo": "cabal", - "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", + "rev": "8fd619e33d34924a94e691c5fea2c42f0fc7f144", "type": "github" }, "original": { "owner": "haskell", - "ref": "3.2", + "ref": "3.6", "repo": "cabal", "type": "github" } }, - "cabal-32_8": { + "cabal-36_2": { "flake": false, "locked": { - "lastModified": 1603716527, - "narHash": "sha256-sDbrmur9Zfp4mPKohCD8IDZfXJ0Tjxpmr2R+kg5PpSY=", + "lastModified": 1641652457, + "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=", "owner": "haskell", "repo": "cabal", - "rev": "94aaa8e4720081f9c75497e2735b90f6a819b08e", + "rev": "f27667f8ec360c475027dcaee0138c937477b070", "type": "github" }, "original": { "owner": "haskell", - "ref": "3.2", + "ref": "3.6", "repo": "cabal", "type": "github" } }, - "cabal-32_9": { + "cabal-36_3": { "flake": false, "locked": { - "lastModified": 1603716527, - "narHash": "sha256-sDbrmur9Zfp4mPKohCD8IDZfXJ0Tjxpmr2R+kg5PpSY=", + "lastModified": 1641652457, + "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=", "owner": "haskell", "repo": "cabal", - "rev": "94aaa8e4720081f9c75497e2735b90f6a819b08e", + "rev": "f27667f8ec360c475027dcaee0138c937477b070", "type": "github" }, "original": { "owner": "haskell", - "ref": "3.2", + "ref": "3.6", "repo": "cabal", "type": "github" } }, - "cabal-34": { + "cabal-36_4": { "flake": false, "locked": { - "lastModified": 1640353650, - "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=", + "lastModified": 1641652457, + "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=", "owner": "haskell", "repo": "cabal", - "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd", + "rev": "f27667f8ec360c475027dcaee0138c937477b070", "type": "github" }, "original": { "owner": "haskell", - "ref": "3.4", + "ref": "3.6", "repo": "cabal", "type": "github" } }, - "cabal-34_10": { + "cabal-36_5": { "flake": false, "locked": { - "lastModified": 1622475795, - "narHash": "sha256-chwTL304Cav+7p38d9mcb+egABWmxo2Aq+xgVBgEb/U=", + "lastModified": 1641652457, + "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=", "owner": "haskell", "repo": "cabal", - "rev": "b086c1995cdd616fc8d91f46a21e905cc50a1049", + "rev": "f27667f8ec360c475027dcaee0138c937477b070", "type": "github" }, "original": { "owner": "haskell", - "ref": "3.4", + "ref": "3.6", "repo": "cabal", "type": "github" } }, - "cabal-34_11": { + "cabal-36_6": { "flake": false, "locked": { - "lastModified": 1640353650, - "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=", + "lastModified": 1669081697, + "narHash": "sha256-I5or+V7LZvMxfbYgZATU4awzkicBwwok4mVoje+sGmU=", "owner": "haskell", "repo": "cabal", - "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd", + "rev": "8fd619e33d34924a94e691c5fea2c42f0fc7f144", "type": "github" }, "original": { "owner": "haskell", - "ref": "3.4", + "ref": "3.6", "repo": "cabal", "type": "github" } }, - "cabal-34_12": { + "cabal-36_7": { "flake": false, "locked": { - "lastModified": 1640353650, - "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=", + "lastModified": 1641652457, + "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=", "owner": "haskell", "repo": "cabal", - "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd", + "rev": "f27667f8ec360c475027dcaee0138c937477b070", "type": "github" }, "original": { "owner": "haskell", - "ref": "3.4", + "ref": "3.6", "repo": "cabal", "type": "github" } }, - "cabal-34_13": { - "flake": false, + "capsules": { + "inputs": { + "bitte": "bitte_2", + "iogo": "iogo", + "nixpkgs": "nixpkgs_23", + "ragenix": "ragenix_2" + }, "locked": { - "lastModified": 1622475795, - "narHash": "sha256-chwTL304Cav+7p38d9mcb+egABWmxo2Aq+xgVBgEb/U=", - "owner": "haskell", - "repo": "cabal", - "rev": "b086c1995cdd616fc8d91f46a21e905cc50a1049", + "lastModified": 1658156716, + "narHash": "sha256-c1lH7PIN0rTKdGgosD5fCsHoAklAtGR/E1DFT2exIkM=", + "owner": "input-output-hk", + "repo": "devshell-capsules", + "rev": "88348a415130cee29ce187140e6f57d94d843d54", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.4", - "repo": "cabal", + "owner": "input-output-hk", + "repo": "devshell-capsules", "type": "github" } }, - "cabal-34_14": { - "flake": false, + "capsules_2": { + "inputs": { + "bitte": "bitte_3", + "iogo": "iogo_2", + "nixpkgs": "nixpkgs_52", + "ragenix": "ragenix_5" + }, "locked": { - "lastModified": 1622475795, - "narHash": "sha256-chwTL304Cav+7p38d9mcb+egABWmxo2Aq+xgVBgEb/U=", - "owner": "haskell", - "repo": "cabal", - "rev": "b086c1995cdd616fc8d91f46a21e905cc50a1049", + "lastModified": 1659466315, + "narHash": "sha256-VqR1PaC7lb4uT/s38lDNYvwhF2yQuD13KwGBoMCxF4g=", + "owner": "input-output-hk", + "repo": "devshell-capsules", + "rev": "125b8665c6139e3a127d243534a4f0ce36e3a335", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.4", - "repo": "cabal", + "owner": "input-output-hk", + "repo": "devshell-capsules", "type": "github" } }, - "cabal-34_15": { - "flake": false, + "cardano-automation": { + "inputs": { + "flake-utils": "flake-utils", + "haskellNix": [ + "ctl", + "cardano-node", + "haskellNix" + ], + "nixpkgs": [ + "ctl", + "cardano-node", + "nixpkgs" + ], + "tullia": [ + "ctl", + "cardano-node", + "tullia" + ] + }, "locked": { - "lastModified": 1622475795, - "narHash": "sha256-chwTL304Cav+7p38d9mcb+egABWmxo2Aq+xgVBgEb/U=", - "owner": "haskell", - "repo": "cabal", - "rev": "b086c1995cdd616fc8d91f46a21e905cc50a1049", + "lastModified": 1679408951, + "narHash": "sha256-xM78upkrXjRu/739V/IxFrA9m+6rvgOiolt4ReKLAog=", + "owner": "input-output-hk", + "repo": "cardano-automation", + "rev": "628f135d243d4a9e388c187e4c6179246038ee72", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.4", - "repo": "cabal", + "owner": "input-output-hk", + "repo": "cardano-automation", "type": "github" } }, - "cabal-34_16": { + "cardano-configurations": { "flake": false, "locked": { - "lastModified": 1640353650, - "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=", - "owner": "haskell", - "repo": "cabal", - "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd", + "lastModified": 1699561895, + "narHash": "sha256-bLNN6lJUe5dR1EOdtDspReE2fu2EV7hQMHFGDinxf5Y=", + "owner": "input-output-hk", + "repo": "cardano-configurations", + "rev": "d952529afdfdf6d53ce190b1bf8af990a7ae9590", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.4", - "repo": "cabal", + "owner": "input-output-hk", + "repo": "cardano-configurations", + "rev": "d952529afdfdf6d53ce190b1bf8af990a7ae9590", "type": "github" } }, - "cabal-34_17": { + "cardano-configurations_2": { "flake": false, "locked": { - "lastModified": 1640353650, - "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=", - "owner": "haskell", - "repo": "cabal", - "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd", + "lastModified": 1694019972, + "narHash": "sha256-TQEvb6W2VlOWxqIFa4r8UFBVbu82Bb2hRaDtN5Zbiuk=", + "owner": "input-output-hk", + "repo": "cardano-configurations", + "rev": "65ef979cf69f420efca0a7aaf0412a610bc48097", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.4", - "repo": "cabal", + "owner": "input-output-hk", + "repo": "cardano-configurations", "type": "github" } }, - "cabal-34_2": { + "cardano-explorer-app": { "flake": false, "locked": { - "lastModified": 1640353650, - "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=", - "owner": "haskell", - "repo": "cabal", - "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd", + "lastModified": 1655291958, + "narHash": "sha256-OByt95cIJrA8pXsvCztsWmFcDaQaSYGohSOHoaZWKJs=", + "owner": "input-output-hk", + "repo": "cardano-explorer-app", + "rev": "a65938afe159adb1d1e2808305a7316738f5e634", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.4", - "repo": "cabal", + "owner": "input-output-hk", + "ref": "fix-nix-system", + "repo": "cardano-explorer-app", "type": "github" } }, - "cabal-34_3": { + "cardano-graphql": { "flake": false, "locked": { - "lastModified": 1640353650, - "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=", - "owner": "haskell", - "repo": "cabal", - "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd", + "lastModified": 1657201429, + "narHash": "sha256-kx8Pe5HllnJceQHsBDB4hHcEQNSiq8D+OFFkRuuUFQE=", + "owner": "input-output-hk", + "repo": "cardano-graphql", + "rev": "ffb40028f51e23983c2ae27693bbdcd152208d9d", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.4", - "repo": "cabal", + "owner": "input-output-hk", + "repo": "cardano-graphql", "type": "github" } }, - "cabal-34_4": { - "flake": false, + "cardano-mainnet-mirror": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, "locked": { - "lastModified": 1640353650, - "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=", - "owner": "haskell", - "repo": "cabal", - "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd", + "lastModified": 1642701714, + "narHash": "sha256-SR3luE+ePX6U193EKE/KSEuVzWAW0YsyPYDC4hOvALs=", + "owner": "input-output-hk", + "repo": "cardano-mainnet-mirror", + "rev": "819488be9eabbba6aaa7c931559bc584d8071e3d", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.4", - "repo": "cabal", + "owner": "input-output-hk", + "ref": "nix", + "repo": "cardano-mainnet-mirror", "type": "github" } }, - "cabal-34_5": { - "flake": false, + "cardano-node": { + "inputs": { + "CHaP": "CHaP_2", + "cardano-automation": "cardano-automation", + "cardano-mainnet-mirror": "cardano-mainnet-mirror", + "customConfig": "customConfig", + "em": "em", + "empty-flake": "empty-flake", + "flake-compat": "flake-compat", + "hackageNix": "hackageNix", + "haskellNix": "haskellNix", + "hostNixpkgs": [ + "ctl", + "cardano-node", + "nixpkgs" + ], + "iohkNix": "iohkNix", + "nix2container": "nix2container", + "nixpkgs": [ + "ctl", + "cardano-node", + "haskellNix", + "nixpkgs-unstable" + ], + "ops-lib": "ops-lib", + "std": [ + "ctl", + "cardano-node", + "tullia", + "std" + ], + "tullia": "tullia", + "utils": "utils_2" + }, "locked": { - "lastModified": 1640353650, - "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=", - "owner": "haskell", - "repo": "cabal", - "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd", + "lastModified": 1687190129, + "narHash": "sha256-JCa9+QhZ2RVSIKkhz2WCZqTKCgdUSuezWS2YsQ5vhM4=", + "owner": "input-output-hk", + "repo": "cardano-node", + "rev": "6f79e5c3ea109a70cd01910368e011635767305a", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.4", - "repo": "cabal", + "owner": "input-output-hk", + "ref": "8.1.1", + "repo": "cardano-node", "type": "github" } }, - "cabal-34_6": { + "cardano-node_2": { "flake": false, "locked": { - "lastModified": 1640353650, - "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=", - "owner": "haskell", - "repo": "cabal", - "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd", + "lastModified": 1659625017, + "narHash": "sha256-4IrheFeoWfvkZQndEk4fGUkOiOjcVhcyXZ6IqmvkDgg=", + "owner": "input-output-hk", + "repo": "cardano-node", + "rev": "950c4e222086fed5ca53564e642434ce9307b0b9", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.4", - "repo": "cabal", + "owner": "input-output-hk", + "ref": "1.35.3", + "repo": "cardano-node", "type": "github" } }, - "cabal-34_7": { + "cardano-shell": { "flake": false, "locked": { - "lastModified": 1640353650, - "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=", - "owner": "haskell", - "repo": "cabal", - "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd", + "lastModified": 1608537748, + "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "9392c75087cb9a3d453998f4230930dea3a95725", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.4", - "repo": "cabal", + "owner": "input-output-hk", + "repo": "cardano-shell", "type": "github" } }, - "cabal-34_8": { + "cardano-shell_2": { "flake": false, "locked": { - "lastModified": 1622475795, - "narHash": "sha256-chwTL304Cav+7p38d9mcb+egABWmxo2Aq+xgVBgEb/U=", - "owner": "haskell", - "repo": "cabal", - "rev": "b086c1995cdd616fc8d91f46a21e905cc50a1049", + "lastModified": 1608537748, + "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "9392c75087cb9a3d453998f4230930dea3a95725", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.4", - "repo": "cabal", + "owner": "input-output-hk", + "repo": "cardano-shell", "type": "github" } }, - "cabal-34_9": { + "cardano-shell_3": { "flake": false, "locked": { - "lastModified": 1622475795, - "narHash": "sha256-chwTL304Cav+7p38d9mcb+egABWmxo2Aq+xgVBgEb/U=", - "owner": "haskell", - "repo": "cabal", - "rev": "b086c1995cdd616fc8d91f46a21e905cc50a1049", + "lastModified": 1608537748, + "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "9392c75087cb9a3d453998f4230930dea3a95725", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.4", - "repo": "cabal", + "owner": "input-output-hk", + "repo": "cardano-shell", "type": "github" } }, - "cabal-36": { + "cardano-shell_4": { "flake": false, "locked": { - "lastModified": 1641652457, - "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=", - "owner": "haskell", - "repo": "cabal", - "rev": "f27667f8ec360c475027dcaee0138c937477b070", + "lastModified": 1608537748, + "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "9392c75087cb9a3d453998f4230930dea3a95725", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.6", - "repo": "cabal", + "owner": "input-output-hk", + "repo": "cardano-shell", "type": "github" } }, - "cabal-36_10": { + "cardano-shell_5": { "flake": false, "locked": { - "lastModified": 1641652457, - "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=", - "owner": "haskell", - "repo": "cabal", - "rev": "f27667f8ec360c475027dcaee0138c937477b070", + "lastModified": 1608537748, + "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "9392c75087cb9a3d453998f4230930dea3a95725", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.6", - "repo": "cabal", + "owner": "input-output-hk", + "repo": "cardano-shell", "type": "github" } }, - "cabal-36_11": { + "cardano-shell_6": { "flake": false, "locked": { - "lastModified": 1641652457, - "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=", - "owner": "haskell", - "repo": "cabal", - "rev": "f27667f8ec360c475027dcaee0138c937477b070", + "lastModified": 1608537748, + "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "9392c75087cb9a3d453998f4230930dea3a95725", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.6", - "repo": "cabal", + "owner": "input-output-hk", + "repo": "cardano-shell", "type": "github" } }, - "cabal-36_12": { + "cardano-shell_7": { "flake": false, "locked": { - "lastModified": 1640163203, - "narHash": "sha256-TwDWP2CffT0j40W6zr0J1Qbu+oh3nsF1lUx9446qxZM=", - "owner": "haskell", - "repo": "cabal", - "rev": "ecf418050c1821f25e2e218f1be94c31e0465df1", + "lastModified": 1608537748, + "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "9392c75087cb9a3d453998f4230930dea3a95725", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.6", - "repo": "cabal", + "owner": "input-output-hk", + "repo": "cardano-shell", "type": "github" } }, - "cabal-36_13": { - "flake": false, + "cardano-wallet": { + "inputs": { + "customConfig": "customConfig_2", + "ema": "ema", + "emanote": "emanote", + "flake-compat": "flake-compat_8", + "flake-utils": "flake-utils_25", + "haskellNix": "haskellNix_2", + "hostNixpkgs": [ + "ctl", + "db-sync", + "cardano-world", + "cardano-wallet", + "nixpkgs" + ], + "iohkNix": "iohkNix_2", + "nixpkgs": [ + "ctl", + "db-sync", + "cardano-world", + "cardano-wallet", + "haskellNix", + "nixpkgs-unstable" + ] + }, "locked": { - "lastModified": 1640163203, - "narHash": "sha256-TwDWP2CffT0j40W6zr0J1Qbu+oh3nsF1lUx9446qxZM=", - "owner": "haskell", - "repo": "cabal", - "rev": "ecf418050c1821f25e2e218f1be94c31e0465df1", + "lastModified": 1656674685, + "narHash": "sha256-Uq02O758v7U61a9Ol6VzSDyx3S/CVHn0l/OUM1UYJkY=", + "owner": "input-output-hk", + "repo": "cardano-wallet", + "rev": "c0ece6ad1868682b074708ffb810bdc2ea96934f", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.6", - "repo": "cabal", + "owner": "input-output-hk", + "ref": "v2022-07-01", + "repo": "cardano-wallet", "type": "github" } }, - "cabal-36_14": { - "flake": false, + "cardano-world": { + "inputs": { + "bitte": "bitte", + "bitte-cells": "bitte-cells", + "byron-chain": "byron-chain", + "capsules": "capsules_2", + "cardano-db-sync": [ + "ctl", + "db-sync" + ], + "cardano-explorer-app": "cardano-explorer-app", + "cardano-graphql": "cardano-graphql", + "cardano-node": "cardano-node_2", + "cardano-wallet": "cardano-wallet", + "data-merge": "data-merge_3", + "flake-compat": "flake-compat_9", + "hackage": "hackage_3", + "haskell-nix": "haskell-nix_2", + "iohk-nix": "iohk-nix", + "n2c": "n2c_3", + "nix-inclusive": "nix-inclusive", + "nixpkgs": "nixpkgs_63", + "nixpkgs-haskell": [ + "ctl", + "db-sync", + "cardano-world", + "haskell-nix", + "nixpkgs-unstable" + ], + "ogmios": "ogmios", + "std": "std_3", + "tullia": "tullia_2" + }, "locked": { - "lastModified": 1641652457, - "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=", - "owner": "haskell", - "repo": "cabal", - "rev": "f27667f8ec360c475027dcaee0138c937477b070", + "lastModified": 1662508244, + "narHash": "sha256-s8kroVd8VAZ/Lfv2gNt+RzIuSnWpQxAAL0y90tn1i0o=", + "owner": "input-output-hk", + "repo": "cardano-world", + "rev": "0b6dcb5b61a0f7a2c048cb757463cbc0dfa0fe24", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.6", - "repo": "cabal", + "owner": "input-output-hk", + "repo": "cardano-world", "type": "github" } }, - "cabal-36_15": { - "flake": false, - "locked": { - "lastModified": 1641652457, - "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=", - "owner": "haskell", - "repo": "cabal", - "rev": "f27667f8ec360c475027dcaee0138c937477b070", - "type": "github" + "cicero": { + "inputs": { + "alejandra": "alejandra", + "data-merge": "data-merge_2", + "devshell": "devshell_8", + "driver": "driver", + "follower": "follower", + "haskell-nix": "haskell-nix", + "inclusive": "inclusive_8", + "nix": "nix_8", + "nix-cache-proxy": "nix-cache-proxy", + "nixpkgs": "nixpkgs_39", + "poetry2nix": "poetry2nix", + "utils": "utils_16" }, - "original": { - "owner": "haskell", - "ref": "3.6", - "repo": "cabal", - "type": "github" - } - }, - "cabal-36_2": { - "flake": false, "locked": { - "lastModified": 1641652457, - "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=", - "owner": "haskell", - "repo": "cabal", - "rev": "f27667f8ec360c475027dcaee0138c937477b070", + "lastModified": 1647522107, + "narHash": "sha256-Kti1zv+GXnbujkJ0ODB2ukq4Eb2RVOpudZ1xVDhhbes=", + "owner": "input-output-hk", + "repo": "cicero", + "rev": "0fd8642fe437f6129fe6914f032d3fdc7591d4fe", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.6", - "repo": "cabal", + "owner": "input-output-hk", + "repo": "cicero", "type": "github" } }, - "cabal-36_3": { - "flake": false, + "ctl": { + "inputs": { + "CHaP": "CHaP", + "blockfrost": "blockfrost", + "cardano-configurations": "cardano-configurations", + "cardano-node": "cardano-node", + "db-sync": "db-sync", + "easy-purescript-nix": "easy-purescript-nix", + "flake-compat": "flake-compat_11", + "hackage-nix": "hackage-nix", + "haskell-nix": "haskell-nix_3", + "hercules-ci-effects": "hercules-ci-effects", + "iohk-nix": "iohk-nix_2", + "kupo": "kupo", + "kupo-nixos": "kupo-nixos", + "nixpkgs": [ + "ctl", + "haskell-nix", + "nixpkgs-unstable" + ], + "ogmios": "ogmios_2", + "ogmios-nixos": "ogmios-nixos", + "plutip": "plutip" + }, "locked": { - "lastModified": 1641652457, - "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=", - "owner": "haskell", - "repo": "cabal", - "rev": "f27667f8ec360c475027dcaee0138c937477b070", + "lastModified": 1702493588, + "narHash": "sha256-Thdyj43WqEUiI1QAOIh250zTLtV7fT7aU4bTdIGsfhA=", + "owner": "Plutonomicon", + "repo": "cardano-transaction-lib", + "rev": "774c005ae9ebd228e9b6c31a636b3470d11064dd", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.6", - "repo": "cabal", + "owner": "Plutonomicon", + "repo": "cardano-transaction-lib", + "rev": "774c005ae9ebd228e9b6c31a636b3470d11064dd", "type": "github" } }, - "cabal-36_4": { - "flake": false, + "customConfig": { "locked": { - "lastModified": 1641652457, - "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=", - "owner": "haskell", - "repo": "cabal", - "rev": "f27667f8ec360c475027dcaee0138c937477b070", + "lastModified": 1630400035, + "narHash": "sha256-MWaVOCzuFwp09wZIW9iHq5wWen5C69I940N1swZLEQ0=", + "owner": "input-output-hk", + "repo": "empty-flake", + "rev": "2040a05b67bf9a669ce17eca56beb14b4206a99a", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.6", - "repo": "cabal", + "owner": "input-output-hk", + "repo": "empty-flake", "type": "github" } }, - "cabal-36_5": { - "flake": false, + "customConfig_2": { "locked": { - "lastModified": 1641652457, - "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=", - "owner": "haskell", - "repo": "cabal", - "rev": "f27667f8ec360c475027dcaee0138c937477b070", + "lastModified": 1630400035, + "narHash": "sha256-MWaVOCzuFwp09wZIW9iHq5wWen5C69I940N1swZLEQ0=", + "owner": "input-output-hk", + "repo": "empty-flake", + "rev": "2040a05b67bf9a669ce17eca56beb14b4206a99a", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.6", - "repo": "cabal", + "owner": "input-output-hk", + "repo": "empty-flake", "type": "github" } }, - "cabal-36_6": { - "flake": false, + "customConfig_3": { "locked": { - "lastModified": 1641652457, - "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=", - "owner": "haskell", - "repo": "cabal", - "rev": "f27667f8ec360c475027dcaee0138c937477b070", - "type": "github" + "lastModified": 1, + "narHash": "sha256-Zd5w1I1Dwt783Q4WuBuCpedcwG1DrIgQGqabyF87prM=", + "path": "./custom-config", + "type": "path" }, "original": { - "owner": "haskell", - "ref": "3.6", - "repo": "cabal", - "type": "github" + "path": "./custom-config", + "type": "path" } }, - "cabal-36_7": { - "flake": false, + "data-merge": { + "inputs": { + "nixlib": "nixlib", + "yants": "yants_2" + }, "locked": { - "lastModified": 1641652457, - "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=", - "owner": "haskell", - "repo": "cabal", - "rev": "f27667f8ec360c475027dcaee0138c937477b070", + "lastModified": 1648237091, + "narHash": "sha256-OtgcOt/CB0/9S0rh1eAog+AvAg9kF6GyAknyWOXiAZI=", + "owner": "divnix", + "repo": "data-merge", + "rev": "b21bcf7bd949ac92af3930ecb1d3df8786384722", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.6", - "repo": "cabal", + "owner": "divnix", + "repo": "data-merge", "type": "github" } }, - "cabal-36_8": { - "flake": false, + "data-merge_2": { + "inputs": { + "nixlib": "nixlib_2" + }, "locked": { - "lastModified": 1640163203, - "narHash": "sha256-TwDWP2CffT0j40W6zr0J1Qbu+oh3nsF1lUx9446qxZM=", - "owner": "haskell", - "repo": "cabal", - "rev": "ecf418050c1821f25e2e218f1be94c31e0465df1", + "lastModified": 1635967744, + "narHash": "sha256-01065dNad3BIepNzrpYuYInxq/ynqtGMSsIiNqjND7E=", + "owner": "divnix", + "repo": "data-merge", + "rev": "68bd71f980f75cf73bc5071982eddfe6bc089768", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.6", - "repo": "cabal", + "owner": "divnix", + "repo": "data-merge", "type": "github" } }, - "cabal-36_9": { - "flake": false, + "data-merge_3": { + "inputs": { + "nixlib": "nixlib_3", + "yants": "yants_4" + }, "locked": { - "lastModified": 1640163203, - "narHash": "sha256-TwDWP2CffT0j40W6zr0J1Qbu+oh3nsF1lUx9446qxZM=", - "owner": "haskell", - "repo": "cabal", - "rev": "ecf418050c1821f25e2e218f1be94c31e0465df1", + "lastModified": 1655854240, + "narHash": "sha256-j74ixD7Y0bF3h0fBJFKPR9botlrMu0fgG/YsiUKybko=", + "owner": "divnix", + "repo": "data-merge", + "rev": "0bbe0a68d4ee090b8bbad0c5e1e85060d2bdfe98", "type": "github" }, "original": { - "owner": "haskell", - "ref": "3.6", - "repo": "cabal", + "owner": "divnix", + "repo": "data-merge", "type": "github" } }, - "capsules": { + "db-sync": { "inputs": { - "bitte": "bitte_2", - "iogo": "iogo", - "nixpkgs": "nixpkgs_16", - "ragenix": "ragenix_2" + "cardano-world": "cardano-world", + "customConfig": "customConfig_3", + "flake-compat": "flake-compat_10", + "haskellNix": "haskellNix_3", + "iohkNix": "iohkNix_3", + "nixpkgs": [ + "ctl", + "db-sync", + "haskellNix", + "nixpkgs-unstable" + ], + "utils": "utils_23" }, "locked": { - "lastModified": 1658156716, - "narHash": "sha256-c1lH7PIN0rTKdGgosD5fCsHoAklAtGR/E1DFT2exIkM=", + "lastModified": 1670313550, + "narHash": "sha256-Gkn/hyK0xiDJZY1O5JEwuosMzar+IskC9xxeBts+0H4=", "owner": "input-output-hk", - "repo": "devshell-capsules", - "rev": "88348a415130cee29ce187140e6f57d94d843d54", + "repo": "cardano-db-sync", + "rev": "1040fa9ec85fd75ce9f02dae2006170136793d02", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "devshell-capsules", + "ref": "13.1.0.0", + "repo": "cardano-db-sync", "type": "github" } }, - "capsules_2": { + "deploy": { "inputs": { - "bitte": "bitte_3", - "iogo": "iogo_2", - "nixpkgs": "nixpkgs_45", - "ragenix": "ragenix_5" + "fenix": "fenix", + "flake-compat": "flake-compat_4", + "nixpkgs": [ + "ctl", + "db-sync", + "cardano-world", + "bitte", + "capsules", + "bitte", + "deploy", + "fenix", + "nixpkgs" + ], + "utils": "utils_3" }, "locked": { - "lastModified": 1659466315, - "narHash": "sha256-VqR1PaC7lb4uT/s38lDNYvwhF2yQuD13KwGBoMCxF4g=", + "lastModified": 1638318651, + "narHash": "sha256-YsYBMa8Chtb6ccGZOVStReiZ33ZNmi7kNPLf/Ua2kY8=", "owner": "input-output-hk", - "repo": "devshell-capsules", - "rev": "125b8665c6139e3a127d243534a4f0ce36e3a335", + "repo": "deploy-rs", + "rev": "1d3a4f4681a98479219c628165bb6b3a12eae843", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "devshell-capsules", + "repo": "deploy-rs", "type": "github" } }, - "cardano-addresses": { - "flake": false, - "locked": { - "lastModified": 1664466771, - "narHash": "sha256-m8oidcV9LWU0S+NBw4wH1JdKZVict1EbKBZ6kfdEEf4=", - "owner": "input-output-hk", - "repo": "cardano-addresses", - "rev": "5094fb9d304ed69adedc99513634a00cbf850fca", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "cardano-addresses", - "rev": "5094fb9d304ed69adedc99513634a00cbf850fca", - "type": "github" - } - }, - "cardano-configurations": { - "flake": false, + "deploy_2": { + "inputs": { + "fenix": "fenix_3", + "flake-compat": "flake-compat_5", + "nixpkgs": [ + "ctl", + "db-sync", + "cardano-world", + "bitte", + "deploy", + "fenix", + "nixpkgs" + ], + "utils": "utils_9" + }, "locked": { - "lastModified": 1671845278, - "narHash": "sha256-oOycxAu9kARfyUvkdjeq80Em7b+vP9XsBii8836f9yQ=", + "lastModified": 1638318651, + "narHash": "sha256-YsYBMa8Chtb6ccGZOVStReiZ33ZNmi7kNPLf/Ua2kY8=", "owner": "input-output-hk", - "repo": "cardano-configurations", - "rev": "36a75a920de312519c3a9086061daccb997f9cd0", + "repo": "deploy-rs", + "rev": "1d3a4f4681a98479219c628165bb6b3a12eae843", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "cardano-configurations", + "repo": "deploy-rs", "type": "github" } }, - "cardano-configurations_2": { - "flake": false, + "deploy_3": { + "inputs": { + "fenix": "fenix_5", + "flake-compat": "flake-compat_6", + "nixpkgs": [ + "ctl", + "db-sync", + "cardano-world", + "capsules", + "bitte", + "deploy", + "fenix", + "nixpkgs" + ], + "utils": "utils_17" + }, "locked": { - "lastModified": 1670462928, - "narHash": "sha256-nPeMzKeMAVTtWOBaYzC6xU/J0UCA79u3JBOk9mFKdF0=", + "lastModified": 1638318651, + "narHash": "sha256-YsYBMa8Chtb6ccGZOVStReiZ33ZNmi7kNPLf/Ua2kY8=", "owner": "input-output-hk", - "repo": "cardano-configurations", - "rev": "5d3dfead99eca0996c5b838a5fbccc94eb670df5", + "repo": "deploy-rs", + "rev": "1d3a4f4681a98479219c628165bb6b3a12eae843", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "cardano-configurations", + "repo": "deploy-rs", "type": "github" } }, - "cardano-configurations_3": { - "flake": false, + "devshell": { + "inputs": { + "flake-utils": [ + "ctl", + "cardano-node", + "tullia", + "std", + "flake-utils" + ], + "nixpkgs": [ + "ctl", + "cardano-node", + "tullia", + "std", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1667387423, - "narHash": "sha256-oOycxAu9kARfyUvkdjeq80Em7b+vP9XsBii8836f9yQ=", - "owner": "input-output-hk", - "repo": "cardano-configurations", - "rev": "c0d11b5ff0c0200da00a50c17c38d9fd752ba532", + "lastModified": 1663445644, + "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", + "owner": "numtide", + "repo": "devshell", + "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cardano-configurations", + "owner": "numtide", + "repo": "devshell", "type": "github" } }, - "cardano-explorer-app": { - "flake": false, + "devshell_10": { "locked": { - "lastModified": 1655291958, - "narHash": "sha256-OByt95cIJrA8pXsvCztsWmFcDaQaSYGohSOHoaZWKJs=", - "owner": "input-output-hk", - "repo": "cardano-explorer-app", - "rev": "a65938afe159adb1d1e2808305a7316738f5e634", + "lastModified": 1636119665, + "narHash": "sha256-e11Z9PyH9hdgTm4Vyl8S5iTwrv0um6+srzb1Ba+YUHA=", + "owner": "numtide", + "repo": "devshell", + "rev": "ab14b1a3cb253f58e02f5f849d621292fbf81fad", "type": "github" }, "original": { - "owner": "input-output-hk", - "ref": "fix-nix-system", - "repo": "cardano-explorer-app", + "owner": "numtide", + "repo": "devshell", "type": "github" } }, - "cardano-graphql": { - "flake": false, + "devshell_11": { "locked": { - "lastModified": 1657201429, - "narHash": "sha256-kx8Pe5HllnJceQHsBDB4hHcEQNSiq8D+OFFkRuuUFQE=", - "owner": "input-output-hk", - "repo": "cardano-graphql", - "rev": "ffb40028f51e23983c2ae27693bbdcd152208d9d", + "lastModified": 1636119665, + "narHash": "sha256-e11Z9PyH9hdgTm4Vyl8S5iTwrv0um6+srzb1Ba+YUHA=", + "owner": "numtide", + "repo": "devshell", + "rev": "ab14b1a3cb253f58e02f5f849d621292fbf81fad", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cardano-graphql", + "owner": "numtide", + "repo": "devshell", "type": "github" } }, - "cardano-mainnet-mirror": { - "inputs": { - "nixpkgs": "nixpkgs_65" - }, + "devshell_12": { "locked": { - "lastModified": 1642701714, - "narHash": "sha256-SR3luE+ePX6U193EKE/KSEuVzWAW0YsyPYDC4hOvALs=", - "owner": "input-output-hk", - "repo": "cardano-mainnet-mirror", - "rev": "819488be9eabbba6aaa7c931559bc584d8071e3d", + "lastModified": 1632436039, + "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", + "owner": "numtide", + "repo": "devshell", + "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6", "type": "github" }, "original": { - "owner": "input-output-hk", - "ref": "nix", - "repo": "cardano-mainnet-mirror", + "owner": "numtide", + "repo": "devshell", "type": "github" } }, - "cardano-mainnet-mirror_2": { - "inputs": { - "nixpkgs": "nixpkgs_67" - }, + "devshell_13": { "locked": { - "lastModified": 1642701714, - "narHash": "sha256-SR3luE+ePX6U193EKE/KSEuVzWAW0YsyPYDC4hOvALs=", - "owner": "input-output-hk", - "repo": "cardano-mainnet-mirror", - "rev": "819488be9eabbba6aaa7c931559bc584d8071e3d", + "lastModified": 1636119665, + "narHash": "sha256-e11Z9PyH9hdgTm4Vyl8S5iTwrv0um6+srzb1Ba+YUHA=", + "owner": "numtide", + "repo": "devshell", + "rev": "ab14b1a3cb253f58e02f5f849d621292fbf81fad", "type": "github" }, "original": { - "owner": "input-output-hk", - "ref": "nix", - "repo": "cardano-mainnet-mirror", + "owner": "numtide", + "repo": "devshell", "type": "github" } }, - "cardano-mainnet-mirror_3": { - "inputs": { - "nixpkgs": "nixpkgs_68" - }, + "devshell_14": { "locked": { - "lastModified": 1642701714, - "narHash": "sha256-SR3luE+ePX6U193EKE/KSEuVzWAW0YsyPYDC4hOvALs=", - "owner": "input-output-hk", - "repo": "cardano-mainnet-mirror", - "rev": "819488be9eabbba6aaa7c931559bc584d8071e3d", + "lastModified": 1637098489, + "narHash": "sha256-IWBYLSNSENI/fTrXdYDhuCavxcgN9+RERrPM81f6DXY=", + "owner": "numtide", + "repo": "devshell", + "rev": "e8c2d4967b5c498b12551d1bb49352dcf9efa3e4", "type": "github" }, "original": { - "owner": "input-output-hk", - "ref": "nix", - "repo": "cardano-mainnet-mirror", + "owner": "numtide", + "repo": "devshell", "type": "github" } }, - "cardano-mainnet-mirror_4": { + "devshell_15": { "inputs": { - "nixpkgs": "nixpkgs_73" + "flake-utils": [ + "ctl", + "db-sync", + "cardano-world", + "std", + "flake-utils" + ], + "nixpkgs": [ + "ctl", + "db-sync", + "cardano-world", + "std", + "nixpkgs" + ] }, "locked": { - "lastModified": 1642701714, - "narHash": "sha256-SR3luE+ePX6U193EKE/KSEuVzWAW0YsyPYDC4hOvALs=", - "owner": "input-output-hk", - "repo": "cardano-mainnet-mirror", - "rev": "819488be9eabbba6aaa7c931559bc584d8071e3d", + "lastModified": 1658746384, + "narHash": "sha256-CCJcoMOcXyZFrV1ag4XMTpAPjLWb4Anbv+ktXFI1ry0=", + "owner": "numtide", + "repo": "devshell", + "rev": "0ffc7937bb5e8141af03d462b468bd071eb18e1b", "type": "github" }, "original": { - "owner": "input-output-hk", - "ref": "nix", - "repo": "cardano-mainnet-mirror", + "owner": "numtide", + "repo": "devshell", "type": "github" } }, - "cardano-mainnet-mirror_5": { + "devshell_16": { "inputs": { - "nixpkgs": "nixpkgs_75" + "flake-utils": "flake-utils_31", + "nixpkgs": [ + "ctl", + "db-sync", + "cardano-world", + "tullia", + "std", + "nixpkgs" + ] }, "locked": { - "lastModified": 1642701714, - "narHash": "sha256-SR3luE+ePX6U193EKE/KSEuVzWAW0YsyPYDC4hOvALs=", - "owner": "input-output-hk", - "repo": "cardano-mainnet-mirror", - "rev": "819488be9eabbba6aaa7c931559bc584d8071e3d", + "lastModified": 1650900878, + "narHash": "sha256-qhNncMBSa9STnhiLfELEQpYC1L4GrYHNIzyCZ/pilsI=", + "owner": "numtide", + "repo": "devshell", + "rev": "d97df53b5ddaa1cfbea7cddbd207eb2634304733", "type": "github" }, "original": { - "owner": "input-output-hk", - "ref": "nix", - "repo": "cardano-mainnet-mirror", + "owner": "numtide", + "repo": "devshell", "type": "github" } }, - "cardano-mainnet-mirror_6": { - "inputs": { - "nixpkgs": "nixpkgs_76" - }, + "devshell_2": { "locked": { - "lastModified": 1642701714, - "narHash": "sha256-SR3luE+ePX6U193EKE/KSEuVzWAW0YsyPYDC4hOvALs=", - "owner": "input-output-hk", - "repo": "cardano-mainnet-mirror", - "rev": "819488be9eabbba6aaa7c931559bc584d8071e3d", + "lastModified": 1632436039, + "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", + "owner": "numtide", + "repo": "devshell", + "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6", "type": "github" }, "original": { - "owner": "input-output-hk", - "ref": "nix", - "repo": "cardano-mainnet-mirror", + "owner": "numtide", + "repo": "devshell", "type": "github" } }, - "cardano-node": { - "flake": false, + "devshell_3": { "locked": { - "lastModified": 1659625017, - "narHash": "sha256-4IrheFeoWfvkZQndEk4fGUkOiOjcVhcyXZ6IqmvkDgg=", - "owner": "input-output-hk", - "repo": "cardano-node", - "rev": "950c4e222086fed5ca53564e642434ce9307b0b9", - "type": "github" - }, + "lastModified": 1636119665, + "narHash": "sha256-e11Z9PyH9hdgTm4Vyl8S5iTwrv0um6+srzb1Ba+YUHA=", + "owner": "numtide", + "repo": "devshell", + "rev": "ab14b1a3cb253f58e02f5f849d621292fbf81fad", + "type": "github" + }, "original": { - "owner": "input-output-hk", - "ref": "1.35.3", - "repo": "cardano-node", + "owner": "numtide", + "repo": "devshell", "type": "github" } }, - "cardano-node-snapshot": { - "inputs": { - "customConfig": "customConfig_5", - "haskellNix": "haskellNix_5", - "iohkNix": "iohkNix_5", - "membench": "membench_2", - "nixpkgs": [ - "ctl", - "ogmios", - "cardano-node", - "node-snapshot", - "membench", - "cardano-node-snapshot", - "haskellNix", - "nixpkgs-2105" - ], - "utils": "utils_22" - }, + "devshell_4": { "locked": { - "lastModified": 1644954571, - "narHash": "sha256-c6MM1mQoS/AnTIrwaRmITK4L4i9lLNtkjOUHiseBtUs=", - "owner": "input-output-hk", - "repo": "cardano-node", - "rev": "30d62b86e7b98da28ef8ad9412e4e00a1ba1231d", + "lastModified": 1637098489, + "narHash": "sha256-IWBYLSNSENI/fTrXdYDhuCavxcgN9+RERrPM81f6DXY=", + "owner": "numtide", + "repo": "devshell", + "rev": "e8c2d4967b5c498b12551d1bb49352dcf9efa3e4", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cardano-node", - "rev": "30d62b86e7b98da28ef8ad9412e4e00a1ba1231d", + "owner": "numtide", + "repo": "devshell", "type": "github" } }, - "cardano-node-snapshot_2": { - "inputs": { - "customConfig": "customConfig_9", - "haskellNix": "haskellNix_9", - "iohkNix": "iohkNix_9", - "membench": "membench_4", - "nixpkgs": [ - "ctl", - "ogmios-nixos", - "cardano-node", - "node-snapshot", - "membench", - "cardano-node-snapshot", - "haskellNix", - "nixpkgs-2105" - ], - "utils": "utils_27" + "devshell_5": { + "locked": { + "lastModified": 1632436039, + "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", + "owner": "numtide", + "repo": "devshell", + "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6", + "type": "github" }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_6": { "locked": { - "lastModified": 1644954571, - "narHash": "sha256-c6MM1mQoS/AnTIrwaRmITK4L4i9lLNtkjOUHiseBtUs=", - "owner": "input-output-hk", - "repo": "cardano-node", - "rev": "30d62b86e7b98da28ef8ad9412e4e00a1ba1231d", + "lastModified": 1636119665, + "narHash": "sha256-e11Z9PyH9hdgTm4Vyl8S5iTwrv0um6+srzb1Ba+YUHA=", + "owner": "numtide", + "repo": "devshell", + "rev": "ab14b1a3cb253f58e02f5f849d621292fbf81fad", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cardano-node", - "rev": "30d62b86e7b98da28ef8ad9412e4e00a1ba1231d", + "owner": "numtide", + "repo": "devshell", "type": "github" } }, - "cardano-node_2": { + "devshell_7": { "inputs": { - "CHaP": "CHaP_3", - "cardano-mainnet-mirror": "cardano-mainnet-mirror", - "cardano-node-workbench": [ - "ctl", - "ogmios", - "blank" - ], - "customConfig": "customConfig_3", - "flake-compat": "flake-compat_9", - "hackageNix": "hackageNix", - "haskellNix": "haskellNix_3", - "hostNixpkgs": [ + "flake-utils": [ "ctl", - "ogmios", - "cardano-node", - "nixpkgs" + "db-sync", + "cardano-world", + "bitte", + "std", + "flake-utils" ], - "iohkNix": "iohkNix_3", - "nixTools": "nixTools", "nixpkgs": [ "ctl", - "ogmios", - "cardano-node", - "haskellNix", - "nixpkgs-unstable" - ], - "node-measured": [ - "ctl", - "ogmios", - "blank" - ], - "node-process": "node-process", - "node-snapshot": "node-snapshot", - "plutus-apps": "plutus-apps", - "utils": "utils_25" + "db-sync", + "cardano-world", + "bitte", + "std", + "nixpkgs" + ] }, "locked": { - "lastModified": 1667644902, - "narHash": "sha256-WRRzfpDc+YVmTNbN9LNYY4dS8o21p/6NoKxtcZmoAcg=", - "owner": "input-output-hk", - "repo": "cardano-node", - "rev": "ebc7be471b30e5931b35f9bbc236d21c375b91bb", + "lastModified": 1658746384, + "narHash": "sha256-CCJcoMOcXyZFrV1ag4XMTpAPjLWb4Anbv+ktXFI1ry0=", + "owner": "numtide", + "repo": "devshell", + "rev": "0ffc7937bb5e8141af03d462b468bd071eb18e1b", "type": "github" }, "original": { - "owner": "input-output-hk", - "ref": "1.35.4", - "repo": "cardano-node", + "owner": "numtide", + "repo": "devshell", "type": "github" } }, - "cardano-node_3": { + "devshell_8": { "inputs": { - "cardano-mainnet-mirror": "cardano-mainnet-mirror_4", - "cardano-node-workbench": [ - "ctl", - "ogmios-nixos", - "blank" - ], - "customConfig": "customConfig_7", - "flake-compat": "flake-compat_14", - "hackageNix": "hackageNix_2", - "haskellNix": "haskellNix_7", - "hostNixpkgs": [ - "ctl", - "ogmios-nixos", - "cardano-node", - "nixpkgs" - ], - "iohkNix": "iohkNix_7", - "nixTools": "nixTools_2", - "nixpkgs": [ - "ctl", - "ogmios-nixos", - "cardano-node", - "haskellNix", - "nixpkgs-unstable" - ], - "node-measured": [ - "ctl", - "ogmios-nixos", - "blank" - ], - "node-process": "node-process_2", - "node-snapshot": "node-snapshot_2", - "plutus-apps": "plutus-apps_2", - "utils": "utils_30" + "flake-utils": "flake-utils_15", + "nixpkgs": "nixpkgs_36" }, "locked": { - "lastModified": 1659625017, - "narHash": "sha256-4IrheFeoWfvkZQndEk4fGUkOiOjcVhcyXZ6IqmvkDgg=", - "owner": "input-output-hk", - "repo": "cardano-node", - "rev": "950c4e222086fed5ca53564e642434ce9307b0b9", + "lastModified": 1644227066, + "narHash": "sha256-FHcFZtpZEWnUh62xlyY3jfXAXHzJNEDLDzLsJxn+ve0=", + "owner": "numtide", + "repo": "devshell", + "rev": "7033f64dd9ef8d9d8644c5030c73913351d2b660", "type": "github" }, "original": { - "owner": "input-output-hk", - "ref": "1.35.3", - "repo": "cardano-node", + "owner": "numtide", + "repo": "devshell", "type": "github" } }, - "cardano-node_4": { - "flake": false, + "devshell_9": { "locked": { - "lastModified": 1667644902, - "narHash": "sha256-WRRzfpDc+YVmTNbN9LNYY4dS8o21p/6NoKxtcZmoAcg=", - "owner": "input-output-hk", - "repo": "cardano-node", - "rev": "ebc7be471b30e5931b35f9bbc236d21c375b91bb", + "lastModified": 1632436039, + "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", + "owner": "numtide", + "repo": "devshell", + "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cardano-node", - "rev": "ebc7be471b30e5931b35f9bbc236d21c375b91bb", + "owner": "numtide", + "repo": "devshell", "type": "github" } }, - "cardano-shell": { - "flake": false, + "dmerge": { + "inputs": { + "nixlib": [ + "ctl", + "cardano-node", + "tullia", + "std", + "nixpkgs" + ], + "yants": [ + "ctl", + "cardano-node", + "tullia", + "std", + "yants" + ] + }, "locked": { - "lastModified": 1608537748, - "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", - "owner": "input-output-hk", - "repo": "cardano-shell", - "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "lastModified": 1659548052, + "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", + "owner": "divnix", + "repo": "data-merge", + "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cardano-shell", + "owner": "divnix", + "repo": "data-merge", "type": "github" } }, - "cardano-shell_10": { - "flake": false, + "dmerge_2": { + "inputs": { + "nixlib": [ + "ctl", + "db-sync", + "cardano-world", + "bitte", + "std", + "nixpkgs" + ], + "yants": [ + "ctl", + "db-sync", + "cardano-world", + "bitte", + "std", + "yants" + ] + }, "locked": { - "lastModified": 1608537748, - "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", - "owner": "input-output-hk", - "repo": "cardano-shell", - "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "lastModified": 1659548052, + "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", + "owner": "divnix", + "repo": "data-merge", + "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cardano-shell", + "owner": "divnix", + "repo": "data-merge", "type": "github" } }, - "cardano-shell_11": { - "flake": false, + "dmerge_3": { + "inputs": { + "nixlib": [ + "ctl", + "db-sync", + "cardano-world", + "std", + "nixpkgs" + ], + "yants": [ + "ctl", + "db-sync", + "cardano-world", + "std", + "yants" + ] + }, "locked": { - "lastModified": 1608537748, - "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", - "owner": "input-output-hk", - "repo": "cardano-shell", - "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "lastModified": 1659548052, + "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", + "owner": "divnix", + "repo": "data-merge", + "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cardano-shell", + "owner": "divnix", + "repo": "data-merge", "type": "github" } }, - "cardano-shell_12": { - "flake": false, - "locked": { - "lastModified": 1608537748, - "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", - "owner": "input-output-hk", - "repo": "cardano-shell", - "rev": "9392c75087cb9a3d453998f4230930dea3a95725", - "type": "github" + "driver": { + "inputs": { + "devshell": "devshell_9", + "inclusive": "inclusive_6", + "nix": "nix_7", + "nixpkgs": [ + "ctl", + "db-sync", + "cardano-world", + "bitte-cells", + "cicero", + "nixpkgs" + ], + "utils": "utils_13" }, - "original": { - "owner": "input-output-hk", - "repo": "cardano-shell", - "type": "github" - } - }, - "cardano-shell_13": { - "flake": false, "locked": { - "lastModified": 1608537748, - "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", + "lastModified": 1644418487, + "narHash": "sha256-nzFmmBYjNjWVy25bHLLmZECfwJm3nxcAr/mYVYxWggA=", "owner": "input-output-hk", - "repo": "cardano-shell", - "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "repo": "nomad-driver-nix", + "rev": "7f7adb6814b4bf926597e4b810b803140176122c", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "cardano-shell", + "repo": "nomad-driver-nix", "type": "github" } }, - "cardano-shell_14": { + "easy-purescript-nix": { "flake": false, "locked": { - "lastModified": 1608537748, - "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", - "owner": "input-output-hk", - "repo": "cardano-shell", - "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "lastModified": 1696584097, + "narHash": "sha256-a9Hhqf/Fi0FkjRTcQr3pYDhrO9A9tdOkaeVgD23Cdrk=", + "owner": "justinwoo", + "repo": "easy-purescript-nix", + "rev": "d5fe5f4b210a0e4bac42ae0c159596a49c5eb016", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cardano-shell", + "owner": "justinwoo", + "repo": "easy-purescript-nix", "type": "github" } }, - "cardano-shell_15": { + "em": { "flake": false, "locked": { - "lastModified": 1608537748, - "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", - "owner": "input-output-hk", - "repo": "cardano-shell", - "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "lastModified": 1684791668, + "narHash": "sha256-JyPm0RiWCfy/8rs7wd/IRSWIz+bTkD78uxIMnKktU2g=", + "owner": "deepfire", + "repo": "em", + "rev": "302cdf6d654fb18baff0213bdfa41a653774585a", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cardano-shell", + "owner": "deepfire", + "repo": "em", "type": "github" } }, - "cardano-shell_16": { - "flake": false, + "ema": { + "inputs": { + "flake-compat": "flake-compat_7", + "flake-utils": "flake-utils_22", + "nixpkgs": "nixpkgs_54", + "pre-commit-hooks": "pre-commit-hooks" + }, "locked": { - "lastModified": 1608537748, - "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", - "owner": "input-output-hk", - "repo": "cardano-shell", - "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "lastModified": 1646661767, + "narHash": "sha256-5zxUr3nO4r04K5WGrW/+nW84qbOW8wNJLt902yQmyF4=", + "owner": "srid", + "repo": "ema", + "rev": "bcabc170b7de9cdd83b4bbcf59130b54933602ea", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cardano-shell", + "owner": "srid", + "repo": "ema", "type": "github" } }, - "cardano-shell_17": { + "ema_2": { "flake": false, "locked": { - "lastModified": 1608537748, - "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", - "owner": "input-output-hk", - "repo": "cardano-shell", - "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "lastModified": 1655231448, + "narHash": "sha256-LmAnOFKiqOWW9cQNZCbqFF0N1Mx073908voXz+4Fzic=", + "owner": "srid", + "repo": "ema", + "rev": "da5b29f03c1edfb7f947666a5a818fb97cc3c229", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cardano-shell", + "owner": "srid", + "ref": "multisite", + "repo": "ema", "type": "github" } }, - "cardano-shell_2": { - "flake": false, + "emanote": { + "inputs": { + "ema": "ema_2", + "flake-parts": "flake-parts", + "haskell-flake": "haskell-flake", + "nixpkgs": "nixpkgs_57", + "tailwind-haskell": "tailwind-haskell" + }, "locked": { - "lastModified": 1608537748, - "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", - "owner": "input-output-hk", - "repo": "cardano-shell", - "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "lastModified": 1655823900, + "narHash": "sha256-YEDJxa2gPf2+GGyrkFz4EliCml1FyDualZtbbZEmljA=", + "owner": "srid", + "repo": "emanote", + "rev": "147528d9df81b881214652ce0cefec0b3d52965e", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cardano-shell", + "owner": "srid", + "repo": "emanote", "type": "github" } }, - "cardano-shell_3": { - "flake": false, + "empty-flake": { "locked": { - "lastModified": 1608537748, - "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", + "lastModified": 1630400035, + "narHash": "sha256-MWaVOCzuFwp09wZIW9iHq5wWen5C69I940N1swZLEQ0=", "owner": "input-output-hk", - "repo": "cardano-shell", - "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "repo": "empty-flake", + "rev": "2040a05b67bf9a669ce17eca56beb14b4206a99a", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "cardano-shell", + "repo": "empty-flake", "type": "github" } }, - "cardano-shell_4": { - "flake": false, + "fenix": { + "inputs": { + "nixpkgs": "nixpkgs_13", + "rust-analyzer-src": "rust-analyzer-src" + }, "locked": { - "lastModified": 1608537748, - "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", - "owner": "input-output-hk", - "repo": "cardano-shell", - "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "lastModified": 1645165506, + "narHash": "sha256-PClhTeC1EhkHUQQmP9XyiR7y1d6hlEc7QY8nN1GuAzQ=", + "owner": "nix-community", + "repo": "fenix", + "rev": "380b82e3d3381b32f11dfe024cb7d135e36d0168", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cardano-shell", + "owner": "nix-community", + "repo": "fenix", "type": "github" } }, - "cardano-shell_5": { - "flake": false, + "fenix_2": { + "inputs": { + "nixpkgs": [ + "ctl", + "db-sync", + "cardano-world", + "bitte", + "capsules", + "bitte", + "nixpkgs-unstable" + ], + "rust-analyzer-src": "rust-analyzer-src_2" + }, "locked": { - "lastModified": 1608537748, - "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", - "owner": "input-output-hk", - "repo": "cardano-shell", - "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "lastModified": 1649226351, + "narHash": "sha256-5fQwF5kYpPC7w0SOfdbE9Z7o5/i/dyo1BxMLVCA2h3E=", + "owner": "nix-community", + "repo": "fenix", + "rev": "c7e184561fe843abb861cd7d22c23066987078e2", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cardano-shell", + "owner": "nix-community", + "repo": "fenix", "type": "github" } }, - "cardano-shell_6": { - "flake": false, + "fenix_3": { + "inputs": { + "nixpkgs": "nixpkgs_26", + "rust-analyzer-src": "rust-analyzer-src_3" + }, "locked": { - "lastModified": 1608537748, - "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", - "owner": "input-output-hk", - "repo": "cardano-shell", - "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "lastModified": 1645165506, + "narHash": "sha256-PClhTeC1EhkHUQQmP9XyiR7y1d6hlEc7QY8nN1GuAzQ=", + "owner": "nix-community", + "repo": "fenix", + "rev": "380b82e3d3381b32f11dfe024cb7d135e36d0168", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cardano-shell", + "owner": "nix-community", + "repo": "fenix", "type": "github" } }, - "cardano-shell_7": { - "flake": false, + "fenix_4": { + "inputs": { + "nixpkgs": [ + "ctl", + "db-sync", + "cardano-world", + "bitte", + "nixpkgs-unstable" + ], + "rust-analyzer-src": "rust-analyzer-src_4" + }, "locked": { - "lastModified": 1608537748, - "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", - "owner": "input-output-hk", - "repo": "cardano-shell", - "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "lastModified": 1660631227, + "narHash": "sha256-LSXmaDhbPw+3ww63Rx5ewBNWwCQIrzQvzphCFm5BRbU=", + "owner": "nix-community", + "repo": "fenix", + "rev": "41731c1a7ba1441c7544e8a0387aaf58e48f26b8", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cardano-shell", + "owner": "nix-community", + "repo": "fenix", "type": "github" } }, - "cardano-shell_8": { - "flake": false, + "fenix_5": { + "inputs": { + "nixpkgs": "nixpkgs_42", + "rust-analyzer-src": "rust-analyzer-src_5" + }, "locked": { - "lastModified": 1608537748, - "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", - "owner": "input-output-hk", - "repo": "cardano-shell", - "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "lastModified": 1645165506, + "narHash": "sha256-PClhTeC1EhkHUQQmP9XyiR7y1d6hlEc7QY8nN1GuAzQ=", + "owner": "nix-community", + "repo": "fenix", + "rev": "380b82e3d3381b32f11dfe024cb7d135e36d0168", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cardano-shell", + "owner": "nix-community", + "repo": "fenix", "type": "github" } }, - "cardano-shell_9": { - "flake": false, - "locked": { - "lastModified": 1608537748, - "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", - "owner": "input-output-hk", - "repo": "cardano-shell", - "rev": "9392c75087cb9a3d453998f4230930dea3a95725", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "cardano-shell", - "type": "github" - } - }, - "cardano-wallet": { + "fenix_6": { "inputs": { - "customConfig": "customConfig", - "ema": "ema", - "emanote": "emanote", - "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_20", - "haskellNix": "haskellNix", - "hostNixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "cardano-wallet", - "nixpkgs" - ], - "iohkNix": "iohkNix", "nixpkgs": [ "ctl", "db-sync", "cardano-world", - "cardano-wallet", - "haskellNix", + "capsules", + "bitte", "nixpkgs-unstable" - ] + ], + "rust-analyzer-src": "rust-analyzer-src_6" }, "locked": { - "lastModified": 1656674685, - "narHash": "sha256-Uq02O758v7U61a9Ol6VzSDyx3S/CVHn0l/OUM1UYJkY=", - "owner": "input-output-hk", - "repo": "cardano-wallet", - "rev": "c0ece6ad1868682b074708ffb810bdc2ea96934f", + "lastModified": 1649226351, + "narHash": "sha256-5fQwF5kYpPC7w0SOfdbE9Z7o5/i/dyo1BxMLVCA2h3E=", + "owner": "nix-community", + "repo": "fenix", + "rev": "c7e184561fe843abb861cd7d22c23066987078e2", "type": "github" }, "original": { - "owner": "input-output-hk", - "ref": "v2022-07-01", - "repo": "cardano-wallet", + "owner": "nix-community", + "repo": "fenix", "type": "github" } }, - "cardano-wallet_2": { + "flake-compat": { "flake": false, "locked": { - "lastModified": 1671029634, - "narHash": "sha256-lz3bi711qORionkcfduC+AXGP6Ii+uWiVHRmRZmvfb8=", + "lastModified": 1647532380, + "narHash": "sha256-wswAxyO8AJTH7d5oU8VK82yBCpqwA+p6kLgpb1f1PAY=", "owner": "input-output-hk", - "repo": "cardano-wallet", - "rev": "bbf11d4feefd5b770fb36717ec5c4c5c112aca87", + "repo": "flake-compat", + "rev": "7da118186435255a30b5ffeabba9629c344c0bec", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "cardano-wallet", - "rev": "bbf11d4feefd5b770fb36717ec5c4c5c112aca87", + "ref": "fixes", + "repo": "flake-compat", "type": "github" } }, - "cardano-world": { - "inputs": { - "bitte": "bitte", - "bitte-cells": "bitte-cells", - "byron-chain": "byron-chain", - "capsules": "capsules_2", - "cardano-db-sync": [ - "ctl", - "db-sync" - ], - "cardano-explorer-app": "cardano-explorer-app", - "cardano-graphql": "cardano-graphql", - "cardano-node": "cardano-node", - "cardano-wallet": "cardano-wallet", - "data-merge": "data-merge_3", - "flake-compat": "flake-compat_6", - "hackage": "hackage_3", - "haskell-nix": "haskell-nix_2", - "iohk-nix": "iohk-nix", - "n2c": "n2c_2", - "nix-inclusive": "nix-inclusive", - "nixpkgs": "nixpkgs_56", - "nixpkgs-haskell": [ - "ctl", - "db-sync", - "cardano-world", - "haskell-nix", - "nixpkgs-unstable" - ], - "ogmios": "ogmios", - "std": "std_2", - "tullia": "tullia" - }, + "flake-compat_10": { + "flake": false, "locked": { - "lastModified": 1662508244, - "narHash": "sha256-s8kroVd8VAZ/Lfv2gNt+RzIuSnWpQxAAL0y90tn1i0o=", + "lastModified": 1647532380, + "narHash": "sha256-wswAxyO8AJTH7d5oU8VK82yBCpqwA+p6kLgpb1f1PAY=", "owner": "input-output-hk", - "repo": "cardano-world", - "rev": "0b6dcb5b61a0f7a2c048cb757463cbc0dfa0fe24", + "repo": "flake-compat", + "rev": "7da118186435255a30b5ffeabba9629c344c0bec", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "cardano-world", + "ref": "fixes", + "repo": "flake-compat", "type": "github" } }, - "cicero": { - "inputs": { - "alejandra": "alejandra", - "data-merge": "data-merge_2", - "devshell": "devshell_7", - "driver": "driver", - "follower": "follower", - "haskell-nix": "haskell-nix", - "inclusive": "inclusive_8", - "nix": "nix_7", - "nix-cache-proxy": "nix-cache-proxy", - "nixpkgs": "nixpkgs_32", - "poetry2nix": "poetry2nix", - "utils": "utils_14" - }, + "flake-compat_11": { + "flake": false, "locked": { - "lastModified": 1647522107, - "narHash": "sha256-Kti1zv+GXnbujkJ0ODB2ukq4Eb2RVOpudZ1xVDhhbes=", - "owner": "input-output-hk", - "repo": "cicero", - "rev": "0fd8642fe437f6129fe6914f032d3fdc7591d4fe", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cicero", + "owner": "edolstra", + "repo": "flake-compat", "type": "github" } }, - "ctl": { - "inputs": { - "CHaP": "CHaP", - "blockfrost": "blockfrost", - "cardano-configurations": "cardano-configurations", - "cardano-node": [ - "ctl", - "ogmios-nixos", - "cardano-node" - ], - "db-sync": "db-sync", - "easy-purescript-nix": "easy-purescript-nix", - "flake-compat": "flake-compat_8", - "haskell-nix": "haskell-nix_3", - "iohk-nix": [ - "ctl", - "plutip", - "iohk-nix" - ], - "iohk-nix-environments": "iohk-nix-environments", - "kupo": "kupo", - "kupo-nixos": "kupo-nixos", - "nixpkgs": [ - "ctl", - "ogmios", - "nixpkgs" - ], - "ogmios": "ogmios_2", - "ogmios-nixos": "ogmios-nixos", - "plutip": "plutip", - "plutip-nixpkgs": [ - "ctl", - "plutip", - "nixpkgs" - ] - }, + "flake-compat_12": { + "flake": false, "locked": { - "lastModified": 1697553030, - "narHash": "sha256-noK4fgwvaV3rlLVPnW2wH3WScYVgJ/M/fc+F1tQ8i40=", - "owner": "Plutonomicon", - "repo": "cardano-transaction-lib", - "rev": "6e4debe87ddbafaa3c77033888f9c998e28cd7ca", + "lastModified": 1672831974, + "narHash": "sha256-z9k3MfslLjWQfnjBtEtJZdq3H7kyi2kQtUThfTgdRk0=", + "owner": "input-output-hk", + "repo": "flake-compat", + "rev": "45f2638735f8cdc40fe302742b79f248d23eb368", "type": "github" }, "original": { - "owner": "Plutonomicon", - "repo": "cardano-transaction-lib", - "rev": "6e4debe87ddbafaa3c77033888f9c998e28cd7ca", + "owner": "input-output-hk", + "ref": "hkm/gitlab-fix", + "repo": "flake-compat", "type": "github" } }, - "customConfig": { + "flake-compat_13": { + "flake": false, "locked": { - "lastModified": 1630400035, - "narHash": "sha256-MWaVOCzuFwp09wZIW9iHq5wWen5C69I940N1swZLEQ0=", - "owner": "input-output-hk", - "repo": "empty-flake", - "rev": "2040a05b67bf9a669ce17eca56beb14b4206a99a", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "empty-flake", + "owner": "edolstra", + "repo": "flake-compat", "type": "github" } }, - "customConfig_10": { + "flake-compat_14": { + "flake": false, "locked": { - "lastModified": 1630400035, - "narHash": "sha256-MWaVOCzuFwp09wZIW9iHq5wWen5C69I940N1swZLEQ0=", - "owner": "input-output-hk", - "repo": "empty-flake", - "rev": "2040a05b67bf9a669ce17eca56beb14b4206a99a", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "empty-flake", + "owner": "edolstra", + "repo": "flake-compat", "type": "github" } }, - "customConfig_2": { + "flake-compat_15": { + "flake": false, "locked": { - "lastModified": 1, - "narHash": "sha256-Zd5w1I1Dwt783Q4WuBuCpedcwG1DrIgQGqabyF87prM=", - "path": "./custom-config", - "type": "path" + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" }, "original": { - "path": "./custom-config", - "type": "path" + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" } }, - "customConfig_3": { + "flake-compat_2": { + "flake": false, "locked": { - "lastModified": 1630400035, - "narHash": "sha256-MWaVOCzuFwp09wZIW9iHq5wWen5C69I940N1swZLEQ0=", + "lastModified": 1672831974, + "narHash": "sha256-z9k3MfslLjWQfnjBtEtJZdq3H7kyi2kQtUThfTgdRk0=", "owner": "input-output-hk", - "repo": "empty-flake", - "rev": "2040a05b67bf9a669ce17eca56beb14b4206a99a", + "repo": "flake-compat", + "rev": "45f2638735f8cdc40fe302742b79f248d23eb368", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "empty-flake", + "ref": "hkm/gitlab-fix", + "repo": "flake-compat", "type": "github" } }, - "customConfig_4": { + "flake-compat_3": { + "flake": false, "locked": { - "lastModified": 1630400035, - "narHash": "sha256-MWaVOCzuFwp09wZIW9iHq5wWen5C69I940N1swZLEQ0=", - "owner": "input-output-hk", - "repo": "empty-flake", - "rev": "2040a05b67bf9a669ce17eca56beb14b4206a99a", + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "empty-flake", + "owner": "edolstra", + "repo": "flake-compat", "type": "github" } }, - "customConfig_5": { + "flake-compat_4": { + "flake": false, "locked": { - "lastModified": 1630400035, - "narHash": "sha256-MWaVOCzuFwp09wZIW9iHq5wWen5C69I940N1swZLEQ0=", - "owner": "input-output-hk", - "repo": "empty-flake", - "rev": "2040a05b67bf9a669ce17eca56beb14b4206a99a", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "empty-flake", - "type": "github" - } - }, - "customConfig_6": { - "locked": { - "lastModified": 1630400035, - "narHash": "sha256-MWaVOCzuFwp09wZIW9iHq5wWen5C69I940N1swZLEQ0=", - "owner": "input-output-hk", - "repo": "empty-flake", - "rev": "2040a05b67bf9a669ce17eca56beb14b4206a99a", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "empty-flake", - "type": "github" - } - }, - "customConfig_7": { - "locked": { - "lastModified": 1630400035, - "narHash": "sha256-MWaVOCzuFwp09wZIW9iHq5wWen5C69I940N1swZLEQ0=", - "owner": "input-output-hk", - "repo": "empty-flake", - "rev": "2040a05b67bf9a669ce17eca56beb14b4206a99a", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "empty-flake", - "type": "github" - } - }, - "customConfig_8": { - "locked": { - "lastModified": 1630400035, - "narHash": "sha256-MWaVOCzuFwp09wZIW9iHq5wWen5C69I940N1swZLEQ0=", - "owner": "input-output-hk", - "repo": "empty-flake", - "rev": "2040a05b67bf9a669ce17eca56beb14b4206a99a", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "empty-flake", - "type": "github" - } - }, - "customConfig_9": { - "locked": { - "lastModified": 1630400035, - "narHash": "sha256-MWaVOCzuFwp09wZIW9iHq5wWen5C69I940N1swZLEQ0=", - "owner": "input-output-hk", - "repo": "empty-flake", - "rev": "2040a05b67bf9a669ce17eca56beb14b4206a99a", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "empty-flake", - "type": "github" - } - }, - "data-merge": { - "inputs": { - "nixlib": "nixlib", - "yants": "yants" - }, - "locked": { - "lastModified": 1648237091, - "narHash": "sha256-OtgcOt/CB0/9S0rh1eAog+AvAg9kF6GyAknyWOXiAZI=", - "owner": "divnix", - "repo": "data-merge", - "rev": "b21bcf7bd949ac92af3930ecb1d3df8786384722", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "data-merge", - "type": "github" - } - }, - "data-merge_2": { - "inputs": { - "nixlib": "nixlib_2" - }, - "locked": { - "lastModified": 1635967744, - "narHash": "sha256-01065dNad3BIepNzrpYuYInxq/ynqtGMSsIiNqjND7E=", - "owner": "divnix", - "repo": "data-merge", - "rev": "68bd71f980f75cf73bc5071982eddfe6bc089768", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "data-merge", - "type": "github" - } - }, - "data-merge_3": { - "inputs": { - "nixlib": "nixlib_3", - "yants": "yants_3" - }, - "locked": { - "lastModified": 1655854240, - "narHash": "sha256-j74ixD7Y0bF3h0fBJFKPR9botlrMu0fgG/YsiUKybko=", - "owner": "divnix", - "repo": "data-merge", - "rev": "0bbe0a68d4ee090b8bbad0c5e1e85060d2bdfe98", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "data-merge", - "type": "github" - } - }, - "db-sync": { - "inputs": { - "cardano-world": "cardano-world", - "customConfig": "customConfig_2", - "flake-compat": "flake-compat_7", - "haskellNix": "haskellNix_2", - "iohkNix": "iohkNix_2", - "nixpkgs": [ - "ctl", - "db-sync", - "haskellNix", - "nixpkgs-unstable" - ], - "utils": "utils_21" - }, - "locked": { - "lastModified": 1670313550, - "narHash": "sha256-Gkn/hyK0xiDJZY1O5JEwuosMzar+IskC9xxeBts+0H4=", - "owner": "input-output-hk", - "repo": "cardano-db-sync", - "rev": "1040fa9ec85fd75ce9f02dae2006170136793d02", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "13.1.0.0", - "repo": "cardano-db-sync", - "type": "github" - } - }, - "deploy": { - "inputs": { - "fenix": "fenix", - "flake-compat": "flake-compat", - "nixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "bitte", - "capsules", - "bitte", - "deploy", - "fenix", - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1638318651, - "narHash": "sha256-YsYBMa8Chtb6ccGZOVStReiZ33ZNmi7kNPLf/Ua2kY8=", - "owner": "input-output-hk", - "repo": "deploy-rs", - "rev": "1d3a4f4681a98479219c628165bb6b3a12eae843", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "deploy-rs", - "type": "github" - } - }, - "deploy_2": { - "inputs": { - "fenix": "fenix_3", - "flake-compat": "flake-compat_2", - "nixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "bitte", - "deploy", - "fenix", - "nixpkgs" - ], - "utils": "utils_7" - }, - "locked": { - "lastModified": 1638318651, - "narHash": "sha256-YsYBMa8Chtb6ccGZOVStReiZ33ZNmi7kNPLf/Ua2kY8=", - "owner": "input-output-hk", - "repo": "deploy-rs", - "rev": "1d3a4f4681a98479219c628165bb6b3a12eae843", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "deploy-rs", - "type": "github" - } - }, - "deploy_3": { - "inputs": { - "fenix": "fenix_5", - "flake-compat": "flake-compat_3", - "nixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "capsules", - "bitte", - "deploy", - "fenix", - "nixpkgs" - ], - "utils": "utils_15" - }, - "locked": { - "lastModified": 1638318651, - "narHash": "sha256-YsYBMa8Chtb6ccGZOVStReiZ33ZNmi7kNPLf/Ua2kY8=", - "owner": "input-output-hk", - "repo": "deploy-rs", - "rev": "1d3a4f4681a98479219c628165bb6b3a12eae843", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "deploy-rs", - "type": "github" - } - }, - "devshell": { - "locked": { - "lastModified": 1632436039, - "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", - "owner": "numtide", - "repo": "devshell", - "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_10": { - "locked": { - "lastModified": 1636119665, - "narHash": "sha256-e11Z9PyH9hdgTm4Vyl8S5iTwrv0um6+srzb1Ba+YUHA=", - "owner": "numtide", - "repo": "devshell", - "rev": "ab14b1a3cb253f58e02f5f849d621292fbf81fad", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_11": { - "locked": { - "lastModified": 1632436039, - "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", - "owner": "numtide", - "repo": "devshell", - "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_12": { - "locked": { - "lastModified": 1636119665, - "narHash": "sha256-e11Z9PyH9hdgTm4Vyl8S5iTwrv0um6+srzb1Ba+YUHA=", - "owner": "numtide", - "repo": "devshell", - "rev": "ab14b1a3cb253f58e02f5f849d621292fbf81fad", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_13": { - "locked": { - "lastModified": 1637098489, - "narHash": "sha256-IWBYLSNSENI/fTrXdYDhuCavxcgN9+RERrPM81f6DXY=", - "owner": "numtide", - "repo": "devshell", - "rev": "e8c2d4967b5c498b12551d1bb49352dcf9efa3e4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_14": { - "inputs": { - "flake-utils": [ - "ctl", - "db-sync", - "cardano-world", - "std", - "flake-utils" - ], - "nixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1658746384, - "narHash": "sha256-CCJcoMOcXyZFrV1ag4XMTpAPjLWb4Anbv+ktXFI1ry0=", - "owner": "numtide", - "repo": "devshell", - "rev": "0ffc7937bb5e8141af03d462b468bd071eb18e1b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_15": { - "inputs": { - "flake-utils": "flake-utils_26", - "nixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1650900878, - "narHash": "sha256-qhNncMBSa9STnhiLfELEQpYC1L4GrYHNIzyCZ/pilsI=", - "owner": "numtide", - "repo": "devshell", - "rev": "d97df53b5ddaa1cfbea7cddbd207eb2634304733", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_16": { - "inputs": { - "flake-utils": [ - "ctl", - "ogmios", - "haskell-nix", - "tullia", - "std", - "flake-utils" - ], - "nixpkgs": [ - "ctl", - "ogmios", - "haskell-nix", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1663445644, - "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", - "owner": "numtide", - "repo": "devshell", - "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_17": { - "inputs": { - "flake-utils": [ - "ctl", - "ogmios-nixos", - "haskell-nix", - "tullia", - "std", - "flake-utils" - ], - "nixpkgs": [ - "ctl", - "ogmios-nixos", - "haskell-nix", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1663445644, - "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", - "owner": "numtide", - "repo": "devshell", - "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_2": { - "locked": { - "lastModified": 1636119665, - "narHash": "sha256-e11Z9PyH9hdgTm4Vyl8S5iTwrv0um6+srzb1Ba+YUHA=", - "owner": "numtide", - "repo": "devshell", - "rev": "ab14b1a3cb253f58e02f5f849d621292fbf81fad", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_3": { - "locked": { - "lastModified": 1637098489, - "narHash": "sha256-IWBYLSNSENI/fTrXdYDhuCavxcgN9+RERrPM81f6DXY=", - "owner": "numtide", - "repo": "devshell", - "rev": "e8c2d4967b5c498b12551d1bb49352dcf9efa3e4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_4": { - "locked": { - "lastModified": 1632436039, - "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", - "owner": "numtide", - "repo": "devshell", - "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_5": { - "locked": { - "lastModified": 1636119665, - "narHash": "sha256-e11Z9PyH9hdgTm4Vyl8S5iTwrv0um6+srzb1Ba+YUHA=", - "owner": "numtide", - "repo": "devshell", - "rev": "ab14b1a3cb253f58e02f5f849d621292fbf81fad", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_6": { - "inputs": { - "flake-utils": [ - "ctl", - "db-sync", - "cardano-world", - "bitte", - "std", - "flake-utils" - ], - "nixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "bitte", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1658746384, - "narHash": "sha256-CCJcoMOcXyZFrV1ag4XMTpAPjLWb4Anbv+ktXFI1ry0=", - "owner": "numtide", - "repo": "devshell", - "rev": "0ffc7937bb5e8141af03d462b468bd071eb18e1b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_7": { - "inputs": { - "flake-utils": "flake-utils_10", - "nixpkgs": "nixpkgs_29" - }, - "locked": { - "lastModified": 1644227066, - "narHash": "sha256-FHcFZtpZEWnUh62xlyY3jfXAXHzJNEDLDzLsJxn+ve0=", - "owner": "numtide", - "repo": "devshell", - "rev": "7033f64dd9ef8d9d8644c5030c73913351d2b660", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_8": { - "locked": { - "lastModified": 1632436039, - "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", - "owner": "numtide", - "repo": "devshell", - "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_9": { - "locked": { - "lastModified": 1636119665, - "narHash": "sha256-e11Z9PyH9hdgTm4Vyl8S5iTwrv0um6+srzb1Ba+YUHA=", - "owner": "numtide", - "repo": "devshell", - "rev": "ab14b1a3cb253f58e02f5f849d621292fbf81fad", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "dmerge": { - "inputs": { - "nixlib": [ - "ctl", - "db-sync", - "cardano-world", - "bitte", - "std", - "nixpkgs" - ], - "yants": [ - "ctl", - "db-sync", - "cardano-world", - "bitte", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1659548052, - "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", - "owner": "divnix", - "repo": "data-merge", - "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "data-merge", - "type": "github" - } - }, - "dmerge_2": { - "inputs": { - "nixlib": [ - "ctl", - "db-sync", - "cardano-world", - "std", - "nixpkgs" - ], - "yants": [ - "ctl", - "db-sync", - "cardano-world", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1659548052, - "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", - "owner": "divnix", - "repo": "data-merge", - "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "data-merge", - "type": "github" - } - }, - "dmerge_3": { - "inputs": { - "nixlib": [ - "ctl", - "ogmios", - "haskell-nix", - "tullia", - "std", - "nixpkgs" - ], - "yants": [ - "ctl", - "ogmios", - "haskell-nix", - "tullia", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1659548052, - "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", - "owner": "divnix", - "repo": "data-merge", - "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "data-merge", - "type": "github" - } - }, - "dmerge_4": { - "inputs": { - "nixlib": [ - "ctl", - "ogmios-nixos", - "haskell-nix", - "tullia", - "std", - "nixpkgs" - ], - "yants": [ - "ctl", - "ogmios-nixos", - "haskell-nix", - "tullia", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1659548052, - "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", - "owner": "divnix", - "repo": "data-merge", - "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "data-merge", - "type": "github" - } - }, - "driver": { - "inputs": { - "devshell": "devshell_8", - "inclusive": "inclusive_6", - "nix": "nix_6", - "nixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "bitte-cells", - "cicero", - "nixpkgs" - ], - "utils": "utils_11" - }, - "locked": { - "lastModified": 1644418487, - "narHash": "sha256-nzFmmBYjNjWVy25bHLLmZECfwJm3nxcAr/mYVYxWggA=", - "owner": "input-output-hk", - "repo": "nomad-driver-nix", - "rev": "7f7adb6814b4bf926597e4b810b803140176122c", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "nomad-driver-nix", - "type": "github" - } - }, - "easy-purescript-nix": { - "flake": false, - "locked": { - "lastModified": 1679861376, - "narHash": "sha256-LLqaLPJNiap2U8I77K5XVPGJA/Be30Z8lyGOyYXmBlc=", - "owner": "justinwoo", - "repo": "easy-purescript-nix", - "rev": "0c10ff170461aed0c336f5c21ed0f430c2c3574b", - "type": "github" - }, - "original": { - "owner": "justinwoo", - "repo": "easy-purescript-nix", - "rev": "0c10ff170461aed0c336f5c21ed0f430c2c3574b", - "type": "github" - } - }, - "ema": { - "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_17", - "nixpkgs": "nixpkgs_47", - "pre-commit-hooks": "pre-commit-hooks" - }, - "locked": { - "lastModified": 1646661767, - "narHash": "sha256-5zxUr3nO4r04K5WGrW/+nW84qbOW8wNJLt902yQmyF4=", - "owner": "srid", - "repo": "ema", - "rev": "bcabc170b7de9cdd83b4bbcf59130b54933602ea", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "ema", - "type": "github" - } - }, - "ema_2": { - "flake": false, - "locked": { - "lastModified": 1655231448, - "narHash": "sha256-LmAnOFKiqOWW9cQNZCbqFF0N1Mx073908voXz+4Fzic=", - "owner": "srid", - "repo": "ema", - "rev": "da5b29f03c1edfb7f947666a5a818fb97cc3c229", - "type": "github" - }, - "original": { - "owner": "srid", - "ref": "multisite", - "repo": "ema", - "type": "github" - } - }, - "emanote": { - "inputs": { - "ema": "ema_2", - "flake-parts": "flake-parts", - "haskell-flake": "haskell-flake", - "nixpkgs": "nixpkgs_50", - "tailwind-haskell": "tailwind-haskell" - }, - "locked": { - "lastModified": 1655823900, - "narHash": "sha256-YEDJxa2gPf2+GGyrkFz4EliCml1FyDualZtbbZEmljA=", - "owner": "srid", - "repo": "emanote", - "rev": "147528d9df81b881214652ce0cefec0b3d52965e", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "emanote", - "type": "github" - } - }, - "fenix": { - "inputs": { - "nixpkgs": "nixpkgs_6", - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1645165506, - "narHash": "sha256-PClhTeC1EhkHUQQmP9XyiR7y1d6hlEc7QY8nN1GuAzQ=", - "owner": "nix-community", - "repo": "fenix", - "rev": "380b82e3d3381b32f11dfe024cb7d135e36d0168", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "fenix_2": { - "inputs": { - "nixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "bitte", - "capsules", - "bitte", - "nixpkgs-unstable" - ], - "rust-analyzer-src": "rust-analyzer-src_2" - }, - "locked": { - "lastModified": 1649226351, - "narHash": "sha256-5fQwF5kYpPC7w0SOfdbE9Z7o5/i/dyo1BxMLVCA2h3E=", - "owner": "nix-community", - "repo": "fenix", - "rev": "c7e184561fe843abb861cd7d22c23066987078e2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "fenix_3": { - "inputs": { - "nixpkgs": "nixpkgs_19", - "rust-analyzer-src": "rust-analyzer-src_3" - }, - "locked": { - "lastModified": 1645165506, - "narHash": "sha256-PClhTeC1EhkHUQQmP9XyiR7y1d6hlEc7QY8nN1GuAzQ=", - "owner": "nix-community", - "repo": "fenix", - "rev": "380b82e3d3381b32f11dfe024cb7d135e36d0168", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "fenix_4": { - "inputs": { - "nixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "bitte", - "nixpkgs-unstable" - ], - "rust-analyzer-src": "rust-analyzer-src_4" - }, - "locked": { - "lastModified": 1660631227, - "narHash": "sha256-LSXmaDhbPw+3ww63Rx5ewBNWwCQIrzQvzphCFm5BRbU=", - "owner": "nix-community", - "repo": "fenix", - "rev": "41731c1a7ba1441c7544e8a0387aaf58e48f26b8", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "fenix_5": { - "inputs": { - "nixpkgs": "nixpkgs_35", - "rust-analyzer-src": "rust-analyzer-src_5" - }, - "locked": { - "lastModified": 1645165506, - "narHash": "sha256-PClhTeC1EhkHUQQmP9XyiR7y1d6hlEc7QY8nN1GuAzQ=", - "owner": "nix-community", - "repo": "fenix", - "rev": "380b82e3d3381b32f11dfe024cb7d135e36d0168", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "fenix_6": { - "inputs": { - "nixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "capsules", - "bitte", - "nixpkgs-unstable" - ], - "rust-analyzer-src": "rust-analyzer-src_6" - }, - "locked": { - "lastModified": 1649226351, - "narHash": "sha256-5fQwF5kYpPC7w0SOfdbE9Z7o5/i/dyo1BxMLVCA2h3E=", - "owner": "nix-community", - "repo": "fenix", - "rev": "c7e184561fe843abb861cd7d22c23066987078e2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1627913399, - "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_10": { - "flake": false, - "locked": { - "lastModified": 1635892615, - "narHash": "sha256-harGbMZr4hzat2BWBU+Y5OYXlu+fVz7E4WeQzHi5o8A=", - "owner": "input-output-hk", - "repo": "flake-compat", - "rev": "eca47d3377946315596da653862d341ee5341318", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_11": { - "flake": false, - "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_12": { - "flake": false, - "locked": { - "lastModified": 1635892615, - "narHash": "sha256-harGbMZr4hzat2BWBU+Y5OYXlu+fVz7E4WeQzHi5o8A=", - "owner": "input-output-hk", - "repo": "flake-compat", - "rev": "eca47d3377946315596da653862d341ee5341318", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_13": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_14": { - "flake": false, - "locked": { - "lastModified": 1647532380, - "narHash": "sha256-wswAxyO8AJTH7d5oU8VK82yBCpqwA+p6kLgpb1f1PAY=", - "owner": "input-output-hk", - "repo": "flake-compat", - "rev": "7da118186435255a30b5ffeabba9629c344c0bec", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "fixes", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_15": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_16": { - "flake": false, - "locked": { - "lastModified": 1635892615, - "narHash": "sha256-harGbMZr4hzat2BWBU+Y5OYXlu+fVz7E4WeQzHi5o8A=", - "owner": "input-output-hk", - "repo": "flake-compat", - "rev": "eca47d3377946315596da653862d341ee5341318", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_17": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_18": { - "flake": false, - "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_19": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1627913399, - "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1627913399, - "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1635892615, - "narHash": "sha256-harGbMZr4hzat2BWBU+Y5OYXlu+fVz7E4WeQzHi5o8A=", - "owner": "input-output-hk", - "repo": "flake-compat", - "rev": "eca47d3377946315596da653862d341ee5341318", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_7": { - "flake": false, - "locked": { - "lastModified": 1647532380, - "narHash": "sha256-wswAxyO8AJTH7d5oU8VK82yBCpqwA+p6kLgpb1f1PAY=", - "owner": "input-output-hk", - "repo": "flake-compat", - "rev": "7da118186435255a30b5ffeabba9629c344c0bec", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "fixes", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_8": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_9": { - "flake": false, - "locked": { - "lastModified": 1647532380, - "narHash": "sha256-wswAxyO8AJTH7d5oU8VK82yBCpqwA+p6kLgpb1f1PAY=", - "owner": "input-output-hk", - "repo": "flake-compat", - "rev": "7da118186435255a30b5ffeabba9629c344c0bec", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "fixes", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs": "nixpkgs_49" - }, - "locked": { - "lastModified": 1655570068, - "narHash": "sha256-KUSd2a6KgYTHd2l3Goee/P+DrAC6n1Tau+7V68czSZU=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "6dbc77b9c0477f8a9a6a9081077bb38c6a3dbb3a", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_10": { - "locked": { - "lastModified": 1642700792, - "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_11": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_12": { - "locked": { - "lastModified": 1610051610, - "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_13": { - "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_14": { - "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_15": { - "locked": { - "lastModified": 1634851050, - "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_16": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_17": { - "locked": { - "lastModified": 1642700792, - "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_18": { - "locked": { - "lastModified": 1619345332, - "narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "2ebf2558e5bf978c7fb8ea927dfaed8fefab2e28", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_19": { - "locked": { - "lastModified": 1652776076, - "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", - "type": "github" - }, - "original": { - "owner": "numtide", - "ref": "v1.0.0", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_20": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_21": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_22": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_23": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_24": { - "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_25": { - "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_26": { - "locked": { - "lastModified": 1642700792, - "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_27": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_28": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_29": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_30": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_31": { - "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_32": { - "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_33": { - "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_34": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_35": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_36": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_37": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_38": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_39": { - "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "locked": { - "lastModified": 1634851050, - "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_40": { - "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_41": { - "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_42": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_43": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_44": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_45": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_46": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { - "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_7": { - "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_8": { - "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_9": { - "locked": { - "lastModified": 1634851050, - "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flakeCompat": { - "flake": false, - "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "follower": { - "inputs": { - "devshell": "devshell_9", - "inclusive": "inclusive_7", - "nixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "bitte-cells", - "cicero", - "nixpkgs" - ], - "utils": "utils_12" - }, - "locked": { - "lastModified": 1642008295, - "narHash": "sha256-yx3lLN/hlvEeKItHJ5jH0KSm84IruTWMo78IItVPji4=", - "owner": "input-output-hk", - "repo": "nomad-follower", - "rev": "b1b0b00e940026f72d16bdf13e36ad20f1826e8a", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "nomad-follower", - "type": "github" - } - }, - "ghc-8.6.5-iohk": { - "flake": false, - "locked": { - "lastModified": 1600920045, - "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", - "owner": "input-output-hk", - "repo": "ghc", - "rev": "95713a6ecce4551240da7c96b6176f980af75cae", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "release/8.6.5-iohk", - "repo": "ghc", - "type": "github" - } - }, - "ghc-8.6.5-iohk_10": { - "flake": false, - "locked": { - "lastModified": 1600920045, - "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", - "owner": "input-output-hk", - "repo": "ghc", - "rev": "95713a6ecce4551240da7c96b6176f980af75cae", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "release/8.6.5-iohk", - "repo": "ghc", - "type": "github" - } - }, - "ghc-8.6.5-iohk_11": { - "flake": false, - "locked": { - "lastModified": 1600920045, - "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", - "owner": "input-output-hk", - "repo": "ghc", - "rev": "95713a6ecce4551240da7c96b6176f980af75cae", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "release/8.6.5-iohk", - "repo": "ghc", - "type": "github" - } - }, - "ghc-8.6.5-iohk_12": { - "flake": false, - "locked": { - "lastModified": 1600920045, - "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", - "owner": "input-output-hk", - "repo": "ghc", - "rev": "95713a6ecce4551240da7c96b6176f980af75cae", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "release/8.6.5-iohk", - "repo": "ghc", - "type": "github" - } - }, - "ghc-8.6.5-iohk_13": { - "flake": false, - "locked": { - "lastModified": 1600920045, - "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", - "owner": "input-output-hk", - "repo": "ghc", - "rev": "95713a6ecce4551240da7c96b6176f980af75cae", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "release/8.6.5-iohk", - "repo": "ghc", - "type": "github" - } - }, - "ghc-8.6.5-iohk_14": { - "flake": false, - "locked": { - "lastModified": 1600920045, - "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", - "owner": "input-output-hk", - "repo": "ghc", - "rev": "95713a6ecce4551240da7c96b6176f980af75cae", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "release/8.6.5-iohk", - "repo": "ghc", - "type": "github" - } - }, - "ghc-8.6.5-iohk_15": { - "flake": false, - "locked": { - "lastModified": 1600920045, - "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", - "owner": "input-output-hk", - "repo": "ghc", - "rev": "95713a6ecce4551240da7c96b6176f980af75cae", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "release/8.6.5-iohk", - "repo": "ghc", - "type": "github" - } - }, - "ghc-8.6.5-iohk_16": { - "flake": false, - "locked": { - "lastModified": 1600920045, - "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", - "owner": "input-output-hk", - "repo": "ghc", - "rev": "95713a6ecce4551240da7c96b6176f980af75cae", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "release/8.6.5-iohk", - "repo": "ghc", - "type": "github" - } - }, - "ghc-8.6.5-iohk_17": { - "flake": false, - "locked": { - "lastModified": 1600920045, - "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", - "owner": "input-output-hk", - "repo": "ghc", - "rev": "95713a6ecce4551240da7c96b6176f980af75cae", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "release/8.6.5-iohk", - "repo": "ghc", - "type": "github" - } - }, - "ghc-8.6.5-iohk_2": { - "flake": false, - "locked": { - "lastModified": 1600920045, - "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", - "owner": "input-output-hk", - "repo": "ghc", - "rev": "95713a6ecce4551240da7c96b6176f980af75cae", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "release/8.6.5-iohk", - "repo": "ghc", - "type": "github" - } - }, - "ghc-8.6.5-iohk_3": { - "flake": false, - "locked": { - "lastModified": 1600920045, - "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", - "owner": "input-output-hk", - "repo": "ghc", - "rev": "95713a6ecce4551240da7c96b6176f980af75cae", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "release/8.6.5-iohk", - "repo": "ghc", - "type": "github" - } - }, - "ghc-8.6.5-iohk_4": { - "flake": false, - "locked": { - "lastModified": 1600920045, - "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", - "owner": "input-output-hk", - "repo": "ghc", - "rev": "95713a6ecce4551240da7c96b6176f980af75cae", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "release/8.6.5-iohk", - "repo": "ghc", - "type": "github" - } - }, - "ghc-8.6.5-iohk_5": { - "flake": false, - "locked": { - "lastModified": 1600920045, - "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", - "owner": "input-output-hk", - "repo": "ghc", - "rev": "95713a6ecce4551240da7c96b6176f980af75cae", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "release/8.6.5-iohk", - "repo": "ghc", - "type": "github" - } - }, - "ghc-8.6.5-iohk_6": { - "flake": false, - "locked": { - "lastModified": 1600920045, - "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", - "owner": "input-output-hk", - "repo": "ghc", - "rev": "95713a6ecce4551240da7c96b6176f980af75cae", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "release/8.6.5-iohk", - "repo": "ghc", - "type": "github" - } - }, - "ghc-8.6.5-iohk_7": { - "flake": false, - "locked": { - "lastModified": 1600920045, - "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", - "owner": "input-output-hk", - "repo": "ghc", - "rev": "95713a6ecce4551240da7c96b6176f980af75cae", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "release/8.6.5-iohk", - "repo": "ghc", - "type": "github" - } - }, - "ghc-8.6.5-iohk_8": { - "flake": false, - "locked": { - "lastModified": 1600920045, - "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", - "owner": "input-output-hk", - "repo": "ghc", - "rev": "95713a6ecce4551240da7c96b6176f980af75cae", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "release/8.6.5-iohk", - "repo": "ghc", - "type": "github" - } - }, - "ghc-8.6.5-iohk_9": { - "flake": false, - "locked": { - "lastModified": 1600920045, - "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", - "owner": "input-output-hk", - "repo": "ghc", - "rev": "95713a6ecce4551240da7c96b6176f980af75cae", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "release/8.6.5-iohk", - "repo": "ghc", - "type": "github" - } - }, - "gomod2nix": { - "inputs": { - "nixpkgs": "nixpkgs_70", - "utils": "utils_26" - }, - "locked": { - "lastModified": 1655245309, - "narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=", - "owner": "tweag", - "repo": "gomod2nix", - "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58", - "type": "github" - }, - "original": { - "owner": "tweag", - "repo": "gomod2nix", - "type": "github" - } - }, - "gomod2nix_2": { - "inputs": { - "nixpkgs": "nixpkgs_78", - "utils": "utils_31" - }, - "locked": { - "lastModified": 1655245309, - "narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=", - "owner": "tweag", - "repo": "gomod2nix", - "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58", - "type": "github" - }, - "original": { - "owner": "tweag", - "repo": "gomod2nix", - "type": "github" - } - }, - "hackage": { - "flake": false, - "locked": { - "lastModified": 1646097829, - "narHash": "sha256-PcHDDV8NuUxZhPV/p++IkZC+SDZ1Db7m7K+9HN4/0S4=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "283f096976b48e54183905e7bdde7f213c6ee5cd", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" - } - }, - "hackageNix": { - "flake": false, - "locked": { - "lastModified": 1665882657, - "narHash": "sha256-3eiHY9Lt2vTeMsrT6yssbd+nfx/i5avfxosigx7bCxU=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "8e5b6856f99ed790c387fa76bdad9dcc94b3a54c", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" - } - }, - "hackageNix_2": { - "flake": false, - "locked": { - "lastModified": 1656898050, - "narHash": "sha256-jemAb/Wm/uT+QhV12GlyeA5euSWxYzr2HOYoK4MZps0=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "4f1dd530219ca1165f523ffb2c62213ebede4046", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" - } - }, - "hackage_10": { - "flake": false, - "locked": { - "lastModified": 1669857312, - "narHash": "sha256-m0jYF2gOKTaCcedV+dZkCjVbfv0CWkRziCeEk/NF/34=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "8299f5acc68f0e91563e7688f24cbc70391600bf", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" - } - }, - "hackage_11": { - "flake": false, - "locked": { - "lastModified": 1643073363, - "narHash": "sha256-66oSXQKEDIOSQ2uKAS9facCX/Zuh/jFgyFDtxEqN9sk=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "4ef9bd3a32316ce236164c7ebff00ebeb33236e2", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" - } - }, - "hackage_12": { - "flake": false, - "locked": { - "lastModified": 1643073363, - "narHash": "sha256-66oSXQKEDIOSQ2uKAS9facCX/Zuh/jFgyFDtxEqN9sk=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "4ef9bd3a32316ce236164c7ebff00ebeb33236e2", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" - } - }, - "hackage_13": { - "flake": false, - "locked": { - "lastModified": 1639098768, - "narHash": "sha256-DZ4sG8FeDxWvBLixrj0jELXjtebZ0SCCPmQW43HNzIE=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "c7b123af6b0b9b364cab03363504d42dca16a4b5", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" - } - }, - "hackage_14": { - "flake": false, - "locked": { - "lastModified": 1667783503, - "narHash": "sha256-25ZZPMQi9YQbXz3tZYPECVUI0FAQkJcDUIA/v8+mo9E=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "1f77f69e6dd92b5130cbe681b74e8fc0d29d63ff", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" - } - }, - "hackage_15": { - "flake": false, - "locked": { - "lastModified": 1653441966, - "narHash": "sha256-aJFK0wDzoOrtb7ucZzKh5J+S2pThpwNCofl74s1olXU=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "f7fe6ef8de52c43a9efa6fd4ac4902e5957dc573", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" - } - }, - "hackage_2": { - "flake": false, - "locked": { - "lastModified": 1655342080, - "narHash": "sha256-mF/clPxSJJkKAq6Y+0oYXrU3rGOuQXFN9btSde3uvvE=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "567e2e865d42d8e5cfe796bf03b6b38e42bc00ab", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" - } - }, - "hackage_3": { - "flake": false, - "locked": { - "lastModified": 1659489414, - "narHash": "sha256-AghgUkUv0hIBh+PvODngYL+ejwhCn2O2OUkVaAZYkCU=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "056c6ce7014adaf887b8e4cad15ef6fd926ea568", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" - } - }, - "hackage_4": { - "flake": false, - "locked": { - "lastModified": 1650935983, - "narHash": "sha256-wZTCKzA4f7nk5sIdP2BhGz5qkt6ex5VTC/53U2Y4i9Y=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "b65addc81b03406b3ee8b139549980591ed15be5", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" - } - }, - "hackage_5": { - "flake": false, - "locked": { - "lastModified": 1653441966, - "narHash": "sha256-aJFK0wDzoOrtb7ucZzKh5J+S2pThpwNCofl74s1olXU=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "f7fe6ef8de52c43a9efa6fd4ac4902e5957dc573", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" - } - }, - "hackage_6": { - "flake": false, - "locked": { - "lastModified": 1654219082, - "narHash": "sha256-sm59eg5wSrfIAjNXfBaaOBQ8daghF3g1NiGazYfj+no=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "fc90e7c5dea0483bacb01fc00bd2ab8f8e72500d", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" - } - }, - "hackage_7": { - "flake": false, - "locked": { - "lastModified": 1643073363, - "narHash": "sha256-66oSXQKEDIOSQ2uKAS9facCX/Zuh/jFgyFDtxEqN9sk=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "4ef9bd3a32316ce236164c7ebff00ebeb33236e2", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" - } - }, - "hackage_8": { - "flake": false, - "locked": { - "lastModified": 1643073363, - "narHash": "sha256-66oSXQKEDIOSQ2uKAS9facCX/Zuh/jFgyFDtxEqN9sk=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "4ef9bd3a32316ce236164c7ebff00ebeb33236e2", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" - } - }, - "hackage_9": { - "flake": false, - "locked": { - "lastModified": 1639098768, - "narHash": "sha256-DZ4sG8FeDxWvBLixrj0jELXjtebZ0SCCPmQW43HNzIE=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "c7b123af6b0b9b364cab03363504d42dca16a4b5", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" - } - }, - "haskell-flake": { - "locked": { - "lastModified": 1654001497, - "narHash": "sha256-GfrpyoQrVT9Z/j9its8BQs3I5O5X5Lc2IkK922bz7zg=", - "owner": "srid", - "repo": "haskell-flake", - "rev": "4c0b0ff295f0b97238a600d2381c37ee46b67f9c", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "haskell-flake", - "type": "github" - } - }, - "haskell-nix": { - "inputs": { - "HTTP": "HTTP", - "cabal-32": "cabal-32", - "cabal-34": "cabal-34", - "cabal-36": "cabal-36", - "cardano-shell": "cardano-shell", - "flake-utils": "flake-utils_11", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "hackage": "hackage", - "hpc-coveralls": "hpc-coveralls", - "nix-tools": "nix-tools", - "nixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "bitte-cells", - "cicero", - "haskell-nix", - "nixpkgs-unstable" - ], - "nixpkgs-2003": "nixpkgs-2003", - "nixpkgs-2105": "nixpkgs-2105", - "nixpkgs-2111": "nixpkgs-2111", - "nixpkgs-unstable": [ - "ctl", - "db-sync", - "cardano-world", - "bitte-cells", - "cicero", - "nixpkgs" - ], - "old-ghc-nix": "old-ghc-nix", - "stackage": "stackage" - }, - "locked": { - "lastModified": 1646097976, - "narHash": "sha256-EiyrBqayw67dw8pr1XCVU9tIZ+/jzXCQycW1S9a+KFA=", - "owner": "input-output-hk", - "repo": "haskell.nix", - "rev": "f0308ed1df3ce9f10f9da1a7c0c8591921d0b4e5", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "haskell.nix", - "type": "github" - } - }, - "haskell-nix_2": { - "inputs": { - "HTTP": "HTTP_3", - "cabal-32": "cabal-32_3", - "cabal-34": "cabal-34_3", - "cabal-36": "cabal-36_3", - "cardano-shell": "cardano-shell_3", - "flake-utils": "flake-utils_22", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_3", - "hackage": [ - "ctl", - "db-sync", - "cardano-world", - "hackage" - ], - "hpc-coveralls": "hpc-coveralls_3", - "hydra": "hydra_5", - "nix-tools": "nix-tools_3", - "nixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "haskell-nix", - "nixpkgs-unstable" - ], - "nixpkgs-2003": "nixpkgs-2003_3", - "nixpkgs-2105": "nixpkgs-2105_3", - "nixpkgs-2111": "nixpkgs-2111_3", - "nixpkgs-2205": "nixpkgs-2205", - "nixpkgs-unstable": "nixpkgs-unstable_5", - "old-ghc-nix": "old-ghc-nix_3", - "stackage": "stackage_3" - }, - "locked": { - "lastModified": 1659439444, - "narHash": "sha256-qUK7OVpM8/piOImpPgzSUvOFHQq19sQpvOSns2nW8es=", - "owner": "input-output-hk", - "repo": "haskell.nix", - "rev": "ee6a6559e16a603677d7cbef7c4fe18ca801b48e", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "haskell.nix", - "type": "github" - } - }, - "haskell-nix_3": { - "inputs": { - "HTTP": "HTTP_5", - "cabal-32": "cabal-32_5", - "cabal-34": "cabal-34_5", - "cabal-36": "cabal-36_5", - "cardano-shell": "cardano-shell_5", - "flake-utils": "flake-utils_28", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_5", - "hackage": "hackage_5", - "hpc-coveralls": "hpc-coveralls_5", - "hydra": "hydra_7", - "nix-tools": "nix-tools_5", - "nixpkgs": [ - "ctl", - "haskell-nix", - "nixpkgs-unstable" - ], - "nixpkgs-2003": "nixpkgs-2003_5", - "nixpkgs-2105": "nixpkgs-2105_5", - "nixpkgs-2111": "nixpkgs-2111_5", - "nixpkgs-unstable": "nixpkgs-unstable_7", - "old-ghc-nix": "old-ghc-nix_5", - "stackage": "stackage_5" - }, - "locked": { - "lastModified": 1674575951, - "narHash": "sha256-m1uLB0tMV3nO3O//09gNGmlxlnfwMgAQnM+MliVhofU=", - "owner": "mlabs-haskell", - "repo": "haskell.nix", - "rev": "1eaffea8eee8bc446fbc869288dab9a08f742c06", - "type": "github" - }, - "original": { - "owner": "mlabs-haskell", - "repo": "haskell.nix", - "type": "github" - } - }, - "haskell-nix_4": { - "inputs": { - "HTTP": "HTTP_6", - "cabal-32": "cabal-32_6", - "cabal-34": "cabal-34_6", - "cabal-36": "cabal-36_6", - "cardano-shell": "cardano-shell_6", - "flake-utils": "flake-utils_29", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_6", - "hackage": "hackage_6", - "hpc-coveralls": "hpc-coveralls_6", - "hydra": "hydra_8", - "nix-tools": "nix-tools_6", - "nixpkgs": [ - "ctl", - "kupo-nixos", - "haskell-nix", - "nixpkgs-unstable" - ], - "nixpkgs-2003": "nixpkgs-2003_6", - "nixpkgs-2105": "nixpkgs-2105_6", - "nixpkgs-2111": "nixpkgs-2111_6", - "nixpkgs-unstable": "nixpkgs-unstable_8", - "old-ghc-nix": "old-ghc-nix_6", - "stackage": "stackage_6" - }, - "locked": { - "lastModified": 1654219238, - "narHash": "sha256-PMS7uSQjYCjsjUfVidTdKcuNtKNu5VPmeNvxruT72go=", - "owner": "input-output-hk", - "repo": "haskell.nix", - "rev": "974a61451bb1d41b32090eb51efd7ada026d16d9", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "haskell.nix", - "rev": "974a61451bb1d41b32090eb51efd7ada026d16d9", - "type": "github" - } - }, - "haskell-nix_5": { - "inputs": { - "HTTP": "HTTP_11", - "cabal-32": "cabal-32_11", - "cabal-34": "cabal-34_11", - "cabal-36": "cabal-36_10", - "cardano-shell": "cardano-shell_11", - "flake-compat": "flake-compat_12", - "flake-utils": "flake-utils_34", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_11", - "hackage": "hackage_10", - "hpc-coveralls": "hpc-coveralls_11", - "hydra": "hydra_10", - "iserv-proxy": "iserv-proxy", - "nixpkgs": [ - "ctl", - "ogmios", - "nixpkgs" - ], - "nixpkgs-2003": "nixpkgs-2003_11", - "nixpkgs-2105": "nixpkgs-2105_11", - "nixpkgs-2111": "nixpkgs-2111_11", - "nixpkgs-2205": "nixpkgs-2205_3", - "nixpkgs-2211": "nixpkgs-2211", - "nixpkgs-unstable": "nixpkgs-unstable_13", - "old-ghc-nix": "old-ghc-nix_11", - "stackage": "stackage_11", - "tullia": "tullia_2" - }, - "locked": { - "lastModified": 1670464865, - "narHash": "sha256-OP4w1Cc2xXKya5GbViX2PwX4Gre/GyE2gT9NIVzcIyw=", - "owner": "input-output-hk", - "repo": "haskell.nix", - "rev": "6c992eacf65c19e29ae5296b11def11813179643", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "haskell.nix", - "type": "github" - } - }, - "haskell-nix_6": { - "inputs": { - "HTTP": "HTTP_16", - "cabal-32": "cabal-32_16", - "cabal-34": "cabal-34_16", - "cabal-36": "cabal-36_14", - "cardano-shell": "cardano-shell_16", - "flake-compat": "flake-compat_16", - "flake-utils": "flake-utils_42", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_16", - "hackage": "hackage_14", - "hpc-coveralls": "hpc-coveralls_16", - "hydra": "hydra_12", - "nixpkgs": [ - "ctl", - "ogmios-nixos", - "nixpkgs" - ], - "nixpkgs-2003": "nixpkgs-2003_16", - "nixpkgs-2105": "nixpkgs-2105_16", - "nixpkgs-2111": "nixpkgs-2111_16", - "nixpkgs-2205": "nixpkgs-2205_4", - "nixpkgs-unstable": "nixpkgs-unstable_18", - "old-ghc-nix": "old-ghc-nix_16", - "stackage": "stackage_16", - "tullia": "tullia_3" - }, - "locked": { - "lastModified": 1667783630, - "narHash": "sha256-IzbvNxsOVxHJGY70qAzaEOPmz4Fw93+4qLFd2on/ZAc=", - "owner": "input-output-hk", - "repo": "haskell.nix", - "rev": "f1f330065199dc4eca017bc21de0c67bc46df393", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "haskell.nix", - "type": "github" - } - }, - "haskell-nix_7": { - "inputs": { - "HTTP": "HTTP_17", - "cabal-32": "cabal-32_17", - "cabal-34": "cabal-34_17", - "cabal-36": "cabal-36_15", - "cardano-shell": "cardano-shell_17", - "flake-utils": "flake-utils_46", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_17", - "hackage": "hackage_15", - "hpc-coveralls": "hpc-coveralls_17", - "hydra": "hydra_13", - "nix-tools": "nix-tools_14", - "nixpkgs": [ - "ctl", - "plutip", - "haskell-nix", - "nixpkgs-unstable" - ], - "nixpkgs-2003": "nixpkgs-2003_17", - "nixpkgs-2105": "nixpkgs-2105_17", - "nixpkgs-2111": "nixpkgs-2111_17", - "nixpkgs-unstable": "nixpkgs-unstable_19", - "old-ghc-nix": "old-ghc-nix_17", - "stackage": "stackage_17" - }, - "locked": { - "lastModified": 1653486569, - "narHash": "sha256-342b0LPX6kaBuEX8KZV40FwCCFre1lCtjdTQIDEt9kw=", - "owner": "mlabs-haskell", - "repo": "haskell.nix", - "rev": "220f8a9cd166e726aea62843bdafa7ecded3375c", - "type": "github" - }, - "original": { - "owner": "mlabs-haskell", - "repo": "haskell.nix", - "type": "github" - } - }, - "haskellNix": { - "inputs": { - "HTTP": "HTTP_2", - "cabal-32": "cabal-32_2", - "cabal-34": "cabal-34_2", - "cabal-36": "cabal-36_2", - "cardano-shell": "cardano-shell_2", - "flake-utils": "flake-utils_21", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_2", - "hackage": "hackage_2", - "hpc-coveralls": "hpc-coveralls_2", - "hydra": "hydra_4", - "nix-tools": "nix-tools_2", - "nixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "cardano-wallet", - "nixpkgs" - ], - "nixpkgs-2003": "nixpkgs-2003_2", - "nixpkgs-2105": "nixpkgs-2105_2", - "nixpkgs-2111": "nixpkgs-2111_2", - "nixpkgs-unstable": "nixpkgs-unstable_4", - "old-ghc-nix": "old-ghc-nix_2", - "stackage": "stackage_2" - }, - "locked": { - "lastModified": 1655369909, - "narHash": "sha256-Z3d17WvaXY2kWdfsOE6yPKViQ1RBfGi4d7XZgXA/j2I=", - "owner": "input-output-hk", - "repo": "haskell.nix", - "rev": "5a310b0b3904d9b90239390eb2dfb59e4dcb0d96", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "haskell.nix", - "type": "github" - } - }, - "haskellNix_10": { - "inputs": { - "HTTP": "HTTP_15", - "cabal-32": "cabal-32_15", - "cabal-34": "cabal-34_15", - "cardano-shell": "cardano-shell_15", - "flake-utils": "flake-utils_41", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_15", - "hackage": "hackage_13", - "hpc-coveralls": "hpc-coveralls_15", - "nix-tools": "nix-tools_13", - "nixpkgs": [ - "ctl", - "ogmios-nixos", - "cardano-node", - "node-snapshot", - "plutus-example", - "nixpkgs" - ], - "nixpkgs-2003": "nixpkgs-2003_15", - "nixpkgs-2105": "nixpkgs-2105_15", - "nixpkgs-2111": "nixpkgs-2111_15", - "nixpkgs-unstable": "nixpkgs-unstable_17", - "old-ghc-nix": "old-ghc-nix_15", - "stackage": "stackage_15" - }, - "locked": { - "lastModified": 1639098904, - "narHash": "sha256-7VrCNEaKGLm4pTOS11dt1dRL2033oqrNCfal0uONsqA=", - "owner": "input-output-hk", - "repo": "haskell.nix", - "rev": "b18c6ce0867fee77f12ecf41dc6c67f7a59d9826", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "haskell.nix", - "type": "github" - } - }, - "haskellNix_2": { - "inputs": { - "HTTP": "HTTP_4", - "cabal-32": "cabal-32_4", - "cabal-34": "cabal-34_4", - "cabal-36": "cabal-36_4", - "cardano-shell": "cardano-shell_4", - "flake-utils": "flake-utils_27", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_4", - "hackage": "hackage_4", - "hpc-coveralls": "hpc-coveralls_4", - "hydra": "hydra_6", - "nix-tools": "nix-tools_4", - "nixpkgs": [ - "ctl", - "db-sync", - "haskellNix", - "nixpkgs-unstable" - ], - "nixpkgs-2003": "nixpkgs-2003_4", - "nixpkgs-2105": "nixpkgs-2105_4", - "nixpkgs-2111": "nixpkgs-2111_4", - "nixpkgs-unstable": "nixpkgs-unstable_6", - "old-ghc-nix": "old-ghc-nix_4", - "stackage": "stackage_4" - }, - "locked": { - "lastModified": 1650936156, - "narHash": "sha256-B58b4OCSc6ohRjGEdbQ78r+TK/OZYsBXION90kfQDC4=", - "owner": "input-output-hk", - "repo": "haskell.nix", - "rev": "9a502b8c8aac4d7b8033bc9affb87fd03d4740fc", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "haskell.nix", - "type": "github" - } - }, - "haskellNix_3": { - "inputs": { - "HTTP": "HTTP_7", - "cabal-32": "cabal-32_7", - "cabal-34": "cabal-34_7", - "cabal-36": "cabal-36_7", - "cardano-shell": "cardano-shell_7", - "flake-compat": "flake-compat_10", - "flake-utils": "flake-utils_30", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_7", - "hackage": [ - "ctl", - "ogmios", - "cardano-node", - "hackageNix" - ], - "hpc-coveralls": "hpc-coveralls_7", - "hydra": "hydra_9", - "nixpkgs": [ - "ctl", - "ogmios", - "cardano-node", - "nixpkgs" - ], - "nixpkgs-2003": "nixpkgs-2003_7", - "nixpkgs-2105": "nixpkgs-2105_7", - "nixpkgs-2111": "nixpkgs-2111_7", - "nixpkgs-2205": "nixpkgs-2205_2", - "nixpkgs-unstable": "nixpkgs-unstable_9", - "old-ghc-nix": "old-ghc-nix_7", - "stackage": "stackage_7" - }, - "locked": { - "lastModified": 1665882789, - "narHash": "sha256-vD9voCqq4F100RDO3KlfdKZE81NyD++NJjvf3KNNbHA=", - "owner": "input-output-hk", - "repo": "haskell.nix", - "rev": "9af167fb4343539ca99465057262f289b44f55da", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "haskell.nix", - "type": "github" - } - }, - "haskellNix_4": { - "inputs": { - "HTTP": "HTTP_8", - "cabal-32": "cabal-32_8", - "cabal-34": "cabal-34_8", - "cabal-36": "cabal-36_8", - "cardano-shell": "cardano-shell_8", - "flake-utils": "flake-utils_31", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_8", - "hackage": "hackage_7", - "hpc-coveralls": "hpc-coveralls_8", - "nix-tools": "nix-tools_7", - "nixpkgs": [ - "ctl", - "ogmios", - "cardano-node", - "node-snapshot", - "nixpkgs" - ], - "nixpkgs-2003": "nixpkgs-2003_8", - "nixpkgs-2105": "nixpkgs-2105_8", - "nixpkgs-2111": "nixpkgs-2111_8", - "nixpkgs-unstable": "nixpkgs-unstable_10", - "old-ghc-nix": "old-ghc-nix_8", - "stackage": "stackage_8" - }, - "locked": { - "lastModified": 1643073543, - "narHash": "sha256-g2l/KDWzMRTFRugNVcx3CPZeyA5BNcH9/zDiqFpprB4=", - "owner": "input-output-hk", - "repo": "haskell.nix", - "rev": "14f740c7c8f535581c30b1697018e389680e24cb", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "haskell.nix", - "type": "github" - } - }, - "haskellNix_5": { - "inputs": { - "HTTP": "HTTP_9", - "cabal-32": "cabal-32_9", - "cabal-34": "cabal-34_9", - "cabal-36": "cabal-36_9", - "cardano-shell": "cardano-shell_9", - "flake-utils": "flake-utils_32", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_9", - "hackage": "hackage_8", - "hpc-coveralls": "hpc-coveralls_9", - "nix-tools": "nix-tools_8", - "nixpkgs": [ - "ctl", - "ogmios", - "cardano-node", - "node-snapshot", - "membench", - "cardano-node-snapshot", - "nixpkgs" - ], - "nixpkgs-2003": "nixpkgs-2003_9", - "nixpkgs-2105": "nixpkgs-2105_9", - "nixpkgs-2111": "nixpkgs-2111_9", - "nixpkgs-unstable": "nixpkgs-unstable_11", - "old-ghc-nix": "old-ghc-nix_9", - "stackage": "stackage_9" - }, - "locked": { - "lastModified": 1643073543, - "narHash": "sha256-g2l/KDWzMRTFRugNVcx3CPZeyA5BNcH9/zDiqFpprB4=", - "owner": "input-output-hk", - "repo": "haskell.nix", - "rev": "14f740c7c8f535581c30b1697018e389680e24cb", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "haskell.nix", - "type": "github" - } - }, - "haskellNix_6": { - "inputs": { - "HTTP": "HTTP_10", - "cabal-32": "cabal-32_10", - "cabal-34": "cabal-34_10", - "cardano-shell": "cardano-shell_10", - "flake-utils": "flake-utils_33", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_10", - "hackage": "hackage_9", - "hpc-coveralls": "hpc-coveralls_10", - "nix-tools": "nix-tools_9", - "nixpkgs": [ - "ctl", - "ogmios", - "cardano-node", - "node-snapshot", - "plutus-example", - "nixpkgs" - ], - "nixpkgs-2003": "nixpkgs-2003_10", - "nixpkgs-2105": "nixpkgs-2105_10", - "nixpkgs-2111": "nixpkgs-2111_10", - "nixpkgs-unstable": "nixpkgs-unstable_12", - "old-ghc-nix": "old-ghc-nix_10", - "stackage": "stackage_10" - }, - "locked": { - "lastModified": 1639098904, - "narHash": "sha256-7VrCNEaKGLm4pTOS11dt1dRL2033oqrNCfal0uONsqA=", - "owner": "input-output-hk", - "repo": "haskell.nix", - "rev": "b18c6ce0867fee77f12ecf41dc6c67f7a59d9826", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "haskell.nix", - "type": "github" - } - }, - "haskellNix_7": { - "inputs": { - "HTTP": "HTTP_12", - "cabal-32": "cabal-32_12", - "cabal-34": "cabal-34_12", - "cabal-36": "cabal-36_11", - "cardano-shell": "cardano-shell_12", - "flake-utils": "flake-utils_38", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_12", - "hackage": [ - "ctl", - "ogmios-nixos", - "cardano-node", - "hackageNix" - ], - "hpc-coveralls": "hpc-coveralls_12", - "hydra": "hydra_11", - "nix-tools": "nix-tools_10", - "nixpkgs": [ - "ctl", - "ogmios-nixos", - "cardano-node", - "nixpkgs" - ], - "nixpkgs-2003": "nixpkgs-2003_12", - "nixpkgs-2105": "nixpkgs-2105_12", - "nixpkgs-2111": "nixpkgs-2111_12", - "nixpkgs-unstable": "nixpkgs-unstable_14", - "old-ghc-nix": "old-ghc-nix_12", - "stackage": "stackage_12" - }, - "locked": { - "lastModified": 1656898207, - "narHash": "sha256-hshNfCnrmhIvM4T+O0/JRZymsHmq9YiIJ4bpzNVTD98=", - "owner": "input-output-hk", - "repo": "haskell.nix", - "rev": "21230476adfef5fa77fb19fbda396f22006a02bc", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "haskell.nix", - "type": "github" - } - }, - "haskellNix_8": { - "inputs": { - "HTTP": "HTTP_13", - "cabal-32": "cabal-32_13", - "cabal-34": "cabal-34_13", - "cabal-36": "cabal-36_12", - "cardano-shell": "cardano-shell_13", - "flake-utils": "flake-utils_39", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_13", - "hackage": "hackage_11", - "hpc-coveralls": "hpc-coveralls_13", - "nix-tools": "nix-tools_11", - "nixpkgs": [ - "ctl", - "ogmios-nixos", - "cardano-node", - "node-snapshot", - "nixpkgs" - ], - "nixpkgs-2003": "nixpkgs-2003_13", - "nixpkgs-2105": "nixpkgs-2105_13", - "nixpkgs-2111": "nixpkgs-2111_13", - "nixpkgs-unstable": "nixpkgs-unstable_15", - "old-ghc-nix": "old-ghc-nix_13", - "stackage": "stackage_13" - }, - "locked": { - "lastModified": 1643073543, - "narHash": "sha256-g2l/KDWzMRTFRugNVcx3CPZeyA5BNcH9/zDiqFpprB4=", - "owner": "input-output-hk", - "repo": "haskell.nix", - "rev": "14f740c7c8f535581c30b1697018e389680e24cb", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "haskell.nix", - "type": "github" - } - }, - "haskellNix_9": { - "inputs": { - "HTTP": "HTTP_14", - "cabal-32": "cabal-32_14", - "cabal-34": "cabal-34_14", - "cabal-36": "cabal-36_13", - "cardano-shell": "cardano-shell_14", - "flake-utils": "flake-utils_40", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_14", - "hackage": "hackage_12", - "hpc-coveralls": "hpc-coveralls_14", - "nix-tools": "nix-tools_12", - "nixpkgs": [ - "ctl", - "ogmios-nixos", - "cardano-node", - "node-snapshot", - "membench", - "cardano-node-snapshot", - "nixpkgs" - ], - "nixpkgs-2003": "nixpkgs-2003_14", - "nixpkgs-2105": "nixpkgs-2105_14", - "nixpkgs-2111": "nixpkgs-2111_14", - "nixpkgs-unstable": "nixpkgs-unstable_16", - "old-ghc-nix": "old-ghc-nix_14", - "stackage": "stackage_14" - }, - "locked": { - "lastModified": 1643073543, - "narHash": "sha256-g2l/KDWzMRTFRugNVcx3CPZeyA5BNcH9/zDiqFpprB4=", - "owner": "input-output-hk", - "repo": "haskell.nix", - "rev": "14f740c7c8f535581c30b1697018e389680e24cb", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "haskell.nix", - "type": "github" - } - }, - "hpc-coveralls": { - "flake": false, - "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", - "type": "github" - }, - "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "type": "github" - } - }, - "hpc-coveralls_10": { - "flake": false, - "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", - "type": "github" - }, - "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "type": "github" - } - }, - "hpc-coveralls_11": { - "flake": false, - "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", - "type": "github" - }, - "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "type": "github" - } - }, - "hpc-coveralls_12": { - "flake": false, - "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", - "type": "github" - }, - "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "type": "github" - } - }, - "hpc-coveralls_13": { - "flake": false, - "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", - "type": "github" - }, - "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "type": "github" - } - }, - "hpc-coveralls_14": { - "flake": false, - "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", - "type": "github" - }, - "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "type": "github" - } - }, - "hpc-coveralls_15": { - "flake": false, - "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", - "type": "github" - }, - "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "type": "github" - } - }, - "hpc-coveralls_16": { - "flake": false, - "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", - "type": "github" - }, - "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "type": "github" - } - }, - "hpc-coveralls_17": { - "flake": false, - "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", - "type": "github" - }, - "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "type": "github" - } - }, - "hpc-coveralls_2": { - "flake": false, - "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", - "type": "github" - }, - "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "type": "github" - } - }, - "hpc-coveralls_3": { - "flake": false, - "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", - "type": "github" - }, - "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "type": "github" - } - }, - "hpc-coveralls_4": { - "flake": false, - "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", - "type": "github" - }, - "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "type": "github" - } - }, - "hpc-coveralls_5": { - "flake": false, - "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", - "type": "github" - }, - "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "type": "github" - } - }, - "hpc-coveralls_6": { - "flake": false, - "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", - "type": "github" - }, - "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "type": "github" - } - }, - "hpc-coveralls_7": { - "flake": false, - "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", - "type": "github" - }, - "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "type": "github" - } - }, - "hpc-coveralls_8": { - "flake": false, - "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", - "type": "github" - }, - "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "type": "github" - } - }, - "hpc-coveralls_9": { - "flake": false, - "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", - "type": "github" - }, - "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "type": "github" - } - }, - "hw-aeson": { - "flake": false, - "locked": { - "lastModified": 1660218478, - "narHash": "sha256-t4QLmGf5ytzjS0ynn6xON61J+fvBF8vf/+zsBzmw/rM=", - "owner": "haskell-works", - "repo": "hw-aeson", - "rev": "ba7c1e41c6e54d6bf9fd1cd013489ac713fc3153", - "type": "github" - }, - "original": { - "owner": "haskell-works", - "repo": "hw-aeson", - "rev": "ba7c1e41c6e54d6bf9fd1cd013489ac713fc3153", - "type": "github" - } - }, - "hydra": { - "inputs": { - "nix": [ - "ctl", - "db-sync", - "cardano-world", - "bitte", - "capsules", - "bitte", - "nix" - ], - "nixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "bitte", - "capsules", - "bitte", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1631062883, - "narHash": "sha256-JZ6/gjHyX50fHCYpXy/FrX9C0e9k8X9In5Jb/SQYlT8=", - "owner": "kreisys", - "repo": "hydra", - "rev": "785326948be4b1cc2ce77435c806521565e9af45", - "type": "github" - }, - "original": { - "owner": "kreisys", - "ref": "hydra-server-includes", - "repo": "hydra", - "type": "github" - } - }, - "hydra_10": { - "inputs": { - "nix": "nix_17", - "nixpkgs": [ - "ctl", - "ogmios", - "haskell-nix", - "hydra", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1646878427, - "narHash": "sha256-KtbrofMtN8GlM7D+n90kixr7QpSlVmdN+vK5CA/aRzc=", - "owner": "NixOS", - "repo": "hydra", - "rev": "28b682b85b7efc5cf7974065792a1f22203a5927", - "type": "github" - }, - "original": { - "id": "hydra", - "type": "indirect" - } - }, - "hydra_11": { - "inputs": { - "nix": "nix_18", - "nixpkgs": [ - "ctl", - "ogmios-nixos", - "cardano-node", - "haskellNix", - "hydra", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1646878427, - "narHash": "sha256-KtbrofMtN8GlM7D+n90kixr7QpSlVmdN+vK5CA/aRzc=", - "owner": "NixOS", - "repo": "hydra", - "rev": "28b682b85b7efc5cf7974065792a1f22203a5927", - "type": "github" - }, - "original": { - "id": "hydra", - "type": "indirect" - } - }, - "hydra_12": { - "inputs": { - "nix": "nix_19", - "nixpkgs": [ - "ctl", - "ogmios-nixos", - "haskell-nix", - "hydra", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1646878427, - "narHash": "sha256-KtbrofMtN8GlM7D+n90kixr7QpSlVmdN+vK5CA/aRzc=", - "owner": "NixOS", - "repo": "hydra", - "rev": "28b682b85b7efc5cf7974065792a1f22203a5927", - "type": "github" - }, - "original": { - "id": "hydra", - "type": "indirect" - } - }, - "hydra_13": { - "inputs": { - "nix": "nix_20", - "nixpkgs": [ - "ctl", - "plutip", - "haskell-nix", - "hydra", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1646878427, - "narHash": "sha256-KtbrofMtN8GlM7D+n90kixr7QpSlVmdN+vK5CA/aRzc=", - "owner": "NixOS", - "repo": "hydra", - "rev": "28b682b85b7efc5cf7974065792a1f22203a5927", - "type": "github" - }, - "original": { - "id": "hydra", - "type": "indirect" - } - }, - "hydra_2": { - "inputs": { - "nix": [ - "ctl", - "db-sync", - "cardano-world", - "bitte", - "nix" - ], - "nixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "bitte", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1631062883, - "narHash": "sha256-JZ6/gjHyX50fHCYpXy/FrX9C0e9k8X9In5Jb/SQYlT8=", - "owner": "kreisys", - "repo": "hydra", - "rev": "785326948be4b1cc2ce77435c806521565e9af45", - "type": "github" - }, - "original": { - "owner": "kreisys", - "ref": "hydra-server-includes", - "repo": "hydra", - "type": "github" - } - }, - "hydra_3": { - "inputs": { - "nix": [ - "ctl", - "db-sync", - "cardano-world", - "capsules", - "bitte", - "nix" - ], - "nixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "capsules", - "bitte", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1631062883, - "narHash": "sha256-JZ6/gjHyX50fHCYpXy/FrX9C0e9k8X9In5Jb/SQYlT8=", - "owner": "kreisys", - "repo": "hydra", - "rev": "785326948be4b1cc2ce77435c806521565e9af45", - "type": "github" - }, - "original": { - "owner": "kreisys", - "ref": "hydra-server-includes", - "repo": "hydra", - "type": "github" - } - }, - "hydra_4": { - "inputs": { - "nix": "nix_11", - "nixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "cardano-wallet", - "haskellNix", - "hydra", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1646878427, - "narHash": "sha256-KtbrofMtN8GlM7D+n90kixr7QpSlVmdN+vK5CA/aRzc=", - "owner": "NixOS", - "repo": "hydra", - "rev": "28b682b85b7efc5cf7974065792a1f22203a5927", - "type": "github" - }, - "original": { - "id": "hydra", - "type": "indirect" - } - }, - "hydra_5": { - "inputs": { - "nix": "nix_12", - "nixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "haskell-nix", - "hydra", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1646878427, - "narHash": "sha256-KtbrofMtN8GlM7D+n90kixr7QpSlVmdN+vK5CA/aRzc=", - "owner": "NixOS", - "repo": "hydra", - "rev": "28b682b85b7efc5cf7974065792a1f22203a5927", - "type": "github" - }, - "original": { - "id": "hydra", - "type": "indirect" - } - }, - "hydra_6": { - "inputs": { - "nix": "nix_13", - "nixpkgs": [ - "ctl", - "db-sync", - "haskellNix", - "hydra", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1646878427, - "narHash": "sha256-KtbrofMtN8GlM7D+n90kixr7QpSlVmdN+vK5CA/aRzc=", - "owner": "NixOS", - "repo": "hydra", - "rev": "28b682b85b7efc5cf7974065792a1f22203a5927", - "type": "github" - }, - "original": { - "id": "hydra", - "type": "indirect" - } - }, - "hydra_7": { - "inputs": { - "nix": "nix_14", - "nixpkgs": [ - "ctl", - "haskell-nix", - "hydra", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1646878427, - "narHash": "sha256-KtbrofMtN8GlM7D+n90kixr7QpSlVmdN+vK5CA/aRzc=", - "owner": "NixOS", - "repo": "hydra", - "rev": "28b682b85b7efc5cf7974065792a1f22203a5927", - "type": "github" - }, - "original": { - "id": "hydra", - "type": "indirect" - } - }, - "hydra_8": { - "inputs": { - "nix": "nix_15", - "nixpkgs": [ - "ctl", - "kupo-nixos", - "haskell-nix", - "hydra", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1646878427, - "narHash": "sha256-KtbrofMtN8GlM7D+n90kixr7QpSlVmdN+vK5CA/aRzc=", - "owner": "NixOS", - "repo": "hydra", - "rev": "28b682b85b7efc5cf7974065792a1f22203a5927", - "type": "github" - }, - "original": { - "id": "hydra", - "type": "indirect" - } - }, - "hydra_9": { - "inputs": { - "nix": "nix_16", - "nixpkgs": [ - "ctl", - "ogmios", - "cardano-node", - "haskellNix", - "hydra", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1646878427, - "narHash": "sha256-KtbrofMtN8GlM7D+n90kixr7QpSlVmdN+vK5CA/aRzc=", - "owner": "NixOS", - "repo": "hydra", - "rev": "28b682b85b7efc5cf7974065792a1f22203a5927", - "type": "github" - }, - "original": { - "id": "hydra", - "type": "indirect" - } - }, - "inclusive": { - "inputs": { - "stdlib": "stdlib" - }, - "locked": { - "lastModified": 1628098927, - "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", - "owner": "input-output-hk", - "repo": "nix-inclusive", - "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "nix-inclusive", - "type": "github" - } - }, - "inclusive_10": { - "inputs": { - "stdlib": "stdlib_10" - }, - "locked": { - "lastModified": 1628098927, - "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", - "owner": "input-output-hk", - "repo": "nix-inclusive", - "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "nix-inclusive", - "type": "github" - } - }, - "inclusive_11": { - "inputs": { - "stdlib": "stdlib_11" - }, - "locked": { - "lastModified": 1628098927, - "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", - "owner": "input-output-hk", - "repo": "nix-inclusive", - "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", + "lastModified": 1627913399, + "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-inclusive", + "owner": "edolstra", + "repo": "flake-compat", "type": "github" } }, - "inclusive_2": { - "inputs": { - "stdlib": "stdlib_2" - }, + "flake-compat_5": { + "flake": false, "locked": { - "lastModified": 1628098927, - "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", - "owner": "input-output-hk", - "repo": "nix-inclusive", - "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", + "lastModified": 1627913399, + "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-inclusive", + "owner": "edolstra", + "repo": "flake-compat", "type": "github" } }, - "inclusive_3": { - "inputs": { - "stdlib": "stdlib_3" - }, + "flake-compat_6": { + "flake": false, "locked": { - "lastModified": 1628098927, - "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", - "owner": "input-output-hk", - "repo": "nix-inclusive", - "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", + "lastModified": 1627913399, + "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-inclusive", + "owner": "edolstra", + "repo": "flake-compat", "type": "github" } }, - "inclusive_4": { - "inputs": { - "stdlib": "stdlib_4" - }, + "flake-compat_7": { + "flake": false, "locked": { - "lastModified": 1628098927, - "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", - "owner": "input-output-hk", - "repo": "nix-inclusive", - "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", + "lastModified": 1641205782, + "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-inclusive", + "owner": "edolstra", + "repo": "flake-compat", "type": "github" } }, - "inclusive_5": { - "inputs": { - "stdlib": "stdlib_5" - }, + "flake-compat_8": { + "flake": false, "locked": { - "lastModified": 1628098927, - "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", + "lastModified": 1635892615, + "narHash": "sha256-harGbMZr4hzat2BWBU+Y5OYXlu+fVz7E4WeQzHi5o8A=", "owner": "input-output-hk", - "repo": "nix-inclusive", - "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", + "repo": "flake-compat", + "rev": "eca47d3377946315596da653862d341ee5341318", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "nix-inclusive", + "repo": "flake-compat", "type": "github" } }, - "inclusive_6": { - "inputs": { - "stdlib": "stdlib_6" - }, + "flake-compat_9": { + "flake": false, "locked": { - "lastModified": 1628098927, - "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", - "owner": "input-output-hk", - "repo": "nix-inclusive", - "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-inclusive", + "owner": "edolstra", + "repo": "flake-compat", "type": "github" } }, - "inclusive_7": { + "flake-parts": { "inputs": { - "stdlib": "stdlib_7" + "nixpkgs": "nixpkgs_56" }, "locked": { - "lastModified": 1628098927, - "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", - "owner": "input-output-hk", - "repo": "nix-inclusive", - "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", + "lastModified": 1655570068, + "narHash": "sha256-KUSd2a6KgYTHd2l3Goee/P+DrAC6n1Tau+7V68czSZU=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "6dbc77b9c0477f8a9a6a9081077bb38c6a3dbb3a", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-inclusive", + "owner": "hercules-ci", + "repo": "flake-parts", "type": "github" } }, - "inclusive_8": { + "flake-parts_2": { "inputs": { - "stdlib": "stdlib_8" + "nixpkgs-lib": [ + "ctl", + "hercules-ci-effects", + "nixpkgs" + ] }, "locked": { - "lastModified": 1628098927, - "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", - "owner": "input-output-hk", - "repo": "nix-inclusive", - "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-inclusive", - "type": "github" + "id": "flake-parts", + "type": "indirect" } }, - "inclusive_9": { - "inputs": { - "stdlib": "stdlib_9" - }, + "flake-utils": { "locked": { - "lastModified": 1628098927, - "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", - "owner": "input-output-hk", - "repo": "nix-inclusive", - "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-inclusive", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "iogo": { - "inputs": { - "devshell": "devshell_3", - "inclusive": "inclusive_3", - "nixpkgs": "nixpkgs_15", - "utils": "utils_6" - }, + "flake-utils_10": { "locked": { - "lastModified": 1652212694, - "narHash": "sha256-baAY5wKzccNsm7OCEYuySrkXRmlshokCHQjs4EdYShM=", - "owner": "input-output-hk", - "repo": "bitte-iogo", - "rev": "e465975aa368b2d919e865f71eeed02828e55471", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "bitte-iogo", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "iogo_2": { - "inputs": { - "devshell": "devshell_13", - "inclusive": "inclusive_11", - "nixpkgs": "nixpkgs_44", - "utils": "utils_20" - }, + "flake-utils_11": { "locked": { - "lastModified": 1658302707, - "narHash": "sha256-E0FA1CEMQlfAsmtLBRoQE7IY4ItKlBdxZ44YX0tK5Hg=", - "owner": "input-output-hk", - "repo": "bitte-iogo", - "rev": "8751660009202bc95ea3a29e304c393c140a4231", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "bitte-iogo", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "iohk-nix": { - "inputs": { - "nixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "nixpkgs" - ] - }, + "flake-utils_12": { "locked": { - "lastModified": 1658222743, - "narHash": "sha256-yFH01psqx30y5Ws4dBElLkxYpIxxqZx4G+jCVhsXpnA=", - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "9a604d01bd4420ab7f396f14d1947fbe2ce7db8b", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "iohk-nix", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "iohk-nix-environments": { - "inputs": { - "nixpkgs": "nixpkgs_63" - }, + "flake-utils_13": { "locked": { - "lastModified": 1677230996, - "narHash": "sha256-L/PDahK725s1k+sg6MOtVG6sBiKEmgHhRjaequBRbXI=", - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "82e833b60c47bf0f352443879af1766712e9ca6f", + "lastModified": 1656928814, + "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "iohk-nix", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "iohk-nix_2": { - "inputs": { - "nixpkgs": [ - "ctl", - "kupo-nixos", - "haskell-nix", - "nixpkgs" - ] - }, + "flake-utils_14": { "locked": { - "lastModified": 1653579289, - "narHash": "sha256-wveDdPsgB/3nAGAdFaxrcgLEpdi0aJ5kEVNtI+YqVfo=", - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "edb2d2df2ebe42bbdf03a0711115cf6213c9d366", + "lastModified": 1634851050, + "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "edb2d2df2ebe42bbdf03a0711115cf6213c9d366", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "iohk-nix_3": { - "inputs": { - "nixpkgs": [ - "ctl", - "ogmios", - "nixpkgs" - ] - }, + "flake-utils_15": { "locked": { - "lastModified": 1670489000, - "narHash": "sha256-JewWjqVJSt+7eZQT9bGdhlSsS9dmsSKsMzK9g11tcLU=", - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "61510bb482eaca8cb7d61f40f5d375d95ea1fbf7", + "lastModified": 1642700792, + "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "iohk-nix", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "iohk-nix_4": { - "inputs": { - "nixpkgs": [ - "ctl", - "ogmios-nixos", - "nixpkgs" - ] - }, + "flake-utils_16": { "locked": { - "lastModified": 1649070135, - "narHash": "sha256-UFKqcOSdPWk3TYUCPHF22p1zf7aXQpCmmgf7UMg7fWA=", - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "cecab9c71d1064f05f1615eead56ac0b9196bc20", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "cecab9c71d1064f05f1615eead56ac0b9196bc20", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "iohk-nix_5": { - "flake": false, + "flake-utils_17": { "locked": { - "lastModified": 1672846257, - "narHash": "sha256-khuzjVfyNCVcsV5cHRyyb2OgWLbYLKSJlrVDNmc2Tv4=", - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "ca3d466ed36011bcc14290c6d36c503eb03eb71b", + "lastModified": 1610051610, + "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "iohk-nix", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "iohkNix": { - "inputs": { - "nixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "cardano-wallet", - "nixpkgs" - ] - }, + "flake-utils_18": { "locked": { - "lastModified": 1653579289, - "narHash": "sha256-wveDdPsgB/3nAGAdFaxrcgLEpdi0aJ5kEVNtI+YqVfo=", - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "edb2d2df2ebe42bbdf03a0711115cf6213c9d366", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "iohk-nix", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "iohkNix_10": { - "inputs": { - "nixpkgs": [ - "ctl", - "ogmios-nixos", - "cardano-node", - "node-snapshot", - "plutus-example", - "nixpkgs" - ] - }, + "flake-utils_19": { "locked": { - "lastModified": 1633964277, - "narHash": "sha256-7G/BK514WiMRr90EswNBthe8SmH9tjPaTBba/RW/VA8=", - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "1e51437aac8a0e49663cb21e781f34163c81ebfb", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "iohk-nix", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "iohkNix_2": { - "inputs": { - "nixpkgs": [ - "ctl", - "db-sync", - "nixpkgs" - ] - }, + "flake-utils_2": { "locked": { - "lastModified": 1667394105, - "narHash": "sha256-YhS7zGd6jK/QM/+wWyj0zUBZmE3HOXAL/kpJptGYIWg=", - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "7fc7625a9ab2ba137bc70ddbc89a13d3fdb78c8b", + "lastModified": 1679360468, + "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", + "owner": "hamishmack", + "repo": "flake-utils", + "rev": "e1ea268ff47ad475443dbabcd54744b4e5b9d4f5", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "iohk-nix", + "owner": "hamishmack", + "ref": "hkm/nested-hydraJobs", + "repo": "flake-utils", "type": "github" } }, - "iohkNix_3": { - "inputs": { - "nixpkgs": [ - "ctl", - "ogmios", - "cardano-node", - "nixpkgs" - ] - }, + "flake-utils_20": { "locked": { - "lastModified": 1667394105, - "narHash": "sha256-YhS7zGd6jK/QM/+wWyj0zUBZmE3HOXAL/kpJptGYIWg=", - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "7fc7625a9ab2ba137bc70ddbc89a13d3fdb78c8b", + "lastModified": 1634851050, + "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "iohk-nix", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "iohkNix_4": { - "inputs": { - "nixpkgs": [ - "ctl", - "ogmios", - "cardano-node", - "node-snapshot", - "nixpkgs" - ] - }, + "flake-utils_21": { "locked": { - "lastModified": 1631778944, - "narHash": "sha256-N5eCcUYtZ5kUOl/JJGjx6ZzhA3uIn1itDRTiRV+3jLw=", - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "db2c75a09c696271194bb3ef25ec8e9839b594b7", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "iohk-nix", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "iohkNix_5": { - "inputs": { - "nixpkgs": [ - "ctl", - "ogmios", - "cardano-node", - "node-snapshot", - "membench", - "cardano-node-snapshot", - "nixpkgs" - ] - }, + "flake-utils_22": { "locked": { - "lastModified": 1631778944, - "narHash": "sha256-N5eCcUYtZ5kUOl/JJGjx6ZzhA3uIn1itDRTiRV+3jLw=", - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "db2c75a09c696271194bb3ef25ec8e9839b594b7", + "lastModified": 1642700792, + "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "iohk-nix", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "iohkNix_6": { - "inputs": { - "nixpkgs": [ - "ctl", - "ogmios", - "cardano-node", - "node-snapshot", - "plutus-example", - "nixpkgs" - ] - }, + "flake-utils_23": { "locked": { - "lastModified": 1633964277, - "narHash": "sha256-7G/BK514WiMRr90EswNBthe8SmH9tjPaTBba/RW/VA8=", - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "1e51437aac8a0e49663cb21e781f34163c81ebfb", + "lastModified": 1619345332, + "narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "2ebf2558e5bf978c7fb8ea927dfaed8fefab2e28", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "iohk-nix", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "iohkNix_7": { - "inputs": { - "nixpkgs": [ - "ctl", - "ogmios-nixos", - "cardano-node", - "nixpkgs" - ] - }, + "flake-utils_24": { "locked": { - "lastModified": 1653579289, - "narHash": "sha256-wveDdPsgB/3nAGAdFaxrcgLEpdi0aJ5kEVNtI+YqVfo=", - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "edb2d2df2ebe42bbdf03a0711115cf6213c9d366", + "lastModified": 1652776076, + "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "iohk-nix", + "owner": "numtide", + "ref": "v1.0.0", + "repo": "flake-utils", "type": "github" } }, - "iohkNix_8": { - "inputs": { - "nixpkgs": [ - "ctl", - "ogmios-nixos", - "cardano-node", - "node-snapshot", - "nixpkgs" - ] - }, + "flake-utils_25": { "locked": { - "lastModified": 1631778944, - "narHash": "sha256-N5eCcUYtZ5kUOl/JJGjx6ZzhA3uIn1itDRTiRV+3jLw=", - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "db2c75a09c696271194bb3ef25ec8e9839b594b7", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "iohk-nix", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "iohkNix_9": { - "inputs": { - "nixpkgs": [ - "ctl", - "ogmios-nixos", - "cardano-node", - "node-snapshot", - "membench", - "cardano-node-snapshot", - "nixpkgs" - ] - }, + "flake-utils_26": { "locked": { - "lastModified": 1631778944, - "narHash": "sha256-N5eCcUYtZ5kUOl/JJGjx6ZzhA3uIn1itDRTiRV+3jLw=", - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "db2c75a09c696271194bb3ef25ec8e9839b594b7", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "iohk-nix", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "iserv-proxy": { - "flake": false, + "flake-utils_27": { "locked": { - "lastModified": 1639165170, - "narHash": "sha256-QsWL/sBDL5GM8IXd/dE/ORiL4RvteEN+aok23tXgAoc=", - "rev": "6e95df7be6dd29680f983db07a057fc2f34f81f6", - "revCount": 7, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/iserv-proxy.git" + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" }, "original": { - "rev": "6e95df7be6dd29680f983db07a057fc2f34f81f6", - "type": "git", - "url": "https://gitlab.haskell.org/ghc/iserv-proxy.git" + "owner": "numtide", + "repo": "flake-utils", + "type": "github" } }, - "kupo": { - "flake": false, + "flake-utils_28": { "locked": { - "lastModified": 1668678914, - "narHash": "sha256-XsbAFyUPmevGuoShEFlOVHt/7fFIpyCQuhulIrNzv80=", - "owner": "CardanoSolutions", - "repo": "kupo", - "rev": "c9bc18d99f9e8af1840a265907db82b180d5a4d8", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { - "owner": "CardanoSolutions", - "ref": "v2.2.0", - "repo": "kupo", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "kupo-nixos": { - "inputs": { - "haskell-nix": "haskell-nix_4", - "iohk-nix": "iohk-nix_2", - "kupo": [ - "ctl", - "kupo" - ], - "nixpkgs": [ - "ctl", - "kupo-nixos", - "haskell-nix", - "nixpkgs" - ] - }, + "flake-utils_29": { "locked": { - "lastModified": 1672905539, - "narHash": "sha256-B4vryG94L7WWn/tuIQdtg9eZHAH+FaFzv35Mancd2l8=", - "owner": "mlabs-haskell", - "repo": "kupo-nixos", - "rev": "6f89cbcc359893a2aea14dd380f9a45e04c6aa67", + "lastModified": 1656928814, + "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", "type": "github" }, "original": { - "owner": "mlabs-haskell", - "repo": "kupo-nixos", - "rev": "6f89cbcc359893a2aea14dd380f9a45e04c6aa67", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "lowdown-src": { - "flake": false, + "flake-utils_3": { "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "lowdown-src_10": { - "flake": false, + "flake-utils_30": { "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "lowdown-src_11": { - "flake": false, + "flake-utils_31": { "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1642700792, + "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "lowdown-src_12": { - "flake": false, + "flake-utils_32": { "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "lowdown-src_13": { - "flake": false, + "flake-utils_33": { "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "lowdown-src_14": { - "flake": false, + "flake-utils_4": { "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "lowdown-src_15": { - "flake": false, + "flake-utils_5": { "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "lowdown-src_16": { - "flake": false, + "flake-utils_6": { "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "lowdown-src_17": { - "flake": false, + "flake-utils_7": { "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "lowdown-src_18": { - "flake": false, + "flake-utils_8": { "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "lowdown-src_19": { - "flake": false, + "flake-utils_9": { "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1634851050, + "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "lowdown-src_2": { + "flakeCompat": { "flake": false, "locked": { - "lastModified": 1598695561, - "narHash": "sha256-gyH/5j+h/nWw0W8AcR2WKvNBUsiQ7QuxqSJNXAwV+8E=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "1705b4a26fbf065d9574dce47a94e8c7c79e052f", + "lastModified": 1641205782, + "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "edolstra", + "repo": "flake-compat", "type": "github" } }, - "lowdown-src_20": { - "flake": false, + "follower": { + "inputs": { + "devshell": "devshell_10", + "inclusive": "inclusive_7", + "nixpkgs": [ + "ctl", + "db-sync", + "cardano-world", + "bitte-cells", + "cicero", + "nixpkgs" + ], + "utils": "utils_14" + }, "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1642008295, + "narHash": "sha256-yx3lLN/hlvEeKItHJ5jH0KSm84IruTWMo78IItVPji4=", + "owner": "input-output-hk", + "repo": "nomad-follower", + "rev": "b1b0b00e940026f72d16bdf13e36ad20f1826e8a", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "input-output-hk", + "repo": "nomad-follower", "type": "github" } }, - "lowdown-src_3": { + "ghc-8.6.5-iohk": { "flake": false, "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1600920045, + "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", + "owner": "input-output-hk", + "repo": "ghc", + "rev": "95713a6ecce4551240da7c96b6176f980af75cae", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "input-output-hk", + "ref": "release/8.6.5-iohk", + "repo": "ghc", "type": "github" } }, - "lowdown-src_4": { + "ghc-8.6.5-iohk_2": { "flake": false, "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1600920045, + "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", + "owner": "input-output-hk", + "repo": "ghc", + "rev": "95713a6ecce4551240da7c96b6176f980af75cae", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "input-output-hk", + "ref": "release/8.6.5-iohk", + "repo": "ghc", "type": "github" } }, - "lowdown-src_5": { + "ghc-8.6.5-iohk_3": { "flake": false, "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1600920045, + "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", + "owner": "input-output-hk", + "repo": "ghc", + "rev": "95713a6ecce4551240da7c96b6176f980af75cae", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "input-output-hk", + "ref": "release/8.6.5-iohk", + "repo": "ghc", "type": "github" } }, - "lowdown-src_6": { + "ghc-8.6.5-iohk_4": { "flake": false, "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1600920045, + "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", + "owner": "input-output-hk", + "repo": "ghc", + "rev": "95713a6ecce4551240da7c96b6176f980af75cae", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "input-output-hk", + "ref": "release/8.6.5-iohk", + "repo": "ghc", "type": "github" } }, - "lowdown-src_7": { + "ghc-8.6.5-iohk_5": { "flake": false, "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1600920045, + "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", + "owner": "input-output-hk", + "repo": "ghc", + "rev": "95713a6ecce4551240da7c96b6176f980af75cae", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "input-output-hk", + "ref": "release/8.6.5-iohk", + "repo": "ghc", "type": "github" } }, - "lowdown-src_8": { + "ghc-8.6.5-iohk_6": { "flake": false, "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1600920045, + "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", + "owner": "input-output-hk", + "repo": "ghc", + "rev": "95713a6ecce4551240da7c96b6176f980af75cae", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "input-output-hk", + "ref": "release/8.6.5-iohk", + "repo": "ghc", "type": "github" } }, - "lowdown-src_9": { + "ghc-8.6.5-iohk_7": { "flake": false, "locked": { - "lastModified": 1598695561, - "narHash": "sha256-gyH/5j+h/nWw0W8AcR2WKvNBUsiQ7QuxqSJNXAwV+8E=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "1705b4a26fbf065d9574dce47a94e8c7c79e052f", + "lastModified": 1600920045, + "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", + "owner": "input-output-hk", + "repo": "ghc", + "rev": "95713a6ecce4551240da7c96b6176f980af75cae", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "input-output-hk", + "ref": "release/8.6.5-iohk", + "repo": "ghc", "type": "github" } }, - "mdbook-kroki-preprocessor": { + "ghc98X": { "flake": false, "locked": { - "lastModified": 1655670640, - "narHash": "sha256-JjqdxftHBjABTkOpFl3cWUJtc/KGwkQ3NRWGLjH2oUs=", - "owner": "JoelCourtney", - "repo": "mdbook-kroki-preprocessor", - "rev": "bb6e607437ecc3f22fd9036acee6b797a5b45dbc", - "type": "github" + "lastModified": 1696643148, + "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=", + "ref": "ghc-9.8", + "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6", + "revCount": 61642, + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" }, "original": { - "owner": "JoelCourtney", - "repo": "mdbook-kroki-preprocessor", - "type": "github" + "ref": "ghc-9.8", + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" } }, - "mdbook-kroki-preprocessor_2": { + "ghc99": { "flake": false, "locked": { - "lastModified": 1655670640, - "narHash": "sha256-JjqdxftHBjABTkOpFl3cWUJtc/KGwkQ3NRWGLjH2oUs=", - "owner": "JoelCourtney", - "repo": "mdbook-kroki-preprocessor", - "rev": "bb6e607437ecc3f22fd9036acee6b797a5b45dbc", - "type": "github" + "lastModified": 1701580282, + "narHash": "sha256-drA01r3JrXnkKyzI+owMZGxX0JameMzjK0W5jJE/+V4=", + "ref": "refs/heads/master", + "rev": "f5eb0f2982e9cf27515e892c4bdf634bcfb28459", + "revCount": 62197, + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" }, "original": { - "owner": "JoelCourtney", - "repo": "mdbook-kroki-preprocessor", - "type": "github" + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" } }, - "mdbook-kroki-preprocessor_3": { - "flake": false, + "gomod2nix": { + "inputs": { + "nixpkgs": "nixpkgs_5", + "utils": "utils" + }, "locked": { - "lastModified": 1661755005, - "narHash": "sha256-1TJuUzfyMycWlOQH67LR63/ll2GDZz25I3JfScy/Jnw=", - "owner": "JoelCourtney", - "repo": "mdbook-kroki-preprocessor", - "rev": "93adb5716d035829efed27f65f2f0833a7d3e76f", + "lastModified": 1655245309, + "narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=", + "owner": "tweag", + "repo": "gomod2nix", + "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58", "type": "github" }, "original": { - "owner": "JoelCourtney", - "repo": "mdbook-kroki-preprocessor", + "owner": "tweag", + "repo": "gomod2nix", "type": "github" } }, - "mdbook-kroki-preprocessor_4": { + "hackage": { "flake": false, "locked": { - "lastModified": 1661755005, - "narHash": "sha256-1TJuUzfyMycWlOQH67LR63/ll2GDZz25I3JfScy/Jnw=", - "owner": "JoelCourtney", - "repo": "mdbook-kroki-preprocessor", - "rev": "93adb5716d035829efed27f65f2f0833a7d3e76f", + "lastModified": 1646097829, + "narHash": "sha256-PcHDDV8NuUxZhPV/p++IkZC+SDZ1Db7m7K+9HN4/0S4=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "283f096976b48e54183905e7bdde7f213c6ee5cd", "type": "github" }, "original": { - "owner": "JoelCourtney", - "repo": "mdbook-kroki-preprocessor", + "owner": "input-output-hk", + "repo": "hackage.nix", "type": "github" } }, - "membench": { - "inputs": { - "cardano-mainnet-mirror": "cardano-mainnet-mirror_2", - "cardano-node-measured": [ - "ctl", - "ogmios", - "cardano-node", - "node-snapshot" - ], - "cardano-node-process": [ - "ctl", - "ogmios", - "cardano-node", - "node-snapshot" - ], - "cardano-node-snapshot": "cardano-node-snapshot", - "nixpkgs": [ - "ctl", - "ogmios", - "cardano-node", - "node-snapshot", - "nixpkgs" - ], - "ouroboros-network": "ouroboros-network_2" - }, + "hackage-nix": { + "flake": false, "locked": { - "lastModified": 1645070579, - "narHash": "sha256-AxL6tCOnzYnE6OquoFzj+X1bLDr1PQx3d8/vXm+rbfA=", + "lastModified": 1702426969, + "narHash": "sha256-rbhpiqSBFwLxTO4Qx2sJm7BzBQo9MidVWlL9W21HHy4=", "owner": "input-output-hk", - "repo": "cardano-memory-benchmark", - "rev": "65643e000186de1335e24ec89159db8ba85e1c1a", + "repo": "hackage.nix", + "rev": "524b4a4d0e06119cd226aa9f5d57986547bd29b4", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "cardano-memory-benchmark", + "repo": "hackage.nix", "type": "github" } }, - "membench_2": { - "inputs": { - "cardano-mainnet-mirror": "cardano-mainnet-mirror_3", - "cardano-node-measured": [ - "ctl", - "ogmios", - "cardano-node", - "node-snapshot", - "membench", - "cardano-node-snapshot" - ], - "cardano-node-process": [ - "ctl", - "ogmios", - "cardano-node", - "node-snapshot", - "membench", - "cardano-node-snapshot" - ], - "cardano-node-snapshot": [ - "ctl", - "ogmios", - "cardano-node", - "node-snapshot", - "membench", - "cardano-node-snapshot" - ], - "nixpkgs": [ - "ctl", - "ogmios", - "cardano-node", - "node-snapshot", - "membench", - "cardano-node-snapshot", - "nixpkgs" - ], - "ouroboros-network": "ouroboros-network" - }, + "hackageNix": { + "flake": false, "locked": { - "lastModified": 1644547122, - "narHash": "sha256-8nWK+ScMACvRQLbA27gwXNoZver+Wx/cF7V37044koY=", + "lastModified": 1685492843, + "narHash": "sha256-X8dNs5Gfc2ucfaWAgZ1VmkpBB4Cb44EQZu0b7tkvz2Y=", "owner": "input-output-hk", - "repo": "cardano-memory-benchmark", - "rev": "9d8ff4b9394de0421ee95caa511d01163de88b77", + "repo": "hackage.nix", + "rev": "e7407bab324eb2445bda58c5ffac393e80dda1e4", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "cardano-memory-benchmark", + "repo": "hackage.nix", "type": "github" - } - }, - "membench_3": { - "inputs": { - "cardano-mainnet-mirror": "cardano-mainnet-mirror_5", - "cardano-node-measured": [ - "ctl", - "ogmios-nixos", - "cardano-node", - "node-snapshot" - ], - "cardano-node-process": [ - "ctl", - "ogmios-nixos", - "cardano-node", - "node-snapshot" - ], - "cardano-node-snapshot": "cardano-node-snapshot_2", - "nixpkgs": [ - "ctl", - "ogmios-nixos", - "cardano-node", - "node-snapshot", - "nixpkgs" - ], - "ouroboros-network": "ouroboros-network_4" - }, + } + }, + "hackage_2": { + "flake": false, "locked": { - "lastModified": 1645070579, - "narHash": "sha256-AxL6tCOnzYnE6OquoFzj+X1bLDr1PQx3d8/vXm+rbfA=", + "lastModified": 1655342080, + "narHash": "sha256-mF/clPxSJJkKAq6Y+0oYXrU3rGOuQXFN9btSde3uvvE=", "owner": "input-output-hk", - "repo": "cardano-memory-benchmark", - "rev": "65643e000186de1335e24ec89159db8ba85e1c1a", + "repo": "hackage.nix", + "rev": "567e2e865d42d8e5cfe796bf03b6b38e42bc00ab", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "cardano-memory-benchmark", + "repo": "hackage.nix", "type": "github" } }, - "membench_4": { - "inputs": { - "cardano-mainnet-mirror": "cardano-mainnet-mirror_6", - "cardano-node-measured": [ - "ctl", - "ogmios-nixos", - "cardano-node", - "node-snapshot", - "membench", - "cardano-node-snapshot" - ], - "cardano-node-process": [ - "ctl", - "ogmios-nixos", - "cardano-node", - "node-snapshot", - "membench", - "cardano-node-snapshot" - ], - "cardano-node-snapshot": [ - "ctl", - "ogmios-nixos", - "cardano-node", - "node-snapshot", - "membench", - "cardano-node-snapshot" - ], - "nixpkgs": [ - "ctl", - "ogmios-nixos", - "cardano-node", - "node-snapshot", - "membench", - "cardano-node-snapshot", - "nixpkgs" - ], - "ouroboros-network": "ouroboros-network_3" - }, + "hackage_3": { + "flake": false, "locked": { - "lastModified": 1644547122, - "narHash": "sha256-8nWK+ScMACvRQLbA27gwXNoZver+Wx/cF7V37044koY=", + "lastModified": 1659489414, + "narHash": "sha256-AghgUkUv0hIBh+PvODngYL+ejwhCn2O2OUkVaAZYkCU=", "owner": "input-output-hk", - "repo": "cardano-memory-benchmark", - "rev": "9d8ff4b9394de0421ee95caa511d01163de88b77", + "repo": "hackage.nix", + "rev": "056c6ce7014adaf887b8e4cad15ef6fd926ea568", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "cardano-memory-benchmark", + "repo": "hackage.nix", "type": "github" } }, - "n2c": { - "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_20" - }, + "hackage_4": { + "flake": false, "locked": { - "lastModified": 1650568002, - "narHash": "sha256-CciO5C3k/a7sbA+lW4jeiU6WGletujMjWcRzc1513tI=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "2cd391fc65847ea54e3657a491c379854b556262", + "lastModified": 1650935983, + "narHash": "sha256-wZTCKzA4f7nk5sIdP2BhGz5qkt6ex5VTC/53U2Y4i9Y=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "b65addc81b03406b3ee8b139549980591ed15be5", "type": "github" }, "original": { - "owner": "nlewo", - "repo": "nix2container", + "owner": "input-output-hk", + "repo": "hackage.nix", "type": "github" } }, - "n2c_2": { - "inputs": { - "flake-utils": "flake-utils_23", - "nixpkgs": "nixpkgs_55" - }, + "hackage_5": { + "flake": false, "locked": { - "lastModified": 1655533513, - "narHash": "sha256-MAqvv2AZbyNYGJMpV5l9ydN7k66jDErFpaKOvZ1Y7f8=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "2d47dbe633a059d75c7878f554420158712481cb", + "lastModified": 1654219082, + "narHash": "sha256-sm59eg5wSrfIAjNXfBaaOBQ8daghF3g1NiGazYfj+no=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "fc90e7c5dea0483bacb01fc00bd2ab8f8e72500d", "type": "github" }, "original": { - "owner": "nlewo", - "repo": "nix2container", + "owner": "input-output-hk", + "repo": "hackage.nix", "type": "github" } }, - "n2c_3": { - "inputs": { - "flake-utils": "flake-utils_37", - "nixpkgs": [ - "ctl", - "ogmios", - "haskell-nix", - "tullia", - "std", - "nixpkgs" - ] - }, + "haskell-flake": { "locked": { - "lastModified": 1665039323, - "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", + "lastModified": 1654001497, + "narHash": "sha256-GfrpyoQrVT9Z/j9its8BQs3I5O5X5Lc2IkK922bz7zg=", + "owner": "srid", + "repo": "haskell-flake", + "rev": "4c0b0ff295f0b97238a600d2381c37ee46b67f9c", "type": "github" }, "original": { - "owner": "nlewo", - "repo": "nix2container", + "owner": "srid", + "repo": "haskell-flake", "type": "github" } }, - "n2c_4": { + "haskell-nix": { "inputs": { - "flake-utils": "flake-utils_45", + "HTTP": "HTTP_2", + "cabal-32": "cabal-32_2", + "cabal-34": "cabal-34_2", + "cabal-36": "cabal-36_2", + "cardano-shell": "cardano-shell_2", + "flake-utils": "flake-utils_16", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_2", + "hackage": "hackage", + "hpc-coveralls": "hpc-coveralls_2", + "nix-tools": "nix-tools", "nixpkgs": [ "ctl", - "ogmios-nixos", + "db-sync", + "cardano-world", + "bitte-cells", + "cicero", "haskell-nix", - "tullia", - "std", + "nixpkgs-unstable" + ], + "nixpkgs-2003": "nixpkgs-2003_2", + "nixpkgs-2105": "nixpkgs-2105_2", + "nixpkgs-2111": "nixpkgs-2111_2", + "nixpkgs-unstable": [ + "ctl", + "db-sync", + "cardano-world", + "bitte-cells", + "cicero", "nixpkgs" - ] + ], + "old-ghc-nix": "old-ghc-nix_2", + "stackage": "stackage_2" }, "locked": { - "lastModified": 1665039323, - "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", + "lastModified": 1646097976, + "narHash": "sha256-EiyrBqayw67dw8pr1XCVU9tIZ+/jzXCQycW1S9a+KFA=", + "owner": "input-output-hk", + "repo": "haskell.nix", + "rev": "f0308ed1df3ce9f10f9da1a7c0c8591921d0b4e5", "type": "github" }, "original": { - "owner": "nlewo", - "repo": "nix2container", + "owner": "input-output-hk", + "repo": "haskell.nix", "type": "github" } }, - "nix": { + "haskell-nix_2": { "inputs": { - "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_7", - "nixpkgs-regression": "nixpkgs-regression" + "HTTP": "HTTP_4", + "cabal-32": "cabal-32_4", + "cabal-34": "cabal-34_4", + "cabal-36": "cabal-36_4", + "cardano-shell": "cardano-shell_4", + "flake-utils": "flake-utils_27", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_4", + "hackage": [ + "ctl", + "db-sync", + "cardano-world", + "hackage" + ], + "hpc-coveralls": "hpc-coveralls_4", + "hydra": "hydra_6", + "nix-tools": "nix-tools_3", + "nixpkgs": [ + "ctl", + "db-sync", + "cardano-world", + "haskell-nix", + "nixpkgs-unstable" + ], + "nixpkgs-2003": "nixpkgs-2003_4", + "nixpkgs-2105": "nixpkgs-2105_4", + "nixpkgs-2111": "nixpkgs-2111_4", + "nixpkgs-2205": "nixpkgs-2205_2", + "nixpkgs-unstable": "nixpkgs-unstable_6", + "old-ghc-nix": "old-ghc-nix_4", + "stackage": "stackage_4" }, "locked": { - "lastModified": 1646164353, - "narHash": "sha256-Nj3ARvplf0Xa+h4F5Cq1r9cc81C2UIpbAKDgJLsDmUc=", - "owner": "kreisys", - "repo": "nix", - "rev": "45677cae8d474270ecd797eb40eb1f8836981604", + "lastModified": 1659439444, + "narHash": "sha256-qUK7OVpM8/piOImpPgzSUvOFHQq19sQpvOSns2nW8es=", + "owner": "input-output-hk", + "repo": "haskell.nix", + "rev": "ee6a6559e16a603677d7cbef7c4fe18ca801b48e", "type": "github" }, "original": { - "owner": "kreisys", - "ref": "goodnix-maybe-dont-functor", - "repo": "nix", + "owner": "input-output-hk", + "repo": "haskell.nix", "type": "github" } }, - "nix-cache-proxy": { + "haskell-nix_3": { "inputs": { - "devshell": "devshell_10", - "inclusive": [ + "HTTP": "HTTP_6", + "cabal-32": "cabal-32_6", + "cabal-34": "cabal-34_6", + "cabal-36": "cabal-36_6", + "cardano-shell": "cardano-shell_6", + "flake-compat": "flake-compat_12", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_6", + "ghc98X": "ghc98X", + "ghc99": "ghc99", + "hackage": [ "ctl", - "db-sync", - "cardano-world", - "bitte-cells", - "cicero", - "inclusive" + "hackage-nix" ], + "hls-1.10": "hls-1.10_2", + "hls-2.0": "hls-2.0", + "hls-2.2": "hls-2.2", + "hls-2.3": "hls-2.3", + "hls-2.4": "hls-2.4", + "hpc-coveralls": "hpc-coveralls_6", + "hydra": "hydra_8", + "iserv-proxy": "iserv-proxy_2", "nixpkgs": [ "ctl", - "db-sync", - "cardano-world", - "bitte-cells", - "cicero", "nixpkgs" ], - "utils": "utils_13" + "nixpkgs-2003": "nixpkgs-2003_6", + "nixpkgs-2105": "nixpkgs-2105_6", + "nixpkgs-2111": "nixpkgs-2111_6", + "nixpkgs-2205": "nixpkgs-2205_3", + "nixpkgs-2211": "nixpkgs-2211_2", + "nixpkgs-2305": "nixpkgs-2305", + "nixpkgs-2311": "nixpkgs-2311", + "nixpkgs-unstable": "nixpkgs-unstable_8", + "old-ghc-nix": "old-ghc-nix_6", + "stackage": "stackage_6" }, "locked": { - "lastModified": 1644317729, - "narHash": "sha256-R9R1XHv69VvZ/c7lXYs18PHcnEBXS+hDfhjdkZ96lgw=", + "lastModified": 1702428573, + "narHash": "sha256-KpY2FsKQs6vUABgQFjUCqaTPVN5dStNjt0Dxjw7CA9g=", "owner": "input-output-hk", - "repo": "nix-cache-proxy", - "rev": "378617d6b9865be96f7dfa16e0ce3f329da844ec", + "repo": "haskell.nix", + "rev": "78c22a52a0d80d7e29c12f74df871ebb58a0795d", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "nix-cache-proxy", + "repo": "haskell.nix", "type": "github" } }, - "nix-inclusive": { + "haskell-nix_4": { "inputs": { - "stdlib": "stdlib_12" + "HTTP": "HTTP_7", + "cabal-32": "cabal-32_7", + "cabal-34": "cabal-34_7", + "cabal-36": "cabal-36_7", + "cardano-shell": "cardano-shell_7", + "flake-utils": "flake-utils_33", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_7", + "hackage": "hackage_5", + "hpc-coveralls": "hpc-coveralls_7", + "hydra": "hydra_9", + "nix-tools": "nix-tools_5", + "nixpkgs": [ + "ctl", + "kupo-nixos", + "haskell-nix", + "nixpkgs-unstable" + ], + "nixpkgs-2003": "nixpkgs-2003_7", + "nixpkgs-2105": "nixpkgs-2105_7", + "nixpkgs-2111": "nixpkgs-2111_7", + "nixpkgs-unstable": "nixpkgs-unstable_9", + "old-ghc-nix": "old-ghc-nix_7", + "stackage": "stackage_7" }, "locked": { - "lastModified": 1628098927, - "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", + "lastModified": 1654219238, + "narHash": "sha256-PMS7uSQjYCjsjUfVidTdKcuNtKNu5VPmeNvxruT72go=", "owner": "input-output-hk", - "repo": "nix-inclusive", - "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", + "repo": "haskell.nix", + "rev": "974a61451bb1d41b32090eb51efd7ada026d16d9", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "nix-inclusive", + "repo": "haskell.nix", + "rev": "974a61451bb1d41b32090eb51efd7ada026d16d9", "type": "github" } }, - "nix-nomad": { + "haskellNix": { "inputs": { - "flake-compat": "flake-compat_13", - "flake-utils": [ + "HTTP": "HTTP", + "cabal-32": "cabal-32", + "cabal-34": "cabal-34", + "cabal-36": "cabal-36", + "cardano-shell": "cardano-shell", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", + "hackage": [ "ctl", - "ogmios", - "haskell-nix", - "tullia", - "nix2container", - "flake-utils" + "cardano-node", + "hackageNix" ], - "gomod2nix": "gomod2nix", + "hls-1.10": "hls-1.10", + "hpc-coveralls": "hpc-coveralls", + "hydra": "hydra", + "iserv-proxy": "iserv-proxy", "nixpkgs": [ "ctl", - "ogmios", - "haskell-nix", - "tullia", + "cardano-node", "nixpkgs" ], - "nixpkgs-lib": [ - "ctl", - "ogmios", - "haskell-nix", - "tullia", - "nixpkgs" - ] + "nixpkgs-2003": "nixpkgs-2003", + "nixpkgs-2105": "nixpkgs-2105", + "nixpkgs-2111": "nixpkgs-2111", + "nixpkgs-2205": "nixpkgs-2205", + "nixpkgs-2211": "nixpkgs-2211", + "nixpkgs-unstable": "nixpkgs-unstable", + "old-ghc-nix": "old-ghc-nix", + "stackage": "stackage" }, "locked": { - "lastModified": 1658277770, - "narHash": "sha256-T/PgG3wUn8Z2rnzfxf2VqlR1CBjInPE0l1yVzXxPnt0=", - "owner": "tristanpemble", - "repo": "nix-nomad", - "rev": "054adcbdd0a836ae1c20951b67ed549131fd2d70", + "lastModified": 1685495397, + "narHash": "sha256-BwbWroS1Qm8BiHatG5+iHMHN5U6kqOccewBROUYuMKw=", + "owner": "input-output-hk", + "repo": "haskell.nix", + "rev": "d07c42cdb1cf88d0cab27d3090b00cb3899643c9", "type": "github" }, "original": { - "owner": "tristanpemble", - "repo": "nix-nomad", + "owner": "input-output-hk", + "repo": "haskell.nix", "type": "github" } }, - "nix-nomad_2": { + "haskellNix_2": { "inputs": { - "flake-compat": "flake-compat_17", - "flake-utils": [ - "ctl", - "ogmios-nixos", - "haskell-nix", - "tullia", - "nix2container", - "flake-utils" - ], - "gomod2nix": "gomod2nix_2", + "HTTP": "HTTP_3", + "cabal-32": "cabal-32_3", + "cabal-34": "cabal-34_3", + "cabal-36": "cabal-36_3", + "cardano-shell": "cardano-shell_3", + "flake-utils": "flake-utils_26", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_3", + "hackage": "hackage_2", + "hpc-coveralls": "hpc-coveralls_3", + "hydra": "hydra_5", + "nix-tools": "nix-tools_2", "nixpkgs": [ "ctl", - "ogmios-nixos", - "haskell-nix", - "tullia", + "db-sync", + "cardano-world", + "cardano-wallet", "nixpkgs" ], - "nixpkgs-lib": [ - "ctl", - "ogmios-nixos", - "haskell-nix", - "tullia", - "nixpkgs" - ] + "nixpkgs-2003": "nixpkgs-2003_3", + "nixpkgs-2105": "nixpkgs-2105_3", + "nixpkgs-2111": "nixpkgs-2111_3", + "nixpkgs-unstable": "nixpkgs-unstable_5", + "old-ghc-nix": "old-ghc-nix_3", + "stackage": "stackage_3" }, "locked": { - "lastModified": 1658277770, - "narHash": "sha256-T/PgG3wUn8Z2rnzfxf2VqlR1CBjInPE0l1yVzXxPnt0=", - "owner": "tristanpemble", - "repo": "nix-nomad", - "rev": "054adcbdd0a836ae1c20951b67ed549131fd2d70", + "lastModified": 1655369909, + "narHash": "sha256-Z3d17WvaXY2kWdfsOE6yPKViQ1RBfGi4d7XZgXA/j2I=", + "owner": "input-output-hk", + "repo": "haskell.nix", + "rev": "5a310b0b3904d9b90239390eb2dfb59e4dcb0d96", "type": "github" }, "original": { - "owner": "tristanpemble", - "repo": "nix-nomad", + "owner": "input-output-hk", + "repo": "haskell.nix", "type": "github" } }, - "nix-tools": { - "flake": false, + "haskellNix_3": { + "inputs": { + "HTTP": "HTTP_5", + "cabal-32": "cabal-32_5", + "cabal-34": "cabal-34_5", + "cabal-36": "cabal-36_5", + "cardano-shell": "cardano-shell_5", + "flake-utils": "flake-utils_32", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_5", + "hackage": "hackage_4", + "hpc-coveralls": "hpc-coveralls_5", + "hydra": "hydra_7", + "nix-tools": "nix-tools_4", + "nixpkgs": [ + "ctl", + "db-sync", + "haskellNix", + "nixpkgs-unstable" + ], + "nixpkgs-2003": "nixpkgs-2003_5", + "nixpkgs-2105": "nixpkgs-2105_5", + "nixpkgs-2111": "nixpkgs-2111_5", + "nixpkgs-unstable": "nixpkgs-unstable_7", + "old-ghc-nix": "old-ghc-nix_5", + "stackage": "stackage_5" + }, "locked": { - "lastModified": 1644395812, - "narHash": "sha256-BVFk/BEsTLq5MMZvdy3ZYHKfaS3dHrsKh4+tb5t5b58=", + "lastModified": 1650936156, + "narHash": "sha256-B58b4OCSc6ohRjGEdbQ78r+TK/OZYsBXION90kfQDC4=", "owner": "input-output-hk", - "repo": "nix-tools", - "rev": "d847c63b99bbec78bf83be2a61dc9f09b8a9ccc1", + "repo": "haskell.nix", + "rev": "9a502b8c8aac4d7b8033bc9affb87fd03d4740fc", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "nix-tools", + "repo": "haskell.nix", "type": "github" } }, - "nix-tools_10": { - "flake": false, + "hercules-ci-effects": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_70" + }, "locked": { - "lastModified": 1649424170, - "narHash": "sha256-XgKXWispvv5RCvZzPb+p7e6Hy3LMuRjafKMl7kXzxGw=", - "owner": "input-output-hk", - "repo": "nix-tools", - "rev": "e109c94016e3b6e0db7ed413c793e2d4bdb24aa7", + "lastModified": 1699381651, + "narHash": "sha256-mZlQ54xJs3j5+SJrLhzePPMXzS+Czbx7gNyOnOAQrHA=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "0bd99f5ab7ec7a74c11238bd02bb29e709c14328", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-tools", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", "type": "github" } }, - "nix-tools_11": { + "hls-1.10": { "flake": false, "locked": { - "lastModified": 1636018067, - "narHash": "sha256-ng306fkuwr6V/malWtt3979iAC4yMVDDH2ViwYB6sQE=", - "owner": "input-output-hk", - "repo": "nix-tools", - "rev": "ed5bd7215292deba55d6ab7a4e8c21f8b1564dda", + "lastModified": 1680000865, + "narHash": "sha256-rc7iiUAcrHxwRM/s0ErEsSPxOR3u8t7DvFeWlMycWgo=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "b08691db779f7a35ff322b71e72a12f6e3376fd9", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-tools", + "owner": "haskell", + "ref": "1.10.0.0", + "repo": "haskell-language-server", "type": "github" } }, - "nix-tools_12": { + "hls-1.10_2": { "flake": false, "locked": { - "lastModified": 1636018067, - "narHash": "sha256-ng306fkuwr6V/malWtt3979iAC4yMVDDH2ViwYB6sQE=", - "owner": "input-output-hk", - "repo": "nix-tools", - "rev": "ed5bd7215292deba55d6ab7a4e8c21f8b1564dda", + "lastModified": 1680000865, + "narHash": "sha256-rc7iiUAcrHxwRM/s0ErEsSPxOR3u8t7DvFeWlMycWgo=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "b08691db779f7a35ff322b71e72a12f6e3376fd9", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-tools", + "owner": "haskell", + "ref": "1.10.0.0", + "repo": "haskell-language-server", "type": "github" } }, - "nix-tools_13": { + "hls-2.0": { "flake": false, "locked": { - "lastModified": 1636018067, - "narHash": "sha256-ng306fkuwr6V/malWtt3979iAC4yMVDDH2ViwYB6sQE=", - "owner": "input-output-hk", - "repo": "nix-tools", - "rev": "ed5bd7215292deba55d6ab7a4e8c21f8b1564dda", + "lastModified": 1687698105, + "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "783905f211ac63edf982dd1889c671653327e441", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-tools", + "owner": "haskell", + "ref": "2.0.0.1", + "repo": "haskell-language-server", "type": "github" } }, - "nix-tools_14": { + "hls-2.2": { "flake": false, "locked": { - "lastModified": 1649424170, - "narHash": "sha256-XgKXWispvv5RCvZzPb+p7e6Hy3LMuRjafKMl7kXzxGw=", - "owner": "input-output-hk", - "repo": "nix-tools", - "rev": "e109c94016e3b6e0db7ed413c793e2d4bdb24aa7", + "lastModified": 1693064058, + "narHash": "sha256-8DGIyz5GjuCFmohY6Fa79hHA/p1iIqubfJUTGQElbNk=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "b30f4b6cf5822f3112c35d14a0cba51f3fe23b85", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-tools", + "owner": "haskell", + "ref": "2.2.0.0", + "repo": "haskell-language-server", "type": "github" } }, - "nix-tools_2": { + "hls-2.3": { "flake": false, "locked": { - "lastModified": 1649424170, - "narHash": "sha256-XgKXWispvv5RCvZzPb+p7e6Hy3LMuRjafKMl7kXzxGw=", - "owner": "input-output-hk", - "repo": "nix-tools", - "rev": "e109c94016e3b6e0db7ed413c793e2d4bdb24aa7", + "lastModified": 1695910642, + "narHash": "sha256-tR58doOs3DncFehHwCLczJgntyG/zlsSd7DgDgMPOkI=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "458ccdb55c9ea22cd5d13ec3051aaefb295321be", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-tools", + "owner": "haskell", + "ref": "2.3.0.0", + "repo": "haskell-language-server", "type": "github" } }, - "nix-tools_3": { + "hls-2.4": { "flake": false, "locked": { - "lastModified": 1658968505, - "narHash": "sha256-UnbQ/Ig/23e9hUdDOBwYHwHgHmQawZ2uazpJ8DLIJgE=", - "owner": "input-output-hk", - "repo": "nix-tools", - "rev": "8a754bdcf20b20e116409c2341cf69065d083053", + "lastModified": 1696939266, + "narHash": "sha256-VOMf5+kyOeOmfXTHlv4LNFJuDGa7G3pDnOxtzYR40IU=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "362fdd1293efb4b82410b676ab1273479f6d17ee", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-tools", + "owner": "haskell", + "ref": "2.4.0.0", + "repo": "haskell-language-server", "type": "github" } }, - "nix-tools_4": { + "hpc-coveralls": { "flake": false, "locked": { - "lastModified": 1649424170, - "narHash": "sha256-XgKXWispvv5RCvZzPb+p7e6Hy3LMuRjafKMl7kXzxGw=", - "owner": "input-output-hk", - "repo": "nix-tools", - "rev": "e109c94016e3b6e0db7ed413c793e2d4bdb24aa7", + "lastModified": 1607498076, + "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-tools", + "owner": "sevanspowell", + "repo": "hpc-coveralls", "type": "github" } }, - "nix-tools_5": { + "hpc-coveralls_2": { "flake": false, "locked": { - "lastModified": 1649424170, - "narHash": "sha256-XgKXWispvv5RCvZzPb+p7e6Hy3LMuRjafKMl7kXzxGw=", - "owner": "input-output-hk", - "repo": "nix-tools", - "rev": "e109c94016e3b6e0db7ed413c793e2d4bdb24aa7", + "lastModified": 1607498076, + "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-tools", + "owner": "sevanspowell", + "repo": "hpc-coveralls", "type": "github" } }, - "nix-tools_6": { + "hpc-coveralls_3": { "flake": false, "locked": { - "lastModified": 1649424170, - "narHash": "sha256-XgKXWispvv5RCvZzPb+p7e6Hy3LMuRjafKMl7kXzxGw=", - "owner": "input-output-hk", - "repo": "nix-tools", - "rev": "e109c94016e3b6e0db7ed413c793e2d4bdb24aa7", + "lastModified": 1607498076, + "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-tools", + "owner": "sevanspowell", + "repo": "hpc-coveralls", "type": "github" } }, - "nix-tools_7": { + "hpc-coveralls_4": { "flake": false, "locked": { - "lastModified": 1636018067, - "narHash": "sha256-ng306fkuwr6V/malWtt3979iAC4yMVDDH2ViwYB6sQE=", - "owner": "input-output-hk", - "repo": "nix-tools", - "rev": "ed5bd7215292deba55d6ab7a4e8c21f8b1564dda", + "lastModified": 1607498076, + "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-tools", + "owner": "sevanspowell", + "repo": "hpc-coveralls", "type": "github" } }, - "nix-tools_8": { + "hpc-coveralls_5": { "flake": false, "locked": { - "lastModified": 1636018067, - "narHash": "sha256-ng306fkuwr6V/malWtt3979iAC4yMVDDH2ViwYB6sQE=", - "owner": "input-output-hk", - "repo": "nix-tools", - "rev": "ed5bd7215292deba55d6ab7a4e8c21f8b1564dda", + "lastModified": 1607498076, + "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-tools", + "owner": "sevanspowell", + "repo": "hpc-coveralls", "type": "github" } }, - "nix-tools_9": { + "hpc-coveralls_6": { "flake": false, "locked": { - "lastModified": 1636018067, - "narHash": "sha256-ng306fkuwr6V/malWtt3979iAC4yMVDDH2ViwYB6sQE=", - "owner": "input-output-hk", - "repo": "nix-tools", - "rev": "ed5bd7215292deba55d6ab7a4e8c21f8b1564dda", + "lastModified": 1607498076, + "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-tools", + "owner": "sevanspowell", + "repo": "hpc-coveralls", "type": "github" } }, - "nix2container": { - "inputs": { - "flake-utils": "flake-utils_25", - "nixpkgs": "nixpkgs_58" - }, + "hpc-coveralls_7": { + "flake": false, "locked": { - "lastModified": 1653427219, - "narHash": "sha256-q6MzrIZq1BBFxYN+UQjW60LpQJXV6RIIUmO8gKRyMqg=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "11a0e14c2468720f42ca8dec3b82862abf96c837", + "lastModified": 1607498076, + "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", "type": "github" }, "original": { - "owner": "nlewo", - "ref": "init-nix-db", - "repo": "nix2container", + "owner": "sevanspowell", + "repo": "hpc-coveralls", "type": "github" } }, - "nix2container_2": { + "hydra": { "inputs": { - "flake-utils": "flake-utils_35", - "nixpkgs": "nixpkgs_71" + "nix": "nix", + "nixpkgs": [ + "ctl", + "cardano-node", + "haskellNix", + "hydra", + "nix", + "nixpkgs" + ] }, "locked": { - "lastModified": 1658567952, - "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", + "lastModified": 1671755331, + "narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=", + "owner": "NixOS", + "repo": "hydra", + "rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8", "type": "github" }, "original": { - "owner": "nlewo", - "repo": "nix2container", - "type": "github" + "id": "hydra", + "type": "indirect" } }, - "nix2container_3": { + "hydra_2": { "inputs": { - "flake-utils": "flake-utils_43", - "nixpkgs": "nixpkgs_79" + "nix": [ + "ctl", + "db-sync", + "cardano-world", + "bitte", + "capsules", + "bitte", + "nix" + ], + "nixpkgs": [ + "ctl", + "db-sync", + "cardano-world", + "bitte", + "capsules", + "bitte", + "nixpkgs" + ] }, "locked": { - "lastModified": 1658567952, - "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", + "lastModified": 1631062883, + "narHash": "sha256-JZ6/gjHyX50fHCYpXy/FrX9C0e9k8X9In5Jb/SQYlT8=", + "owner": "kreisys", + "repo": "hydra", + "rev": "785326948be4b1cc2ce77435c806521565e9af45", "type": "github" }, "original": { - "owner": "nlewo", - "repo": "nix2container", + "owner": "kreisys", + "ref": "hydra-server-includes", + "repo": "hydra", "type": "github" } }, - "nixTools": { - "flake": false, + "hydra_3": { + "inputs": { + "nix": [ + "ctl", + "db-sync", + "cardano-world", + "bitte", + "nix" + ], + "nixpkgs": [ + "ctl", + "db-sync", + "cardano-world", + "bitte", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1644395812, - "narHash": "sha256-BVFk/BEsTLq5MMZvdy3ZYHKfaS3dHrsKh4+tb5t5b58=", - "owner": "input-output-hk", - "repo": "nix-tools", - "rev": "d847c63b99bbec78bf83be2a61dc9f09b8a9ccc1", + "lastModified": 1631062883, + "narHash": "sha256-JZ6/gjHyX50fHCYpXy/FrX9C0e9k8X9In5Jb/SQYlT8=", + "owner": "kreisys", + "repo": "hydra", + "rev": "785326948be4b1cc2ce77435c806521565e9af45", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-tools", + "owner": "kreisys", + "ref": "hydra-server-includes", + "repo": "hydra", "type": "github" } }, - "nixTools_2": { - "flake": false, + "hydra_4": { + "inputs": { + "nix": [ + "ctl", + "db-sync", + "cardano-world", + "capsules", + "bitte", + "nix" + ], + "nixpkgs": [ + "ctl", + "db-sync", + "cardano-world", + "capsules", + "bitte", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1649424170, - "narHash": "sha256-XgKXWispvv5RCvZzPb+p7e6Hy3LMuRjafKMl7kXzxGw=", - "owner": "input-output-hk", - "repo": "nix-tools", - "rev": "e109c94016e3b6e0db7ed413c793e2d4bdb24aa7", + "lastModified": 1631062883, + "narHash": "sha256-JZ6/gjHyX50fHCYpXy/FrX9C0e9k8X9In5Jb/SQYlT8=", + "owner": "kreisys", + "repo": "hydra", + "rev": "785326948be4b1cc2ce77435c806521565e9af45", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-tools", + "owner": "kreisys", + "ref": "hydra-server-includes", + "repo": "hydra", "type": "github" } }, - "nix_10": { + "hydra_5": { "inputs": { - "lowdown-src": "lowdown-src_10", - "nixpkgs": "nixpkgs_40", - "nixpkgs-regression": "nixpkgs-regression_8" + "nix": "nix_12", + "nixpkgs": [ + "ctl", + "db-sync", + "cardano-world", + "cardano-wallet", + "haskellNix", + "hydra", + "nix", + "nixpkgs" + ] }, "locked": { - "lastModified": 1645189081, - "narHash": "sha256-yZA+07JTG9Z610DceiYyzm+C08yHhcIgfl/Cp7lY3ho=", - "owner": "nixos", - "repo": "nix", - "rev": "9bc03adbba5334663901c1136203bc07e4776be9", + "lastModified": 1646878427, + "narHash": "sha256-KtbrofMtN8GlM7D+n90kixr7QpSlVmdN+vK5CA/aRzc=", + "owner": "NixOS", + "repo": "hydra", + "rev": "28b682b85b7efc5cf7974065792a1f22203a5927", "type": "github" }, "original": { - "owner": "nixos", - "repo": "nix", - "type": "github" + "id": "hydra", + "type": "indirect" } }, - "nix_11": { + "hydra_6": { "inputs": { - "lowdown-src": "lowdown-src_11", - "nixpkgs": "nixpkgs_52", - "nixpkgs-regression": "nixpkgs-regression_9" + "nix": "nix_13", + "nixpkgs": [ + "ctl", + "db-sync", + "cardano-world", + "haskell-nix", + "hydra", + "nix", + "nixpkgs" + ] }, "locked": { - "lastModified": 1643066034, - "narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=", + "lastModified": 1646878427, + "narHash": "sha256-KtbrofMtN8GlM7D+n90kixr7QpSlVmdN+vK5CA/aRzc=", "owner": "NixOS", - "repo": "nix", - "rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62", + "repo": "hydra", + "rev": "28b682b85b7efc5cf7974065792a1f22203a5927", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "2.6.0", - "repo": "nix", - "type": "github" + "id": "hydra", + "type": "indirect" } }, - "nix_12": { + "hydra_7": { "inputs": { - "lowdown-src": "lowdown-src_12", - "nixpkgs": "nixpkgs_54", - "nixpkgs-regression": "nixpkgs-regression_10" + "nix": "nix_14", + "nixpkgs": [ + "ctl", + "db-sync", + "haskellNix", + "hydra", + "nix", + "nixpkgs" + ] }, "locked": { - "lastModified": 1643066034, - "narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=", + "lastModified": 1646878427, + "narHash": "sha256-KtbrofMtN8GlM7D+n90kixr7QpSlVmdN+vK5CA/aRzc=", "owner": "NixOS", - "repo": "nix", - "rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62", + "repo": "hydra", + "rev": "28b682b85b7efc5cf7974065792a1f22203a5927", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "2.6.0", - "repo": "nix", - "type": "github" + "id": "hydra", + "type": "indirect" } }, - "nix_13": { + "hydra_8": { "inputs": { - "lowdown-src": "lowdown-src_13", - "nixpkgs": "nixpkgs_61", - "nixpkgs-regression": "nixpkgs-regression_11" + "nix": "nix_15", + "nixpkgs": [ + "ctl", + "haskell-nix", + "hydra", + "nix", + "nixpkgs" + ] }, "locked": { - "lastModified": 1643066034, - "narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=", + "lastModified": 1671755331, + "narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=", "owner": "NixOS", - "repo": "nix", - "rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62", + "repo": "hydra", + "rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "2.6.0", - "repo": "nix", - "type": "github" + "id": "hydra", + "type": "indirect" } }, - "nix_14": { + "hydra_9": { "inputs": { - "lowdown-src": "lowdown-src_14", - "nixpkgs": "nixpkgs_62", - "nixpkgs-regression": "nixpkgs-regression_12" + "nix": "nix_16", + "nixpkgs": [ + "ctl", + "kupo-nixos", + "haskell-nix", + "hydra", + "nix", + "nixpkgs" + ] }, "locked": { - "lastModified": 1643066034, - "narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=", + "lastModified": 1646878427, + "narHash": "sha256-KtbrofMtN8GlM7D+n90kixr7QpSlVmdN+vK5CA/aRzc=", "owner": "NixOS", - "repo": "nix", - "rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62", + "repo": "hydra", + "rev": "28b682b85b7efc5cf7974065792a1f22203a5927", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "2.6.0", - "repo": "nix", - "type": "github" + "id": "hydra", + "type": "indirect" } }, - "nix_15": { + "incl": { "inputs": { - "lowdown-src": "lowdown-src_15", - "nixpkgs": "nixpkgs_64", - "nixpkgs-regression": "nixpkgs-regression_13" + "nixlib": [ + "ctl", + "cardano-node", + "tullia", + "std", + "nixpkgs" + ] }, "locked": { - "lastModified": 1643066034, - "narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=", - "owner": "NixOS", - "repo": "nix", - "rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62", + "lastModified": 1669263024, + "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", + "owner": "divnix", + "repo": "incl", + "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "2.6.0", - "repo": "nix", + "owner": "divnix", + "repo": "incl", "type": "github" } }, - "nix_16": { + "inclusive": { "inputs": { - "lowdown-src": "lowdown-src_16", - "nixpkgs": "nixpkgs_66", - "nixpkgs-regression": "nixpkgs-regression_14" + "stdlib": "stdlib" }, "locked": { - "lastModified": 1643066034, - "narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=", - "owner": "NixOS", - "repo": "nix", - "rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62", + "lastModified": 1628098927, + "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", + "owner": "input-output-hk", + "repo": "nix-inclusive", + "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "2.6.0", - "repo": "nix", + "owner": "input-output-hk", + "repo": "nix-inclusive", "type": "github" } }, - "nix_17": { + "inclusive_10": { "inputs": { - "lowdown-src": "lowdown-src_17", - "nixpkgs": "nixpkgs_69", - "nixpkgs-regression": "nixpkgs-regression_15" + "stdlib": "stdlib_10" }, "locked": { - "lastModified": 1643066034, - "narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=", - "owner": "NixOS", - "repo": "nix", - "rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62", + "lastModified": 1628098927, + "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", + "owner": "input-output-hk", + "repo": "nix-inclusive", + "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "2.6.0", - "repo": "nix", + "owner": "input-output-hk", + "repo": "nix-inclusive", "type": "github" } }, - "nix_18": { + "inclusive_11": { "inputs": { - "lowdown-src": "lowdown-src_18", - "nixpkgs": "nixpkgs_74", - "nixpkgs-regression": "nixpkgs-regression_16" + "stdlib": "stdlib_11" }, "locked": { - "lastModified": 1643066034, - "narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=", - "owner": "NixOS", - "repo": "nix", - "rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62", + "lastModified": 1628098927, + "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", + "owner": "input-output-hk", + "repo": "nix-inclusive", + "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "2.6.0", - "repo": "nix", + "owner": "input-output-hk", + "repo": "nix-inclusive", "type": "github" } }, - "nix_19": { + "inclusive_2": { "inputs": { - "lowdown-src": "lowdown-src_19", - "nixpkgs": "nixpkgs_77", - "nixpkgs-regression": "nixpkgs-regression_17" + "stdlib": "stdlib_2" }, "locked": { - "lastModified": 1643066034, - "narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=", - "owner": "NixOS", - "repo": "nix", - "rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62", + "lastModified": 1628098927, + "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", + "owner": "input-output-hk", + "repo": "nix-inclusive", + "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "2.6.0", - "repo": "nix", + "owner": "input-output-hk", + "repo": "nix-inclusive", "type": "github" } }, - "nix_2": { + "inclusive_3": { "inputs": { - "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_9" + "stdlib": "stdlib_3" }, "locked": { - "lastModified": 1604400356, - "narHash": "sha256-PX1cSYv0Y6I2tidcuEwJTo8X5vAvf9vjdfHO51LD/J0=", - "owner": "NixOS", - "repo": "nix", - "rev": "cf82e14712b3be881b7c880468cd5486e8934638", + "lastModified": 1628098927, + "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", + "owner": "input-output-hk", + "repo": "nix-inclusive", + "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", "type": "github" }, "original": { - "owner": "NixOS", - "repo": "nix", + "owner": "input-output-hk", + "repo": "nix-inclusive", "type": "github" } }, - "nix_20": { + "inclusive_4": { "inputs": { - "lowdown-src": "lowdown-src_20", - "nixpkgs": "nixpkgs_81", - "nixpkgs-regression": "nixpkgs-regression_18" + "stdlib": "stdlib_4" }, "locked": { - "lastModified": 1643066034, - "narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=", - "owner": "NixOS", - "repo": "nix", - "rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62", + "lastModified": 1628098927, + "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", + "owner": "input-output-hk", + "repo": "nix-inclusive", + "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "2.6.0", - "repo": "nix", + "owner": "input-output-hk", + "repo": "nix-inclusive", "type": "github" } }, - "nix_3": { + "inclusive_5": { "inputs": { - "lowdown-src": "lowdown-src_3", - "nixpkgs": "nixpkgs_11", - "nixpkgs-regression": "nixpkgs-regression_2" + "stdlib": "stdlib_5" }, "locked": { - "lastModified": 1645189081, - "narHash": "sha256-yZA+07JTG9Z610DceiYyzm+C08yHhcIgfl/Cp7lY3ho=", - "owner": "nixos", - "repo": "nix", - "rev": "9bc03adbba5334663901c1136203bc07e4776be9", + "lastModified": 1628098927, + "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", + "owner": "input-output-hk", + "repo": "nix-inclusive", + "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", "type": "github" }, "original": { - "owner": "nixos", - "repo": "nix", + "owner": "input-output-hk", + "repo": "nix-inclusive", "type": "github" } }, - "nix_4": { + "inclusive_6": { "inputs": { - "lowdown-src": "lowdown-src_4", - "nixpkgs": "nixpkgs_21", - "nixpkgs-regression": "nixpkgs-regression_3" + "stdlib": "stdlib_6" }, "locked": { - "lastModified": 1652510778, - "narHash": "sha256-zldZ4SiwkISFXxrbY/UdwooIZ3Z/I6qKxtpc3zD0T/o=", - "owner": "nixos", - "repo": "nix", - "rev": "65cd26eebbbf80eaf0d74092f09b737606cb4b5a", + "lastModified": 1628098927, + "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", + "owner": "input-output-hk", + "repo": "nix-inclusive", + "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", "type": "github" }, "original": { - "owner": "nixos", - "ref": "2.8.1", - "repo": "nix", + "owner": "input-output-hk", + "repo": "nix-inclusive", "type": "github" } }, - "nix_5": { + "inclusive_7": { "inputs": { - "lowdown-src": "lowdown-src_5", - "nixpkgs": "nixpkgs_23", - "nixpkgs-regression": "nixpkgs-regression_4" + "stdlib": "stdlib_7" }, "locked": { - "lastModified": 1645189081, - "narHash": "sha256-yZA+07JTG9Z610DceiYyzm+C08yHhcIgfl/Cp7lY3ho=", - "owner": "nixos", - "repo": "nix", - "rev": "9bc03adbba5334663901c1136203bc07e4776be9", + "lastModified": 1628098927, + "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", + "owner": "input-output-hk", + "repo": "nix-inclusive", + "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", "type": "github" }, "original": { - "owner": "nixos", - "repo": "nix", + "owner": "input-output-hk", + "repo": "nix-inclusive", "type": "github" } }, - "nix_6": { + "inclusive_8": { "inputs": { - "lowdown-src": "lowdown-src_6", - "nixpkgs": "nixpkgs_30", - "nixpkgs-regression": "nixpkgs-regression_5" + "stdlib": "stdlib_8" }, "locked": { - "lastModified": 1644413094, - "narHash": "sha256-KLGaeSqvhuUFz6DxrB9r3w+lfp9bXIiCT9K1cqg7Ze8=", - "owner": "nixos", - "repo": "nix", - "rev": "52f52319ad21bdbd7a33bb85eccc83756648f110", + "lastModified": 1628098927, + "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", + "owner": "input-output-hk", + "repo": "nix-inclusive", + "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", "type": "github" }, "original": { - "owner": "nixos", - "repo": "nix", - "rev": "52f52319ad21bdbd7a33bb85eccc83756648f110", + "owner": "input-output-hk", + "repo": "nix-inclusive", "type": "github" } }, - "nix_7": { + "inclusive_9": { "inputs": { - "lowdown-src": "lowdown-src_7", - "nixpkgs": "nixpkgs_31", - "nixpkgs-regression": "nixpkgs-regression_6" + "stdlib": "stdlib_9" }, "locked": { - "lastModified": 1645437800, - "narHash": "sha256-MAMIKi3sIQ0b3jzYyOb5VY29GRgv7JXl1VXoUM9xUZw=", - "owner": "NixOS", - "repo": "nix", - "rev": "f22b9e72f51f97f8f2d334748d3e97123940a146", + "lastModified": 1628098927, + "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", + "owner": "input-output-hk", + "repo": "nix-inclusive", + "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", "type": "github" }, "original": { - "owner": "NixOS", - "repo": "nix", - "rev": "f22b9e72f51f97f8f2d334748d3e97123940a146", + "owner": "input-output-hk", + "repo": "nix-inclusive", "type": "github" } }, - "nix_8": { + "iogo": { "inputs": { - "lowdown-src": "lowdown-src_8", - "nixpkgs": "nixpkgs_36", - "nixpkgs-regression": "nixpkgs-regression_7" + "devshell": "devshell_4", + "inclusive": "inclusive_3", + "nixpkgs": "nixpkgs_22", + "utils": "utils_8" }, "locked": { - "lastModified": 1646164353, - "narHash": "sha256-Nj3ARvplf0Xa+h4F5Cq1r9cc81C2UIpbAKDgJLsDmUc=", - "owner": "kreisys", - "repo": "nix", - "rev": "45677cae8d474270ecd797eb40eb1f8836981604", + "lastModified": 1652212694, + "narHash": "sha256-baAY5wKzccNsm7OCEYuySrkXRmlshokCHQjs4EdYShM=", + "owner": "input-output-hk", + "repo": "bitte-iogo", + "rev": "e465975aa368b2d919e865f71eeed02828e55471", "type": "github" }, "original": { - "owner": "kreisys", - "ref": "goodnix-maybe-dont-functor", - "repo": "nix", + "owner": "input-output-hk", + "repo": "bitte-iogo", "type": "github" } }, - "nix_9": { + "iogo_2": { "inputs": { - "lowdown-src": "lowdown-src_9", - "nixpkgs": "nixpkgs_38" + "devshell": "devshell_14", + "inclusive": "inclusive_11", + "nixpkgs": "nixpkgs_51", + "utils": "utils_22" }, "locked": { - "lastModified": 1604400356, - "narHash": "sha256-PX1cSYv0Y6I2tidcuEwJTo8X5vAvf9vjdfHO51LD/J0=", - "owner": "NixOS", - "repo": "nix", - "rev": "cf82e14712b3be881b7c880468cd5486e8934638", + "lastModified": 1658302707, + "narHash": "sha256-E0FA1CEMQlfAsmtLBRoQE7IY4ItKlBdxZ44YX0tK5Hg=", + "owner": "input-output-hk", + "repo": "bitte-iogo", + "rev": "8751660009202bc95ea3a29e304c393c140a4231", "type": "github" }, "original": { - "owner": "NixOS", - "repo": "nix", + "owner": "input-output-hk", + "repo": "bitte-iogo", "type": "github" } }, - "nixago": { + "iohk-nix": { "inputs": { - "flake-utils": [ - "ctl", - "db-sync", - "cardano-world", - "bitte", - "std", - "flake-utils" - ], - "nixago-exts": "nixago-exts", "nixpkgs": [ "ctl", "db-sync", "cardano-world", - "bitte", - "std", "nixpkgs" ] }, "locked": { - "lastModified": 1659153038, - "narHash": "sha256-g4npRU8YBR7CAqMF0SyXtkHnoY9q+NcxvZwcc6UvLBc=", - "owner": "nix-community", - "repo": "nixago", - "rev": "608abdd0fe6729d1f7244e03f1a7f8a5d6408898", + "lastModified": 1658222743, + "narHash": "sha256-yFH01psqx30y5Ws4dBElLkxYpIxxqZx4G+jCVhsXpnA=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "9a604d01bd4420ab7f396f14d1947fbe2ce7db8b", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "nixago", + "owner": "input-output-hk", + "repo": "iohk-nix", "type": "github" } }, - "nixago-exts": { + "iohk-nix_2": { + "inputs": { + "blst": "blst_2", + "nixpkgs": [ + "ctl", + "nixpkgs" + ], + "secp256k1": "secp256k1_2", + "sodium": "sodium_2" + }, "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "lastModified": 1702362799, + "narHash": "sha256-cU8cZXNuo5GRwrSvWqdaqoW5tJ2HWwDEOvWwIVPDPmo=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "b426fb9e0b109a9d1dd2e1476f9e0bd8bb715142", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "nixago-extensions", + "owner": "input-output-hk", + "repo": "iohk-nix", "type": "github" } }, - "nixago-exts_2": { + "iohk-nix_3": { + "inputs": { + "nixpkgs": [ + "ctl", + "kupo-nixos", + "haskell-nix", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "lastModified": 1653579289, + "narHash": "sha256-wveDdPsgB/3nAGAdFaxrcgLEpdi0aJ5kEVNtI+YqVfo=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "edb2d2df2ebe42bbdf03a0711115cf6213c9d366", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "nixago-extensions", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "edb2d2df2ebe42bbdf03a0711115cf6213c9d366", "type": "github" } }, - "nixago_2": { + "iohkNix": { "inputs": { - "flake-utils": [ + "blst": "blst", + "nixpkgs": [ "ctl", - "db-sync", - "cardano-world", - "std", - "flake-utils" + "cardano-node", + "nixpkgs" ], - "nixago-exts": "nixago-exts_2", + "secp256k1": "secp256k1", + "sodium": "sodium" + }, + "locked": { + "lastModified": 1684223806, + "narHash": "sha256-IyLoP+zhuyygLtr83XXsrvKyqqLQ8FHXTiySFf4FJOI=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "86421fdd89b3af43fa716ccd07638f96c6ecd1e4", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "iohk-nix", + "type": "github" + } + }, + "iohkNix_2": { + "inputs": { "nixpkgs": [ "ctl", "db-sync", "cardano-world", - "std", + "cardano-wallet", "nixpkgs" ] }, "locked": { - "lastModified": 1659153038, - "narHash": "sha256-g4npRU8YBR7CAqMF0SyXtkHnoY9q+NcxvZwcc6UvLBc=", - "owner": "nix-community", - "repo": "nixago", - "rev": "608abdd0fe6729d1f7244e03f1a7f8a5d6408898", + "lastModified": 1653579289, + "narHash": "sha256-wveDdPsgB/3nAGAdFaxrcgLEpdi0aJ5kEVNtI+YqVfo=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "edb2d2df2ebe42bbdf03a0711115cf6213c9d366", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "nixago", + "owner": "input-output-hk", + "repo": "iohk-nix", "type": "github" } }, - "nixago_3": { + "iohkNix_3": { "inputs": { - "flake-utils": [ - "ctl", - "ogmios", - "haskell-nix", - "tullia", - "std", - "flake-utils" - ], - "nixago-exts": [ - "ctl", - "ogmios", - "haskell-nix", - "tullia", - "std", - "blank" - ], "nixpkgs": [ "ctl", - "ogmios", - "haskell-nix", - "tullia", - "std", + "db-sync", "nixpkgs" ] }, "locked": { - "lastModified": 1661824785, - "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", - "owner": "nix-community", - "repo": "nixago", - "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", + "lastModified": 1667394105, + "narHash": "sha256-YhS7zGd6jK/QM/+wWyj0zUBZmE3HOXAL/kpJptGYIWg=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "7fc7625a9ab2ba137bc70ddbc89a13d3fdb78c8b", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "iohk-nix", + "type": "github" + } + }, + "iserv-proxy": { + "flake": false, + "locked": { + "lastModified": 1670983692, + "narHash": "sha256-avLo34JnI9HNyOuauK5R69usJm+GfW3MlyGlYxZhTgY=", + "ref": "hkm/remote-iserv", + "rev": "50d0abb3317ac439a4e7495b185a64af9b7b9300", + "revCount": 10, + "type": "git", + "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + }, + "original": { + "ref": "hkm/remote-iserv", + "type": "git", + "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + } + }, + "iserv-proxy_2": { + "flake": false, + "locked": { + "lastModified": 1691634696, + "narHash": "sha256-MZH2NznKC/gbgBu8NgIibtSUZeJ00HTLJ0PlWKCBHb0=", + "ref": "hkm/remote-iserv", + "rev": "43a979272d9addc29fbffc2e8542c5d96e993d73", + "revCount": 14, + "type": "git", + "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + }, + "original": { + "ref": "hkm/remote-iserv", + "type": "git", + "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + } + }, + "kupo": { + "flake": false, + "locked": { + "lastModified": 1668678914, + "narHash": "sha256-XsbAFyUPmevGuoShEFlOVHt/7fFIpyCQuhulIrNzv80=", + "owner": "CardanoSolutions", + "repo": "kupo", + "rev": "c9bc18d99f9e8af1840a265907db82b180d5a4d8", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "nixago", + "owner": "CardanoSolutions", + "ref": "v2.2.0", + "repo": "kupo", "type": "github" } }, - "nixago_4": { + "kupo-nixos": { "inputs": { - "flake-utils": [ - "ctl", - "ogmios-nixos", - "haskell-nix", - "tullia", - "std", - "flake-utils" - ], - "nixago-exts": [ + "haskell-nix": "haskell-nix_4", + "iohk-nix": "iohk-nix_3", + "kupo": [ "ctl", - "ogmios-nixos", - "haskell-nix", - "tullia", - "std", - "blank" + "kupo" ], "nixpkgs": [ "ctl", - "ogmios-nixos", + "kupo-nixos", "haskell-nix", - "tullia", - "std", "nixpkgs" ] }, "locked": { - "lastModified": 1661824785, - "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", - "owner": "nix-community", - "repo": "nixago", - "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", + "lastModified": 1672905539, + "narHash": "sha256-B4vryG94L7WWn/tuIQdtg9eZHAH+FaFzv35Mancd2l8=", + "owner": "mlabs-haskell", + "repo": "kupo-nixos", + "rev": "6f89cbcc359893a2aea14dd380f9a45e04c6aa67", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "nixago", + "owner": "mlabs-haskell", + "repo": "kupo-nixos", + "rev": "6f89cbcc359893a2aea14dd380f9a45e04c6aa67", "type": "github" } }, - "nixlib": { + "lowdown-src": { + "flake": false, "locked": { - "lastModified": 1652576347, - "narHash": "sha256-52Wu7hkcIRcS4UenSSrt01J2sAbbQ6YqxZIDpuEPL/c=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "bdf553800c9c34ed00641785b02038f67f44d671", + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", + "owner": "kristapsdz", + "repo": "lowdown", "type": "github" } }, - "nixlib_2": { + "lowdown-src_10": { + "flake": false, "locked": { - "lastModified": 1644107864, - "narHash": "sha256-Wrbt6Gs+hjXD3HUICPBJHKnHEUqiyx8rzHCgvqC1Bok=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "58eabcf65e7dba189eb0013f86831c159e3b2be6", + "lastModified": 1598695561, + "narHash": "sha256-gyH/5j+h/nWw0W8AcR2WKvNBUsiQ7QuxqSJNXAwV+8E=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "1705b4a26fbf065d9574dce47a94e8c7c79e052f", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", + "owner": "kristapsdz", + "repo": "lowdown", "type": "github" } }, - "nixlib_3": { + "lowdown-src_11": { + "flake": false, "locked": { - "lastModified": 1656809537, - "narHash": "sha256-pwXBYG3ThN4ccJjvcdNdonQ8Wyv0y/iYdnuesiFUY1U=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "40e271f69106323734b55e2ba74f13bebde324c0", + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", + "owner": "kristapsdz", + "repo": "lowdown", "type": "github" } }, - "nixpkgs": { + "lowdown-src_12": { + "flake": false, "locked": { - "lastModified": 1676253841, - "narHash": "sha256-jhuI8Mmky8VCD45OoJEuF6HdPLFBwNrHA0ljjZ/zkfw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a45a8916243a7d27acc358f4fc18c4491f3eeca8", + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "release-22.11", - "repo": "nixpkgs", + "owner": "kristapsdz", + "repo": "lowdown", "type": "github" } }, - "nixpkgs-2003": { + "lowdown-src_13": { + "flake": false, "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", + "owner": "kristapsdz", + "repo": "lowdown", "type": "github" } }, - "nixpkgs-2003_10": { + "lowdown-src_14": { + "flake": false, "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", + "owner": "kristapsdz", + "repo": "lowdown", "type": "github" } }, - "nixpkgs-2003_11": { + "lowdown-src_15": { + "flake": false, "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", + "owner": "kristapsdz", + "repo": "lowdown", "type": "github" } }, - "nixpkgs-2003_12": { + "lowdown-src_16": { + "flake": false, "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", + "owner": "kristapsdz", + "repo": "lowdown", "type": "github" } }, - "nixpkgs-2003_13": { + "lowdown-src_2": { + "flake": false, "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", + "owner": "kristapsdz", + "repo": "lowdown", "type": "github" } }, - "nixpkgs-2003_14": { + "lowdown-src_3": { + "flake": false, "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "lastModified": 1598695561, + "narHash": "sha256-gyH/5j+h/nWw0W8AcR2WKvNBUsiQ7QuxqSJNXAwV+8E=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "1705b4a26fbf065d9574dce47a94e8c7c79e052f", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", + "owner": "kristapsdz", + "repo": "lowdown", "type": "github" } }, - "nixpkgs-2003_15": { + "lowdown-src_4": { + "flake": false, "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", + "owner": "kristapsdz", + "repo": "lowdown", "type": "github" } }, - "nixpkgs-2003_16": { + "lowdown-src_5": { + "flake": false, "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", + "owner": "kristapsdz", + "repo": "lowdown", "type": "github" } }, - "nixpkgs-2003_17": { - "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "lowdown-src_6": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", + "owner": "kristapsdz", + "repo": "lowdown", "type": "github" } }, - "nixpkgs-2003_2": { + "lowdown-src_7": { + "flake": false, "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", + "owner": "kristapsdz", + "repo": "lowdown", "type": "github" } }, - "nixpkgs-2003_3": { + "lowdown-src_8": { + "flake": false, "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", + "owner": "kristapsdz", + "repo": "lowdown", "type": "github" } }, - "nixpkgs-2003_4": { + "lowdown-src_9": { + "flake": false, "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", + "owner": "kristapsdz", + "repo": "lowdown", "type": "github" } }, - "nixpkgs-2003_5": { + "mdbook-kroki-preprocessor": { + "flake": false, "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "lastModified": 1655670640, + "narHash": "sha256-JjqdxftHBjABTkOpFl3cWUJtc/KGwkQ3NRWGLjH2oUs=", + "owner": "JoelCourtney", + "repo": "mdbook-kroki-preprocessor", + "rev": "bb6e607437ecc3f22fd9036acee6b797a5b45dbc", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", + "owner": "JoelCourtney", + "repo": "mdbook-kroki-preprocessor", "type": "github" } }, - "nixpkgs-2003_6": { + "mdbook-kroki-preprocessor_2": { + "flake": false, "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "lastModified": 1655670640, + "narHash": "sha256-JjqdxftHBjABTkOpFl3cWUJtc/KGwkQ3NRWGLjH2oUs=", + "owner": "JoelCourtney", + "repo": "mdbook-kroki-preprocessor", + "rev": "bb6e607437ecc3f22fd9036acee6b797a5b45dbc", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", + "owner": "JoelCourtney", + "repo": "mdbook-kroki-preprocessor", "type": "github" } }, - "nixpkgs-2003_7": { + "n2c": { + "inputs": { + "flake-utils": [ + "ctl", + "cardano-node", + "tullia", + "std", + "flake-utils" + ], + "nixpkgs": [ + "ctl", + "cardano-node", + "tullia", + "std", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "lastModified": 1665039323, + "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", + "owner": "nlewo", + "repo": "nix2container", "type": "github" } }, - "nixpkgs-2003_8": { + "n2c_2": { + "inputs": { + "flake-utils": "flake-utils_11", + "nixpkgs": "nixpkgs_27" + }, "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "lastModified": 1650568002, + "narHash": "sha256-CciO5C3k/a7sbA+lW4jeiU6WGletujMjWcRzc1513tI=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "2cd391fc65847ea54e3657a491c379854b556262", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", + "owner": "nlewo", + "repo": "nix2container", "type": "github" } }, - "nixpkgs-2003_9": { + "n2c_3": { + "inputs": { + "flake-utils": "flake-utils_28", + "nixpkgs": "nixpkgs_62" + }, "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "lastModified": 1655533513, + "narHash": "sha256-MAqvv2AZbyNYGJMpV5l9ydN7k66jDErFpaKOvZ1Y7f8=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "2d47dbe633a059d75c7878f554420158712481cb", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", + "owner": "nlewo", + "repo": "nix2container", "type": "github" } }, - "nixpkgs-2105": { + "nix": { + "inputs": { + "lowdown-src": "lowdown-src", + "nixpkgs": "nixpkgs_3", + "nixpkgs-regression": "nixpkgs-regression" + }, "locked": { - "lastModified": 1642244250, - "narHash": "sha256-vWpUEqQdVP4srj+/YLJRTN9vjpTs4je0cdWKXPbDItc=", + "lastModified": 1661606874, + "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0fd9ee1aa36ce865ad273f4f07fdc093adeb5c00", + "repo": "nix", + "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", + "ref": "2.11.0", + "repo": "nix", "type": "github" } }, - "nixpkgs-2105_10": { + "nix-cache-proxy": { + "inputs": { + "devshell": "devshell_11", + "inclusive": [ + "ctl", + "db-sync", + "cardano-world", + "bitte-cells", + "cicero", + "inclusive" + ], + "nixpkgs": [ + "ctl", + "db-sync", + "cardano-world", + "bitte-cells", + "cicero", + "nixpkgs" + ], + "utils": "utils_15" + }, "locked": { - "lastModified": 1630481079, - "narHash": "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "110a2c9ebbf5d4a94486854f18a37a938cfacbbb", + "lastModified": 1644317729, + "narHash": "sha256-R9R1XHv69VvZ/c7lXYs18PHcnEBXS+hDfhjdkZ96lgw=", + "owner": "input-output-hk", + "repo": "nix-cache-proxy", + "rev": "378617d6b9865be96f7dfa16e0ce3f329da844ec", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", + "owner": "input-output-hk", + "repo": "nix-cache-proxy", "type": "github" } }, - "nixpkgs-2105_11": { + "nix-inclusive": { + "inputs": { + "stdlib": "stdlib_12" + }, "locked": { - "lastModified": 1659914493, - "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", + "lastModified": 1628098927, + "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", + "owner": "input-output-hk", + "repo": "nix-inclusive", + "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", + "owner": "input-output-hk", + "repo": "nix-inclusive", "type": "github" } }, - "nixpkgs-2105_12": { - "locked": { - "lastModified": 1645296114, - "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", - "type": "github" + "nix-nomad": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": [ + "ctl", + "cardano-node", + "tullia", + "nix2container", + "flake-utils" + ], + "gomod2nix": "gomod2nix", + "nixpkgs": [ + "ctl", + "cardano-node", + "tullia", + "nixpkgs" + ], + "nixpkgs-lib": [ + "ctl", + "cardano-node", + "tullia", + "nixpkgs" + ] }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2105_13": { "locked": { - "lastModified": 1640283157, - "narHash": "sha256-6Ddfop+rKE+Gl9Tjp9YIrkfoYPzb8F80ergdjcq3/MY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "dde1557825c5644c869c5efc7448dc03722a8f09", + "lastModified": 1658277770, + "narHash": "sha256-T/PgG3wUn8Z2rnzfxf2VqlR1CBjInPE0l1yVzXxPnt0=", + "owner": "tristanpemble", + "repo": "nix-nomad", + "rev": "054adcbdd0a836ae1c20951b67ed549131fd2d70", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", + "owner": "tristanpemble", + "repo": "nix-nomad", "type": "github" } }, - "nixpkgs-2105_14": { + "nix-tools": { + "flake": false, "locked": { - "lastModified": 1640283157, - "narHash": "sha256-6Ddfop+rKE+Gl9Tjp9YIrkfoYPzb8F80ergdjcq3/MY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "dde1557825c5644c869c5efc7448dc03722a8f09", + "lastModified": 1644395812, + "narHash": "sha256-BVFk/BEsTLq5MMZvdy3ZYHKfaS3dHrsKh4+tb5t5b58=", + "owner": "input-output-hk", + "repo": "nix-tools", + "rev": "d847c63b99bbec78bf83be2a61dc9f09b8a9ccc1", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", + "owner": "input-output-hk", + "repo": "nix-tools", "type": "github" } }, - "nixpkgs-2105_15": { + "nix-tools_2": { + "flake": false, "locked": { - "lastModified": 1630481079, - "narHash": "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "110a2c9ebbf5d4a94486854f18a37a938cfacbbb", + "lastModified": 1649424170, + "narHash": "sha256-XgKXWispvv5RCvZzPb+p7e6Hy3LMuRjafKMl7kXzxGw=", + "owner": "input-output-hk", + "repo": "nix-tools", + "rev": "e109c94016e3b6e0db7ed413c793e2d4bdb24aa7", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", + "owner": "input-output-hk", + "repo": "nix-tools", "type": "github" } }, - "nixpkgs-2105_16": { + "nix-tools_3": { + "flake": false, "locked": { - "lastModified": 1659914493, - "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", + "lastModified": 1658968505, + "narHash": "sha256-UnbQ/Ig/23e9hUdDOBwYHwHgHmQawZ2uazpJ8DLIJgE=", + "owner": "input-output-hk", + "repo": "nix-tools", + "rev": "8a754bdcf20b20e116409c2341cf69065d083053", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", + "owner": "input-output-hk", + "repo": "nix-tools", "type": "github" } }, - "nixpkgs-2105_17": { + "nix-tools_4": { + "flake": false, "locked": { - "lastModified": 1645296114, - "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", + "lastModified": 1649424170, + "narHash": "sha256-XgKXWispvv5RCvZzPb+p7e6Hy3LMuRjafKMl7kXzxGw=", + "owner": "input-output-hk", + "repo": "nix-tools", + "rev": "e109c94016e3b6e0db7ed413c793e2d4bdb24aa7", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", + "owner": "input-output-hk", + "repo": "nix-tools", "type": "github" } }, - "nixpkgs-2105_2": { + "nix-tools_5": { + "flake": false, "locked": { - "lastModified": 1645296114, - "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", + "lastModified": 1649424170, + "narHash": "sha256-XgKXWispvv5RCvZzPb+p7e6Hy3LMuRjafKMl7kXzxGw=", + "owner": "input-output-hk", + "repo": "nix-tools", + "rev": "e109c94016e3b6e0db7ed413c793e2d4bdb24aa7", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", + "owner": "input-output-hk", + "repo": "nix-tools", "type": "github" } }, - "nixpkgs-2105_3": { + "nix2container": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_4" + }, "locked": { - "lastModified": 1655034179, - "narHash": "sha256-rf1/7AbzuYDw6+8Xvvf3PtEOygymLBrFsFxvext5ZjI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "046ee4af7a9f016a364f8f78eeaa356ba524ac31", + "lastModified": 1671269339, + "narHash": "sha256-KR2SXh4c2Y+bgbCfXjTGJ74O9/u4CAPFA0KYZHhKf5Q=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "6800fff45afecc7e47c334d14cf2b2f4f25601a0", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", + "owner": "nlewo", + "repo": "nix2container", "type": "github" } }, - "nixpkgs-2105_4": { + "nix2container_2": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_6" + }, "locked": { - "lastModified": 1645296114, - "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", + "lastModified": 1658567952, + "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", + "owner": "nlewo", + "repo": "nix2container", "type": "github" } }, - "nixpkgs-2105_5": { + "nix2container_3": { + "inputs": { + "flake-utils": "flake-utils_30", + "nixpkgs": "nixpkgs_65" + }, "locked": { - "lastModified": 1645296114, - "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", + "lastModified": 1653427219, + "narHash": "sha256-q6MzrIZq1BBFxYN+UQjW60LpQJXV6RIIUmO8gKRyMqg=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "11a0e14c2468720f42ca8dec3b82862abf96c837", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", + "owner": "nlewo", + "ref": "init-nix-db", + "repo": "nix2container", "type": "github" } }, - "nixpkgs-2105_6": { + "nix_10": { + "inputs": { + "lowdown-src": "lowdown-src_10", + "nixpkgs": "nixpkgs_45" + }, "locked": { - "lastModified": 1645296114, - "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", + "lastModified": 1604400356, + "narHash": "sha256-PX1cSYv0Y6I2tidcuEwJTo8X5vAvf9vjdfHO51LD/J0=", "owner": "NixOS", - "repo": "nixpkgs", - "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", + "repo": "nix", + "rev": "cf82e14712b3be881b7c880468cd5486e8934638", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", + "repo": "nix", "type": "github" } }, - "nixpkgs-2105_7": { + "nix_11": { + "inputs": { + "lowdown-src": "lowdown-src_11", + "nixpkgs": "nixpkgs_47", + "nixpkgs-regression": "nixpkgs-regression_9" + }, "locked": { - "lastModified": 1659914493, - "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", + "lastModified": 1645189081, + "narHash": "sha256-yZA+07JTG9Z610DceiYyzm+C08yHhcIgfl/Cp7lY3ho=", + "owner": "nixos", + "repo": "nix", + "rev": "9bc03adbba5334663901c1136203bc07e4776be9", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", + "owner": "nixos", + "repo": "nix", "type": "github" } }, - "nixpkgs-2105_8": { + "nix_12": { + "inputs": { + "lowdown-src": "lowdown-src_12", + "nixpkgs": "nixpkgs_59", + "nixpkgs-regression": "nixpkgs-regression_10" + }, "locked": { - "lastModified": 1640283157, - "narHash": "sha256-6Ddfop+rKE+Gl9Tjp9YIrkfoYPzb8F80ergdjcq3/MY=", + "lastModified": 1643066034, + "narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=", "owner": "NixOS", - "repo": "nixpkgs", - "rev": "dde1557825c5644c869c5efc7448dc03722a8f09", + "repo": "nix", + "rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", + "ref": "2.6.0", + "repo": "nix", "type": "github" } }, - "nixpkgs-2105_9": { + "nix_13": { + "inputs": { + "lowdown-src": "lowdown-src_13", + "nixpkgs": "nixpkgs_61", + "nixpkgs-regression": "nixpkgs-regression_11" + }, "locked": { - "lastModified": 1640283157, - "narHash": "sha256-6Ddfop+rKE+Gl9Tjp9YIrkfoYPzb8F80ergdjcq3/MY=", + "lastModified": 1643066034, + "narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=", "owner": "NixOS", - "repo": "nixpkgs", - "rev": "dde1557825c5644c869c5efc7448dc03722a8f09", + "repo": "nix", + "rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", + "ref": "2.6.0", + "repo": "nix", "type": "github" } }, - "nixpkgs-2111": { + "nix_14": { + "inputs": { + "lowdown-src": "lowdown-src_14", + "nixpkgs": "nixpkgs_68", + "nixpkgs-regression": "nixpkgs-regression_12" + }, "locked": { - "lastModified": 1644510859, - "narHash": "sha256-xjpVvL5ecbyi0vxtVl/Fh9bwGlMbw3S06zE5nUzFB8A=", + "lastModified": 1643066034, + "narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=", "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0d1d5d7e3679fec9d07f2eb804d9f9fdb98378d3", + "repo": "nix", + "rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", + "ref": "2.6.0", + "repo": "nix", "type": "github" } }, - "nixpkgs-2111_10": { + "nix_15": { + "inputs": { + "lowdown-src": "lowdown-src_15", + "nixpkgs": "nixpkgs_69", + "nixpkgs-regression": "nixpkgs-regression_13" + }, "locked": { - "lastModified": 1638410074, - "narHash": "sha256-MQYI4k4XkoTzpeRjq5wl+1NShsl1CKq8MISFuZ81sWs=", + "lastModified": 1661606874, + "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5b80f23502f8e902612a8c631dfce383e1c56596", + "repo": "nix", + "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", + "ref": "2.11.0", + "repo": "nix", "type": "github" } }, - "nixpkgs-2111_11": { + "nix_16": { + "inputs": { + "lowdown-src": "lowdown-src_16", + "nixpkgs": "nixpkgs_71", + "nixpkgs-regression": "nixpkgs-regression_14" + }, "locked": { - "lastModified": 1659446231, - "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", + "lastModified": 1643066034, + "narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=", "owner": "NixOS", - "repo": "nixpkgs", - "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", + "repo": "nix", + "rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", + "ref": "2.6.0", + "repo": "nix", "type": "github" } }, - "nixpkgs-2111_12": { + "nix_2": { + "inputs": { + "lowdown-src": "lowdown-src_2", + "nixpkgs": "nixpkgs_14", + "nixpkgs-regression": "nixpkgs-regression_2" + }, "locked": { - "lastModified": 1648744337, - "narHash": "sha256-bYe1dFJAXovjqiaPKrmAbSBEK5KUkgwVaZcTbSoJ7hg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0a58eebd8ec65ffdef2ce9562784123a73922052", + "lastModified": 1646164353, + "narHash": "sha256-Nj3ARvplf0Xa+h4F5Cq1r9cc81C2UIpbAKDgJLsDmUc=", + "owner": "kreisys", + "repo": "nix", + "rev": "45677cae8d474270ecd797eb40eb1f8836981604", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", + "owner": "kreisys", + "ref": "goodnix-maybe-dont-functor", + "repo": "nix", "type": "github" } }, - "nixpkgs-2111_13": { + "nix_3": { + "inputs": { + "lowdown-src": "lowdown-src_3", + "nixpkgs": "nixpkgs_16" + }, "locked": { - "lastModified": 1640283207, - "narHash": "sha256-SCwl7ZnCfMDsuSYvwIroiAlk7n33bW8HFfY8NvKhcPA=", + "lastModified": 1604400356, + "narHash": "sha256-PX1cSYv0Y6I2tidcuEwJTo8X5vAvf9vjdfHO51LD/J0=", "owner": "NixOS", - "repo": "nixpkgs", - "rev": "64c7e3388bbd9206e437713351e814366e0c3284", + "repo": "nix", + "rev": "cf82e14712b3be881b7c880468cd5486e8934638", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", + "repo": "nix", "type": "github" } }, - "nixpkgs-2111_14": { + "nix_4": { + "inputs": { + "lowdown-src": "lowdown-src_4", + "nixpkgs": "nixpkgs_18", + "nixpkgs-regression": "nixpkgs-regression_3" + }, "locked": { - "lastModified": 1640283207, - "narHash": "sha256-SCwl7ZnCfMDsuSYvwIroiAlk7n33bW8HFfY8NvKhcPA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "64c7e3388bbd9206e437713351e814366e0c3284", + "lastModified": 1645189081, + "narHash": "sha256-yZA+07JTG9Z610DceiYyzm+C08yHhcIgfl/Cp7lY3ho=", + "owner": "nixos", + "repo": "nix", + "rev": "9bc03adbba5334663901c1136203bc07e4776be9", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", + "owner": "nixos", + "repo": "nix", "type": "github" } }, - "nixpkgs-2111_15": { + "nix_5": { + "inputs": { + "lowdown-src": "lowdown-src_5", + "nixpkgs": "nixpkgs_28", + "nixpkgs-regression": "nixpkgs-regression_4" + }, "locked": { - "lastModified": 1638410074, - "narHash": "sha256-MQYI4k4XkoTzpeRjq5wl+1NShsl1CKq8MISFuZ81sWs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5b80f23502f8e902612a8c631dfce383e1c56596", + "lastModified": 1652510778, + "narHash": "sha256-zldZ4SiwkISFXxrbY/UdwooIZ3Z/I6qKxtpc3zD0T/o=", + "owner": "nixos", + "repo": "nix", + "rev": "65cd26eebbbf80eaf0d74092f09b737606cb4b5a", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", + "owner": "nixos", + "ref": "2.8.1", + "repo": "nix", "type": "github" } }, - "nixpkgs-2111_16": { + "nix_6": { + "inputs": { + "lowdown-src": "lowdown-src_6", + "nixpkgs": "nixpkgs_30", + "nixpkgs-regression": "nixpkgs-regression_5" + }, "locked": { - "lastModified": 1659446231, - "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", + "lastModified": 1645189081, + "narHash": "sha256-yZA+07JTG9Z610DceiYyzm+C08yHhcIgfl/Cp7lY3ho=", + "owner": "nixos", + "repo": "nix", + "rev": "9bc03adbba5334663901c1136203bc07e4776be9", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", + "owner": "nixos", + "repo": "nix", "type": "github" } }, - "nixpkgs-2111_17": { + "nix_7": { + "inputs": { + "lowdown-src": "lowdown-src_7", + "nixpkgs": "nixpkgs_37", + "nixpkgs-regression": "nixpkgs-regression_6" + }, "locked": { - "lastModified": 1648744337, - "narHash": "sha256-bYe1dFJAXovjqiaPKrmAbSBEK5KUkgwVaZcTbSoJ7hg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0a58eebd8ec65ffdef2ce9562784123a73922052", + "lastModified": 1644413094, + "narHash": "sha256-KLGaeSqvhuUFz6DxrB9r3w+lfp9bXIiCT9K1cqg7Ze8=", + "owner": "nixos", + "repo": "nix", + "rev": "52f52319ad21bdbd7a33bb85eccc83756648f110", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", + "owner": "nixos", + "repo": "nix", + "rev": "52f52319ad21bdbd7a33bb85eccc83756648f110", "type": "github" } }, - "nixpkgs-2111_2": { + "nix_8": { + "inputs": { + "lowdown-src": "lowdown-src_8", + "nixpkgs": "nixpkgs_38", + "nixpkgs-regression": "nixpkgs-regression_7" + }, "locked": { - "lastModified": 1648744337, - "narHash": "sha256-bYe1dFJAXovjqiaPKrmAbSBEK5KUkgwVaZcTbSoJ7hg=", + "lastModified": 1645437800, + "narHash": "sha256-MAMIKi3sIQ0b3jzYyOb5VY29GRgv7JXl1VXoUM9xUZw=", "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0a58eebd8ec65ffdef2ce9562784123a73922052", + "repo": "nix", + "rev": "f22b9e72f51f97f8f2d334748d3e97123940a146", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", + "repo": "nix", + "rev": "f22b9e72f51f97f8f2d334748d3e97123940a146", "type": "github" } }, - "nixpkgs-2111_3": { + "nix_9": { + "inputs": { + "lowdown-src": "lowdown-src_9", + "nixpkgs": "nixpkgs_43", + "nixpkgs-regression": "nixpkgs-regression_8" + }, "locked": { - "lastModified": 1656782578, - "narHash": "sha256-1eMCBEqJplPotTo/SZ/t5HU6Sf2I8qKlZi9MX7jv9fw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "573603b7fdb9feb0eb8efc16ee18a015c667ab1b", + "lastModified": 1646164353, + "narHash": "sha256-Nj3ARvplf0Xa+h4F5Cq1r9cc81C2UIpbAKDgJLsDmUc=", + "owner": "kreisys", + "repo": "nix", + "rev": "45677cae8d474270ecd797eb40eb1f8836981604", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", + "owner": "kreisys", + "ref": "goodnix-maybe-dont-functor", + "repo": "nix", "type": "github" } }, - "nixpkgs-2111_4": { + "nixago": { + "inputs": { + "flake-utils": [ + "ctl", + "cardano-node", + "tullia", + "std", + "flake-utils" + ], + "nixago-exts": [ + "ctl", + "cardano-node", + "tullia", + "std", + "blank" + ], + "nixpkgs": [ + "ctl", + "cardano-node", + "tullia", + "std", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1648744337, - "narHash": "sha256-bYe1dFJAXovjqiaPKrmAbSBEK5KUkgwVaZcTbSoJ7hg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0a58eebd8ec65ffdef2ce9562784123a73922052", + "lastModified": 1661824785, + "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", + "owner": "nix-community", + "repo": "nixago", + "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", + "owner": "nix-community", + "repo": "nixago", "type": "github" } }, - "nixpkgs-2111_5": { + "nixago-exts": { "locked": { - "lastModified": 1648744337, - "narHash": "sha256-bYe1dFJAXovjqiaPKrmAbSBEK5KUkgwVaZcTbSoJ7hg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0a58eebd8ec65ffdef2ce9562784123a73922052", + "lastModified": 1625557891, + "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", + "owner": "divnix", + "repo": "blank", + "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", + "owner": "nix-community", + "repo": "nixago-extensions", "type": "github" } }, - "nixpkgs-2111_6": { + "nixago-exts_2": { "locked": { - "lastModified": 1648744337, - "narHash": "sha256-bYe1dFJAXovjqiaPKrmAbSBEK5KUkgwVaZcTbSoJ7hg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0a58eebd8ec65ffdef2ce9562784123a73922052", + "lastModified": 1625557891, + "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", + "owner": "divnix", + "repo": "blank", + "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", + "owner": "nix-community", + "repo": "nixago-extensions", "type": "github" } }, - "nixpkgs-2111_7": { + "nixago_2": { + "inputs": { + "flake-utils": [ + "ctl", + "db-sync", + "cardano-world", + "bitte", + "std", + "flake-utils" + ], + "nixago-exts": "nixago-exts", + "nixpkgs": [ + "ctl", + "db-sync", + "cardano-world", + "bitte", + "std", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1659446231, - "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", + "lastModified": 1659153038, + "narHash": "sha256-g4npRU8YBR7CAqMF0SyXtkHnoY9q+NcxvZwcc6UvLBc=", + "owner": "nix-community", + "repo": "nixago", + "rev": "608abdd0fe6729d1f7244e03f1a7f8a5d6408898", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", + "owner": "nix-community", + "repo": "nixago", "type": "github" } }, - "nixpkgs-2111_8": { + "nixago_3": { + "inputs": { + "flake-utils": [ + "ctl", + "db-sync", + "cardano-world", + "std", + "flake-utils" + ], + "nixago-exts": "nixago-exts_2", + "nixpkgs": [ + "ctl", + "db-sync", + "cardano-world", + "std", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1640283207, - "narHash": "sha256-SCwl7ZnCfMDsuSYvwIroiAlk7n33bW8HFfY8NvKhcPA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "64c7e3388bbd9206e437713351e814366e0c3284", + "lastModified": 1659153038, + "narHash": "sha256-g4npRU8YBR7CAqMF0SyXtkHnoY9q+NcxvZwcc6UvLBc=", + "owner": "nix-community", + "repo": "nixago", + "rev": "608abdd0fe6729d1f7244e03f1a7f8a5d6408898", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", + "owner": "nix-community", + "repo": "nixago", "type": "github" } }, - "nixpkgs-2111_9": { + "nixlib": { "locked": { - "lastModified": 1640283207, - "narHash": "sha256-SCwl7ZnCfMDsuSYvwIroiAlk7n33bW8HFfY8NvKhcPA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "64c7e3388bbd9206e437713351e814366e0c3284", + "lastModified": 1652576347, + "narHash": "sha256-52Wu7hkcIRcS4UenSSrt01J2sAbbQ6YqxZIDpuEPL/c=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "bdf553800c9c34ed00641785b02038f67f44d671", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", + "owner": "nix-community", + "repo": "nixpkgs.lib", "type": "github" } }, - "nixpkgs-2205": { + "nixlib_2": { "locked": { - "lastModified": 1657876628, - "narHash": "sha256-URmf0O2cQ/3heg2DJOeLyU/JmfVMqG4X5t9crQXMaeY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "549d82bdd40f760a438c3c3497c1c61160f3de55", + "lastModified": 1644107864, + "narHash": "sha256-Wrbt6Gs+hjXD3HUICPBJHKnHEUqiyx8rzHCgvqC1Bok=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "58eabcf65e7dba189eb0013f86831c159e3b2be6", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-22.05-darwin", - "repo": "nixpkgs", + "owner": "nix-community", + "repo": "nixpkgs.lib", "type": "github" } }, - "nixpkgs-2205_2": { + "nixlib_3": { "locked": { - "lastModified": 1663981975, - "narHash": "sha256-TKaxWAVJR+a5JJauKZqibmaM5e/Pi5tBDx9s8fl/kSE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "309faedb8338d3ae8ad8f1043b3ccf48c9cc2970", + "lastModified": 1656809537, + "narHash": "sha256-pwXBYG3ThN4ccJjvcdNdonQ8Wyv0y/iYdnuesiFUY1U=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "40e271f69106323734b55e2ba74f13bebde324c0", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-22.05-darwin", - "repo": "nixpkgs", + "owner": "nix-community", + "repo": "nixpkgs.lib", "type": "github" } }, - "nixpkgs-2205_3": { + "nixpkgs": { "locked": { - "lastModified": 1663981975, - "narHash": "sha256-TKaxWAVJR+a5JJauKZqibmaM5e/Pi5tBDx9s8fl/kSE=", + "lastModified": 1687420147, + "narHash": "sha256-NILbmZVsoP2Aw0OAIXdbYXrWc/qggIDDyIwZ01yUx+Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "309faedb8338d3ae8ad8f1043b3ccf48c9cc2970", + "rev": "d449a456ba7d81038fc9ec9141eae7ee3aaf2982", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-22.05-darwin", + "ref": "release-23.05", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-2205_4": { + "nixpkgs-2003": { "locked": { - "lastModified": 1663981975, - "narHash": "sha256-TKaxWAVJR+a5JJauKZqibmaM5e/Pi5tBDx9s8fl/kSE=", + "lastModified": 1620055814, + "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "309faedb8338d3ae8ad8f1043b3ccf48c9cc2970", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-22.05-darwin", + "ref": "nixpkgs-20.03-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-2211": { + "nixpkgs-2003_2": { "locked": { - "lastModified": 1669997163, - "narHash": "sha256-vhjC0kZMFoN6jzK0GR+tBzKi5KgBXgehadfidW8+Va4=", + "lastModified": 1620055814, + "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6f87491a54d8d64d30af6663cb3bf5d2ee7db958", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-22.11-darwin", + "ref": "nixpkgs-20.03-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-docker": { + "nixpkgs-2003_3": { "locked": { - "lastModified": 1652739558, - "narHash": "sha256-znGkjGugajqF/sFS+H4+ENmGTaVPFE0uu1JjQZJLEaQ=", - "owner": "nixos", + "lastModified": 1620055814, + "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "ff691ed9ba21528c1b4e034f36a04027e4522c58", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", + "ref": "nixpkgs-20.03-darwin", "repo": "nixpkgs", - "rev": "ff691ed9ba21528c1b4e034f36a04027e4522c58", "type": "github" } }, - "nixpkgs-regression": { + "nixpkgs-2003_4": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "lastModified": 1620055814, + "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", "type": "github" }, "original": { - "id": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "indirect" - } - }, - "nixpkgs-regression_10": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", "owner": "NixOS", + "ref": "nixpkgs-20.03-darwin", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" - }, - "original": { - "id": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "indirect" } }, - "nixpkgs-regression_11": { + "nixpkgs-2003_5": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "lastModified": 1620055814, + "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", "type": "github" }, "original": { - "id": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "indirect" - } - }, - "nixpkgs-regression_12": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", "owner": "NixOS", + "ref": "nixpkgs-20.03-darwin", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" - }, - "original": { - "id": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "indirect" } }, - "nixpkgs-regression_13": { + "nixpkgs-2003_6": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "lastModified": 1620055814, + "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", "type": "github" }, "original": { - "id": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "indirect" - } - }, - "nixpkgs-regression_14": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", "owner": "NixOS", + "ref": "nixpkgs-20.03-darwin", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" - }, - "original": { - "id": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "indirect" } }, - "nixpkgs-regression_15": { + "nixpkgs-2003_7": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "lastModified": 1620055814, + "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", "type": "github" }, "original": { - "id": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "indirect" - } - }, - "nixpkgs-regression_16": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", "owner": "NixOS", + "ref": "nixpkgs-20.03-darwin", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" - }, - "original": { - "id": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "indirect" } }, - "nixpkgs-regression_17": { + "nixpkgs-2105": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "lastModified": 1659914493, + "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", "type": "github" }, "original": { - "id": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "indirect" - } - }, - "nixpkgs-regression_18": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", "owner": "NixOS", + "ref": "nixpkgs-21.05-darwin", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" - }, - "original": { - "id": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "indirect" } }, - "nixpkgs-regression_2": { + "nixpkgs-2105_2": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "lastModified": 1642244250, + "narHash": "sha256-vWpUEqQdVP4srj+/YLJRTN9vjpTs4je0cdWKXPbDItc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "0fd9ee1aa36ce865ad273f4f07fdc093adeb5c00", "type": "github" }, "original": { - "id": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "indirect" + "owner": "NixOS", + "ref": "nixpkgs-21.05-darwin", + "repo": "nixpkgs", + "type": "github" } }, - "nixpkgs-regression_3": { + "nixpkgs-2105_3": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "lastModified": 1645296114, + "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", "type": "github" }, "original": { - "id": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "indirect" + "owner": "NixOS", + "ref": "nixpkgs-21.05-darwin", + "repo": "nixpkgs", + "type": "github" } }, - "nixpkgs-regression_4": { + "nixpkgs-2105_4": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "lastModified": 1655034179, + "narHash": "sha256-rf1/7AbzuYDw6+8Xvvf3PtEOygymLBrFsFxvext5ZjI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "046ee4af7a9f016a364f8f78eeaa356ba524ac31", "type": "github" }, "original": { - "id": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "indirect" + "owner": "NixOS", + "ref": "nixpkgs-21.05-darwin", + "repo": "nixpkgs", + "type": "github" } }, - "nixpkgs-regression_5": { + "nixpkgs-2105_5": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "lastModified": 1645296114, + "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", "type": "github" }, "original": { - "id": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "indirect" + "owner": "NixOS", + "ref": "nixpkgs-21.05-darwin", + "repo": "nixpkgs", + "type": "github" } }, - "nixpkgs-regression_6": { + "nixpkgs-2105_6": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "lastModified": 1659914493, + "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", "type": "github" }, "original": { - "id": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "indirect" + "owner": "NixOS", + "ref": "nixpkgs-21.05-darwin", + "repo": "nixpkgs", + "type": "github" } }, - "nixpkgs-regression_7": { + "nixpkgs-2105_7": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "lastModified": 1645296114, + "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", "type": "github" }, "original": { - "id": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "indirect" + "owner": "NixOS", + "ref": "nixpkgs-21.05-darwin", + "repo": "nixpkgs", + "type": "github" } }, - "nixpkgs-regression_8": { + "nixpkgs-2111": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "lastModified": 1659446231, + "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", "type": "github" }, "original": { - "id": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "indirect" + "owner": "NixOS", + "ref": "nixpkgs-21.11-darwin", + "repo": "nixpkgs", + "type": "github" } }, - "nixpkgs-regression_9": { + "nixpkgs-2111_2": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "lastModified": 1644510859, + "narHash": "sha256-xjpVvL5ecbyi0vxtVl/Fh9bwGlMbw3S06zE5nUzFB8A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "0d1d5d7e3679fec9d07f2eb804d9f9fdb98378d3", "type": "github" }, "original": { - "id": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "indirect" + "owner": "NixOS", + "ref": "nixpkgs-21.11-darwin", + "repo": "nixpkgs", + "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs-2111_3": { "locked": { - "lastModified": 1646331602, - "narHash": "sha256-cRuytTfel52z947yKfJcZU7zbQBgM16qqTf+oJkVwtg=", - "owner": "nixos", + "lastModified": 1648744337, + "narHash": "sha256-bYe1dFJAXovjqiaPKrmAbSBEK5KUkgwVaZcTbSoJ7hg=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad267cc9cf3d5a6ae63940df31eb31382d6356e6", + "rev": "0a58eebd8ec65ffdef2ce9562784123a73922052", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", + "owner": "NixOS", + "ref": "nixpkgs-21.11-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-unstable_10": { + "nixpkgs-2111_4": { "locked": { - "lastModified": 1641285291, - "narHash": "sha256-KYaOBNGar3XWTxTsYPr9P6u74KAqNq0wobEC236U+0c=", + "lastModified": 1656782578, + "narHash": "sha256-1eMCBEqJplPotTo/SZ/t5HU6Sf2I8qKlZi9MX7jv9fw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0432195a4b8d68faaa7d3d4b355260a3120aeeae", + "rev": "573603b7fdb9feb0eb8efc16ee18a015c667ab1b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixpkgs-21.11-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-unstable_11": { + "nixpkgs-2111_5": { "locked": { - "lastModified": 1641285291, - "narHash": "sha256-KYaOBNGar3XWTxTsYPr9P6u74KAqNq0wobEC236U+0c=", + "lastModified": 1648744337, + "narHash": "sha256-bYe1dFJAXovjqiaPKrmAbSBEK5KUkgwVaZcTbSoJ7hg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0432195a4b8d68faaa7d3d4b355260a3120aeeae", + "rev": "0a58eebd8ec65ffdef2ce9562784123a73922052", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixpkgs-21.11-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-unstable_12": { + "nixpkgs-2111_6": { "locked": { - "lastModified": 1635295995, - "narHash": "sha256-sGYiXjFlxTTMNb4NSkgvX+knOOTipE6gqwPUQpxNF+c=", + "lastModified": 1659446231, + "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "22a500a3f87bbce73bd8d777ef920b43a636f018", + "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixpkgs-21.11-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-unstable_13": { + "nixpkgs-2111_7": { "locked": { - "lastModified": 1663905476, - "narHash": "sha256-0CSwRKaYravh9v6qSlBpM0gNg0UhKT2lL7Yn6Zbx7UM=", + "lastModified": 1648744337, + "narHash": "sha256-bYe1dFJAXovjqiaPKrmAbSBEK5KUkgwVaZcTbSoJ7hg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e14f9fb57315f0d4abde222364f19f88c77d2b79", + "rev": "0a58eebd8ec65ffdef2ce9562784123a73922052", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixpkgs-21.11-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-unstable_14": { + "nixpkgs-2205": { "locked": { - "lastModified": 1648219316, - "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", + "lastModified": 1682600000, + "narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", + "rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixpkgs-22.05-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-unstable_15": { + "nixpkgs-2205_2": { "locked": { - "lastModified": 1641285291, - "narHash": "sha256-KYaOBNGar3XWTxTsYPr9P6u74KAqNq0wobEC236U+0c=", + "lastModified": 1657876628, + "narHash": "sha256-URmf0O2cQ/3heg2DJOeLyU/JmfVMqG4X5t9crQXMaeY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0432195a4b8d68faaa7d3d4b355260a3120aeeae", + "rev": "549d82bdd40f760a438c3c3497c1c61160f3de55", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixpkgs-22.05-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-unstable_16": { + "nixpkgs-2205_3": { "locked": { - "lastModified": 1641285291, - "narHash": "sha256-KYaOBNGar3XWTxTsYPr9P6u74KAqNq0wobEC236U+0c=", + "lastModified": 1685573264, + "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0432195a4b8d68faaa7d3d4b355260a3120aeeae", + "rev": "380be19fbd2d9079f677978361792cb25e8a3635", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixpkgs-22.05-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-unstable_17": { + "nixpkgs-2211": { "locked": { - "lastModified": 1635295995, - "narHash": "sha256-sGYiXjFlxTTMNb4NSkgvX+knOOTipE6gqwPUQpxNF+c=", + "lastModified": 1682682915, + "narHash": "sha256-haR0u/j/nUvlMloYlaOYq1FMXTvkNHw+wGxc+0qXisM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "22a500a3f87bbce73bd8d777ef920b43a636f018", + "rev": "09f1b33fcc0f59263137e23e935c1bb03ec920e4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixpkgs-22.11-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-unstable_18": { + "nixpkgs-2211_2": { "locked": { - "lastModified": 1663905476, - "narHash": "sha256-0CSwRKaYravh9v6qSlBpM0gNg0UhKT2lL7Yn6Zbx7UM=", + "lastModified": 1688392541, + "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e14f9fb57315f0d4abde222364f19f88c77d2b79", + "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixpkgs-22.11-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-unstable_19": { + "nixpkgs-2305": { "locked": { - "lastModified": 1648219316, - "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", + "lastModified": 1701362232, + "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", + "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixpkgs-23.05-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-unstable_2": { + "nixpkgs-2311": { "locked": { - "lastModified": 1656338871, - "narHash": "sha256-+LOvZFt3MpWtrxXLH4igQtRVzyD43VnuTJjDVbt7phY=", - "owner": "nixos", + "lastModified": 1701386440, + "narHash": "sha256-xI0uQ9E7JbmEy/v8kR9ZQan6389rHug+zOtZeZFiDJk=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "819e4d63fc7f337a822a049fd055cd7615a5e0d6", + "rev": "293822e55ec1872f715a66d0eda9e592dc14419f", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", + "owner": "NixOS", + "ref": "nixpkgs-23.11-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-unstable_3": { + "nixpkgs-docker": { "locked": { - "lastModified": 1646331602, - "narHash": "sha256-cRuytTfel52z947yKfJcZU7zbQBgM16qqTf+oJkVwtg=", + "lastModified": 1652739558, + "narHash": "sha256-znGkjGugajqF/sFS+H4+ENmGTaVPFE0uu1JjQZJLEaQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad267cc9cf3d5a6ae63940df31eb31382d6356e6", + "rev": "ff691ed9ba21528c1b4e034f36a04027e4522c58", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "ff691ed9ba21528c1b4e034f36a04027e4522c58", "type": "github" } }, - "nixpkgs-unstable_4": { + "nixpkgs-regression": { "locked": { - "lastModified": 1648219316, - "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" } }, - "nixpkgs-unstable_5": { + "nixpkgs-regression_10": { "locked": { - "lastModified": 1657888067, - "narHash": "sha256-GnwJoFBTPfW3+mz7QEeJEEQ9OMHZOiIJ/qDhZxrlKh8=", + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65fae659e31098ca4ac825a6fef26d890aaf3f4e", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "indirect" } }, - "nixpkgs-unstable_6": { + "nixpkgs-regression_11": { "locked": { - "lastModified": 1648219316, - "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" }, "original": { + "id": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "indirect" + } + }, + "nixpkgs-regression_12": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" + }, + "original": { + "id": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "indirect" } }, - "nixpkgs-unstable_7": { + "nixpkgs-regression_13": { "locked": { - "lastModified": 1648219316, - "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" } }, - "nixpkgs-unstable_8": { + "nixpkgs-regression_14": { "locked": { - "lastModified": 1648219316, - "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "indirect" } }, - "nixpkgs-unstable_9": { + "nixpkgs-regression_2": { "locked": { - "lastModified": 1663905476, - "narHash": "sha256-0CSwRKaYravh9v6qSlBpM0gNg0UhKT2lL7Yn6Zbx7UM=", + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e14f9fb57315f0d4abde222364f19f88c77d2b79", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" }, "original": { + "id": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "indirect" + } + }, + "nixpkgs-regression_3": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" + }, + "original": { + "id": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "indirect" } }, - "nixpkgs_10": { + "nixpkgs-regression_4": { "locked": { - "lastModified": 1638887115, - "narHash": "sha256-emjtIeqyJ84Eb3X7APJruTrwcfnHQKs55XGljj62prs=", + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1bd4bbd49bef217a3d1adea43498270d6e779d65", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" }, "original": { + "id": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "indirect" + } + }, + "nixpkgs-regression_5": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", "owner": "NixOS", - "ref": "nixos-21.11", "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" + }, + "original": { + "id": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "indirect" } }, - "nixpkgs_11": { + "nixpkgs-regression_6": { "locked": { - "lastModified": 1632864508, - "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-21.05-small", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "indirect" } }, - "nixpkgs_12": { + "nixpkgs-regression_7": { "locked": { - "lastModified": 1641909823, - "narHash": "sha256-Uxo+Wm6c/ijNhaJlYtFLJG9mh75FYZaBreMC2ZE0nEY=", - "owner": "nixos", + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "f0f67400bc49c44f305d6fe17698a2f1ce1c29a0", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "indirect" } }, - "nixpkgs_13": { + "nixpkgs-regression_8": { "locked": { - "lastModified": 1647350163, - "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", - "owner": "nixos", + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "indirect" } }, - "nixpkgs_14": { + "nixpkgs-regression_9": { "locked": { - "lastModified": 1644525281, - "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", - "owner": "nixos", + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "indirect" } }, - "nixpkgs_15": { + "nixpkgs-unstable": { "locked": { - "lastModified": 1646506091, - "narHash": "sha256-sWNAJE2m+HOh1jtXlHcnhxsj6/sXrHgbqVNcVRlveK4=", + "lastModified": 1682656005, + "narHash": "sha256-fYplYo7so1O+rSQ2/aS+SbTPwLTeoUXk4ekKNtSl4P8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e644bd62489b516292c816f70bf0052c693b3c7", + "rev": "6806b63e824f84b0f0e60b6d660d4ae753de0477", "type": "github" }, "original": { @@ -10849,13 +6808,13 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs-unstable_2": { "locked": { - "lastModified": 1658119717, - "narHash": "sha256-4upOZIQQ7Bc4CprqnHsKnqYfw+arJeAuU+QcpjYBXW0=", + "lastModified": 1646331602, + "narHash": "sha256-cRuytTfel52z947yKfJcZU7zbQBgM16qqTf+oJkVwtg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9eb60f25aff0d2218c848dd4574a0ab5e296cabe", + "rev": "ad267cc9cf3d5a6ae63940df31eb31382d6356e6", "type": "github" }, "original": { @@ -10865,161 +6824,165 @@ "type": "github" } }, - "nixpkgs_17": { + "nixpkgs-unstable_3": { "locked": { - "lastModified": 1644525281, - "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", + "lastModified": 1656338871, + "narHash": "sha256-+LOvZFt3MpWtrxXLH4igQtRVzyD43VnuTJjDVbt7phY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", + "rev": "819e4d63fc7f337a822a049fd055cd7615a5e0d6", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_18": { + "nixpkgs-unstable_4": { "locked": { - "lastModified": 1652576347, - "narHash": "sha256-52Wu7hkcIRcS4UenSSrt01J2sAbbQ6YqxZIDpuEPL/c=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "bdf553800c9c34ed00641785b02038f67f44d671", + "lastModified": 1646331602, + "narHash": "sha256-cRuytTfel52z947yKfJcZU7zbQBgM16qqTf+oJkVwtg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ad267cc9cf3d5a6ae63940df31eb31382d6356e6", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_19": { + "nixpkgs-unstable_5": { "locked": { - "lastModified": 1644525281, - "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", - "owner": "nixos", + "lastModified": 1648219316, + "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", + "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-unstable_6": { "locked": { - "lastModified": 1627969475, - "narHash": "sha256-MhVtkVt1MFfaDY3ObJu54NBcsaPk19vOBZ8ouhjO4qs=", + "lastModified": 1657888067, + "narHash": "sha256-GnwJoFBTPfW3+mz7QEeJEEQ9OMHZOiIJ/qDhZxrlKh8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd27e2e8316ac6eab11aa35c586e743286f23ecf", + "rev": "65fae659e31098ca4ac825a6fef26d890aaf3f4e", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, - "nixpkgs_20": { + "nixpkgs-unstable_7": { "locked": { - "lastModified": 1642451377, - "narHash": "sha256-hvAuYDUN8XIrcQKE6wDw4LjTCcwrTp2B1i1i/5vfDMQ=", + "lastModified": 1648219316, + "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e5b47c5c21336e3fdd887d24c7e34363fa09c6d7", + "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_21": { + "nixpkgs-unstable_8": { "locked": { - "lastModified": 1645296114, - "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", + "lastModified": 1701336116, + "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", + "rev": "f5c27c6136db4d76c30e533c20517df6864c46ee", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-21.05-small", - "type": "indirect" + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, - "nixpkgs_22": { + "nixpkgs-unstable_9": { "locked": { - "lastModified": 1652559422, - "narHash": "sha256-jPVTNImBTUIFdtur+d4IVot6eXmsvtOcBm0TzxmhWPk=", + "lastModified": 1648219316, + "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b3398bc7587ebb79f93dfeea1b8c574d3c6dba1", + "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-21.11", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_23": { + "nixpkgs_10": { "locked": { - "lastModified": 1632864508, - "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", + "lastModified": 1644972330, + "narHash": "sha256-6V2JFpTUzB9G+KcqtUR1yl7f6rd9495YrFECslEmbGw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "rev": "19574af0af3ffaf7c9e359744ed32556f34536bd", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-21.05-small", - "type": "indirect" + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, - "nixpkgs_24": { + "nixpkgs_11": { "locked": { - "lastModified": 1641909823, - "narHash": "sha256-Uxo+Wm6c/ijNhaJlYtFLJG9mh75FYZaBreMC2ZE0nEY=", - "owner": "nixos", + "lastModified": 1627969475, + "narHash": "sha256-MhVtkVt1MFfaDY3ObJu54NBcsaPk19vOBZ8ouhjO4qs=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "f0f67400bc49c44f305d6fe17698a2f1ce1c29a0", + "rev": "bd27e2e8316ac6eab11aa35c586e743286f23ecf", "type": "github" }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "original": { + "id": "nixpkgs", + "type": "indirect" } }, - "nixpkgs_25": { + "nixpkgs_12": { "locked": { - "lastModified": 1647350163, - "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", - "owner": "nixos", + "lastModified": 1644972330, + "narHash": "sha256-6V2JFpTUzB9G+KcqtUR1yl7f6rd9495YrFECslEmbGw=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d", + "rev": "19574af0af3ffaf7c9e359744ed32556f34536bd", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_26": { + "nixpkgs_13": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -11035,71 +6998,69 @@ "type": "github" } }, - "nixpkgs_27": { + "nixpkgs_14": { "locked": { - "lastModified": 1658311025, - "narHash": "sha256-GqagY5YmaZB3YaO41kKcQhe5RcpS83wnsW8iCu5Znqo=", - "owner": "nixos", + "lastModified": 1632864508, + "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd8d1784506a7c7eb0796772b73437e0b82fad57", + "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "nixos-21.05-small", + "type": "indirect" } }, - "nixpkgs_28": { + "nixpkgs_15": { "locked": { - "lastModified": 1646331602, - "narHash": "sha256-cRuytTfel52z947yKfJcZU7zbQBgM16qqTf+oJkVwtg=", + "lastModified": 1638452135, + "narHash": "sha256-5Il6hgrTgcWIsB7zug0yDFccYXx7pJCw8cwJdXMuLfM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad267cc9cf3d5a6ae63940df31eb31382d6356e6", + "rev": "43cdc5b364511eabdcad9fde639777ffd9e5bab1", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "43cdc5b364511eabdcad9fde639777ffd9e5bab1", "type": "github" } }, - "nixpkgs_29": { + "nixpkgs_16": { "locked": { - "lastModified": 1643381941, - "narHash": "sha256-pHTwvnN4tTsEKkWlXQ8JMY423epos8wUOhthpwJjtpc=", + "lastModified": 1602702596, + "narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5efc8ca954272c4376ac929f4c5ffefcc20551d5", + "rev": "ad0d20345219790533ebe06571f82ed6b034db31", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "nixos-20.09-small", + "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_17": { "locked": { - "lastModified": 1644972330, - "narHash": "sha256-6V2JFpTUzB9G+KcqtUR1yl7f6rd9495YrFECslEmbGw=", + "lastModified": 1638887115, + "narHash": "sha256-emjtIeqyJ84Eb3X7APJruTrwcfnHQKs55XGljj62prs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "19574af0af3ffaf7c9e359744ed32556f34536bd", + "rev": "1bd4bbd49bef217a3d1adea43498270d6e779d65", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-21.11", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_30": { + "nixpkgs_18": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -11114,58 +7075,75 @@ "type": "indirect" } }, - "nixpkgs_31": { + "nixpkgs_19": { "locked": { - "lastModified": 1632864508, - "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", + "lastModified": 1641909823, + "narHash": "sha256-Uxo+Wm6c/ijNhaJlYtFLJG9mh75FYZaBreMC2ZE0nEY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f0f67400bc49c44f305d6fe17698a2f1ce1c29a0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1642336556, + "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-21.05-small", "type": "indirect" } }, - "nixpkgs_32": { + "nixpkgs_20": { "locked": { - "lastModified": 1644486793, - "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", - "owner": "NixOS", + "lastModified": 1647350163, + "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", + "rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_33": { + "nixpkgs_21": { "locked": { - "lastModified": 1627969475, - "narHash": "sha256-MhVtkVt1MFfaDY3ObJu54NBcsaPk19vOBZ8ouhjO4qs=", - "owner": "NixOS", + "lastModified": 1644525281, + "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "bd27e2e8316ac6eab11aa35c586e743286f23ecf", + "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, - "nixpkgs_34": { + "nixpkgs_22": { "locked": { - "lastModified": 1644972330, - "narHash": "sha256-6V2JFpTUzB9G+KcqtUR1yl7f6rd9495YrFECslEmbGw=", + "lastModified": 1646506091, + "narHash": "sha256-sWNAJE2m+HOh1jtXlHcnhxsj6/sXrHgbqVNcVRlveK4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "19574af0af3ffaf7c9e359744ed32556f34536bd", + "rev": "3e644bd62489b516292c816f70bf0052c693b3c7", "type": "github" }, "original": { @@ -11175,7 +7153,23 @@ "type": "github" } }, - "nixpkgs_35": { + "nixpkgs_23": { + "locked": { + "lastModified": 1658119717, + "narHash": "sha256-4upOZIQQ7Bc4CprqnHsKnqYfw+arJeAuU+QcpjYBXW0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9eb60f25aff0d2218c848dd4574a0ab5e296cabe", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_24": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -11191,83 +7185,100 @@ "type": "github" } }, - "nixpkgs_36": { + "nixpkgs_25": { "locked": { - "lastModified": 1632864508, - "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "lastModified": 1652576347, + "narHash": "sha256-52Wu7hkcIRcS4UenSSrt01J2sAbbQ6YqxZIDpuEPL/c=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "bdf553800c9c34ed00641785b02038f67f44d671", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-21.05-small", - "type": "indirect" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" } }, - "nixpkgs_37": { + "nixpkgs_26": { "locked": { - "lastModified": 1638452135, - "narHash": "sha256-5Il6hgrTgcWIsB7zug0yDFccYXx7pJCw8cwJdXMuLfM=", + "lastModified": 1644525281, + "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "43cdc5b364511eabdcad9fde639777ffd9e5bab1", + "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "43cdc5b364511eabdcad9fde639777ffd9e5bab1", "type": "github" } }, - "nixpkgs_38": { + "nixpkgs_27": { "locked": { - "lastModified": 1602702596, - "narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=", + "lastModified": 1642451377, + "narHash": "sha256-hvAuYDUN8XIrcQKE6wDw4LjTCcwrTp2B1i1i/5vfDMQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad0d20345219790533ebe06571f82ed6b034db31", + "rev": "e5b47c5c21336e3fdd887d24c7e34363fa09c6d7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_28": { + "locked": { + "lastModified": 1645296114, + "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-20.09-small", + "ref": "nixos-21.05-small", "type": "indirect" } }, - "nixpkgs_39": { + "nixpkgs_29": { "locked": { - "lastModified": 1638887115, - "narHash": "sha256-emjtIeqyJ84Eb3X7APJruTrwcfnHQKs55XGljj62prs=", + "lastModified": 1652559422, + "narHash": "sha256-jPVTNImBTUIFdtur+d4IVot6eXmsvtOcBm0TzxmhWPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1bd4bbd49bef217a3d1adea43498270d6e779d65", + "rev": "8b3398bc7587ebb79f93dfeea1b8c574d3c6dba1", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-21.11", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1627969475, - "narHash": "sha256-MhVtkVt1MFfaDY3ObJu54NBcsaPk19vOBZ8ouhjO4qs=", + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd27e2e8316ac6eab11aa35c586e743286f23ecf", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-22.05-small", + "repo": "nixpkgs", + "type": "github" } }, - "nixpkgs_40": { + "nixpkgs_30": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -11282,7 +7293,7 @@ "type": "indirect" } }, - "nixpkgs_41": { + "nixpkgs_31": { "locked": { "lastModified": 1641909823, "narHash": "sha256-Uxo+Wm6c/ijNhaJlYtFLJG9mh75FYZaBreMC2ZE0nEY=", @@ -11298,7 +7309,7 @@ "type": "github" } }, - "nixpkgs_42": { + "nixpkgs_32": { "locked": { "lastModified": 1647350163, "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", @@ -11314,7 +7325,7 @@ "type": "github" } }, - "nixpkgs_43": { + "nixpkgs_33": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -11330,29 +7341,29 @@ "type": "github" } }, - "nixpkgs_44": { + "nixpkgs_34": { "locked": { - "lastModified": 1646506091, - "narHash": "sha256-sWNAJE2m+HOh1jtXlHcnhxsj6/sXrHgbqVNcVRlveK4=", - "owner": "NixOS", + "lastModified": 1658311025, + "narHash": "sha256-GqagY5YmaZB3YaO41kKcQhe5RcpS83wnsW8iCu5Znqo=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "3e644bd62489b516292c816f70bf0052c693b3c7", + "rev": "cd8d1784506a7c7eb0796772b73437e0b82fad57", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_45": { + "nixpkgs_35": { "locked": { - "lastModified": 1658119717, - "narHash": "sha256-4upOZIQQ7Bc4CprqnHsKnqYfw+arJeAuU+QcpjYBXW0=", + "lastModified": 1646331602, + "narHash": "sha256-cRuytTfel52z947yKfJcZU7zbQBgM16qqTf+oJkVwtg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9eb60f25aff0d2218c848dd4574a0ab5e296cabe", + "rev": "ad267cc9cf3d5a6ae63940df31eb31382d6356e6", "type": "github" }, "original": { @@ -11362,91 +7373,90 @@ "type": "github" } }, - "nixpkgs_46": { - "locked": { - "lastModified": 1644525281, - "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", - "owner": "nixos", + "nixpkgs_36": { + "locked": { + "lastModified": 1643381941, + "narHash": "sha256-pHTwvnN4tTsEKkWlXQ8JMY423epos8wUOhthpwJjtpc=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", + "rev": "5efc8ca954272c4376ac929f4c5ffefcc20551d5", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_47": { + "nixpkgs_37": { "locked": { - "lastModified": 1646470760, - "narHash": "sha256-dQISyucVCCPaFioUhy5ZgfBz8rOMKGI8k13aPDFTqEs=", - "owner": "nixos", + "lastModified": 1632864508, + "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "1fc7212a2c3992eedc6eedf498955c321ad81cc2", + "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", "type": "github" }, "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1fc7212a2c3992eedc6eedf498955c321ad81cc2", - "type": "github" + "id": "nixpkgs", + "ref": "nixos-21.05-small", + "type": "indirect" } }, - "nixpkgs_48": { + "nixpkgs_38": { "locked": { - "lastModified": 1619531122, - "narHash": "sha256-ovm5bo6PkZzNKh2YGXbRKYIjega0EjiEP0YDwyeXEYU=", + "lastModified": 1632864508, + "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bb80d578e8ad3cb5a607f468ac00cc546d0396dc", + "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", "type": "github" }, "original": { "id": "nixpkgs", + "ref": "nixos-21.05-small", "type": "indirect" } }, - "nixpkgs_49": { + "nixpkgs_39": { "locked": { - "lastModified": 1656461576, - "narHash": "sha256-rlmmw6lIlkMQIiB+NsnO8wQYWTfle8TA41UREPLP5VY=", + "lastModified": 1644486793, + "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf3ab54b4afe2b7477faa1dd0b65bf74c055d70c", + "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1644972330, - "narHash": "sha256-6V2JFpTUzB9G+KcqtUR1yl7f6rd9495YrFECslEmbGw=", + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "19574af0af3ffaf7c9e359744ed32556f34536bd", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_50": { + "nixpkgs_40": { "locked": { - "lastModified": 1655567057, - "narHash": "sha256-Cc5hQSMsTzOHmZnYm8OSJ5RNUp22bd5NADWLHorULWQ=", + "lastModified": 1627969475, + "narHash": "sha256-MhVtkVt1MFfaDY3ObJu54NBcsaPk19vOBZ8ouhjO4qs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e0a42267f73ea52adc061a64650fddc59906fc99", + "rev": "bd27e2e8316ac6eab11aa35c586e743286f23ecf", "type": "github" }, "original": { @@ -11454,21 +7464,39 @@ "type": "indirect" } }, - "nixpkgs_51": { + "nixpkgs_41": { "locked": { - "lastModified": 1656401090, - "narHash": "sha256-bUS2nfQsvTQW2z8SK7oEFSElbmoBahOPtbXPm0AL3I4=", + "lastModified": 1644972330, + "narHash": "sha256-6V2JFpTUzB9G+KcqtUR1yl7f6rd9495YrFECslEmbGw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "16de63fcc54e88b9a106a603038dd5dd2feb21eb", + "rev": "19574af0af3ffaf7c9e359744ed32556f34536bd", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, - "nixpkgs_52": { + "nixpkgs_42": { + "locked": { + "lastModified": 1644525281, + "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_43": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -11483,74 +7511,75 @@ "type": "indirect" } }, - "nixpkgs_53": { + "nixpkgs_44": { "locked": { - "lastModified": 1656809537, - "narHash": "sha256-pwXBYG3ThN4ccJjvcdNdonQ8Wyv0y/iYdnuesiFUY1U=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "40e271f69106323734b55e2ba74f13bebde324c0", + "lastModified": 1638452135, + "narHash": "sha256-5Il6hgrTgcWIsB7zug0yDFccYXx7pJCw8cwJdXMuLfM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "43cdc5b364511eabdcad9fde639777ffd9e5bab1", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "43cdc5b364511eabdcad9fde639777ffd9e5bab1", "type": "github" } }, - "nixpkgs_54": { + "nixpkgs_45": { "locked": { - "lastModified": 1632864508, - "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", + "lastModified": 1602702596, + "narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "rev": "ad0d20345219790533ebe06571f82ed6b034db31", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-21.05-small", + "ref": "nixos-20.09-small", "type": "indirect" } }, - "nixpkgs_55": { + "nixpkgs_46": { "locked": { - "lastModified": 1654807842, - "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "lastModified": 1638887115, + "narHash": "sha256-emjtIeqyJ84Eb3X7APJruTrwcfnHQKs55XGljj62prs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "rev": "1bd4bbd49bef217a3d1adea43498270d6e779d65", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-21.11", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_56": { + "nixpkgs_47": { "locked": { - "lastModified": 1656947410, - "narHash": "sha256-htDR/PZvjUJGyrRJsVqDmXR8QeoswBaRLzHt13fd0iY=", + "lastModified": 1632864508, + "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8d47977286a44955262adbc76f2c8a66e7419d5", + "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-22.05", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "nixos-21.05-small", + "type": "indirect" } }, - "nixpkgs_57": { + "nixpkgs_48": { "locked": { - "lastModified": 1658311025, - "narHash": "sha256-GqagY5YmaZB3YaO41kKcQhe5RcpS83wnsW8iCu5Znqo=", + "lastModified": 1641909823, + "narHash": "sha256-Uxo+Wm6c/ijNhaJlYtFLJG9mh75FYZaBreMC2ZE0nEY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cd8d1784506a7c7eb0796772b73437e0b82fad57", + "rev": "f0f67400bc49c44f305d6fe17698a2f1ce1c29a0", "type": "github" }, "original": { @@ -11560,38 +7589,39 @@ "type": "github" } }, - "nixpkgs_58": { + "nixpkgs_49": { "locked": { - "lastModified": 1642451377, - "narHash": "sha256-hvAuYDUN8XIrcQKE6wDw4LjTCcwrTp2B1i1i/5vfDMQ=", - "owner": "NixOS", + "lastModified": 1647350163, + "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "e5b47c5c21336e3fdd887d24c7e34363fa09c6d7", + "rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_59": { + "nixpkgs_5": { "locked": { - "lastModified": 1653920503, - "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", - "owner": "nixos", + "lastModified": 1653581809, + "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a", + "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-22.05", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_50": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -11607,131 +7637,107 @@ "type": "github" } }, - "nixpkgs_60": { + "nixpkgs_51": { "locked": { - "lastModified": 1650469885, - "narHash": "sha256-BuILRZ6pzMnGey8/irbjGq1oo3vIvZa1pitSdZCmIXA=", - "owner": "nixos", + "lastModified": 1646506091, + "narHash": "sha256-sWNAJE2m+HOh1jtXlHcnhxsj6/sXrHgbqVNcVRlveK4=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "df78cc4e2a46fca75d14508a5d2ed3494add28ff", + "rev": "3e644bd62489b516292c816f70bf0052c693b3c7", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_61": { + "nixpkgs_52": { "locked": { - "lastModified": 1632864508, - "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", - "owner": "NixOS", + "lastModified": 1658119717, + "narHash": "sha256-4upOZIQQ7Bc4CprqnHsKnqYfw+arJeAuU+QcpjYBXW0=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "rev": "9eb60f25aff0d2218c848dd4574a0ab5e296cabe", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-21.05-small", - "type": "indirect" - } - }, - "nixpkgs_62": { - "locked": { - "lastModified": 1632864508, - "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", - "owner": "NixOS", + "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", - "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-21.05-small", - "type": "indirect" } }, - "nixpkgs_63": { + "nixpkgs_53": { "locked": { - "lastModified": 1677021523, - "narHash": "sha256-0EhZjJ3rq8ZTTJ6Trrf/9hYtnIry0OsyY2NKoQoOS5Q=", - "owner": "NixOS", + "lastModified": 1644525281, + "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "5a5adc2ad7009851d7d0fc26311e42a93b171d2e", + "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_64": { - "locked": { - "lastModified": 1632864508, - "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", - "owner": "NixOS", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-21.05-small", - "type": "indirect" } }, - "nixpkgs_65": { + "nixpkgs_54": { "locked": { - "lastModified": 1642336556, - "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", - "owner": "NixOS", + "lastModified": 1646470760, + "narHash": "sha256-dQISyucVCCPaFioUhy5ZgfBz8rOMKGI8k13aPDFTqEs=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6", + "rev": "1fc7212a2c3992eedc6eedf498955c321ad81cc2", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1fc7212a2c3992eedc6eedf498955c321ad81cc2", + "type": "github" } }, - "nixpkgs_66": { + "nixpkgs_55": { "locked": { - "lastModified": 1632864508, - "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", + "lastModified": 1619531122, + "narHash": "sha256-ovm5bo6PkZzNKh2YGXbRKYIjega0EjiEP0YDwyeXEYU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "rev": "bb80d578e8ad3cb5a607f468ac00cc546d0396dc", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-21.05-small", "type": "indirect" } }, - "nixpkgs_67": { + "nixpkgs_56": { "locked": { - "lastModified": 1642336556, - "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", + "lastModified": 1656461576, + "narHash": "sha256-rlmmw6lIlkMQIiB+NsnO8wQYWTfle8TA41UREPLP5VY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6", + "rev": "cf3ab54b4afe2b7477faa1dd0b65bf74c055d70c", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, - "nixpkgs_68": { + "nixpkgs_57": { "locked": { - "lastModified": 1642336556, - "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", + "lastModified": 1655567057, + "narHash": "sha256-Cc5hQSMsTzOHmZnYm8OSJ5RNUp22bd5NADWLHorULWQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6", + "rev": "e0a42267f73ea52adc061a64650fddc59906fc99", "type": "github" }, "original": { @@ -11739,22 +7745,21 @@ "type": "indirect" } }, - "nixpkgs_69": { + "nixpkgs_58": { "locked": { - "lastModified": 1632864508, - "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", + "lastModified": 1656401090, + "narHash": "sha256-bUS2nfQsvTQW2z8SK7oEFSElbmoBahOPtbXPm0AL3I4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "rev": "16de63fcc54e88b9a106a603038dd5dd2feb21eb", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-21.05-small", "type": "indirect" } }, - "nixpkgs_7": { + "nixpkgs_59": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -11769,23 +7774,7 @@ "type": "indirect" } }, - "nixpkgs_70": { - "locked": { - "lastModified": 1653581809, - "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_71": { + "nixpkgs_6": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -11800,37 +7789,22 @@ "type": "github" } }, - "nixpkgs_72": { + "nixpkgs_60": { "locked": { - "lastModified": 1665087388, - "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", + "lastModified": 1656809537, + "narHash": "sha256-pwXBYG3ThN4ccJjvcdNdonQ8Wyv0y/iYdnuesiFUY1U=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "40e271f69106323734b55e2ba74f13bebde324c0", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_73": { - "locked": { - "lastModified": 1642336556, - "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6", + "owner": "nix-community", + "repo": "nixpkgs.lib", "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" } }, - "nixpkgs_74": { + "nixpkgs_61": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -11845,72 +7819,60 @@ "type": "indirect" } }, - "nixpkgs_75": { + "nixpkgs_62": { "locked": { - "lastModified": 1642336556, - "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_76": { - "locked": { - "lastModified": 1642336556, - "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6", "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" } }, - "nixpkgs_77": { + "nixpkgs_63": { "locked": { - "lastModified": 1632864508, - "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", + "lastModified": 1656947410, + "narHash": "sha256-htDR/PZvjUJGyrRJsVqDmXR8QeoswBaRLzHt13fd0iY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "rev": "e8d47977286a44955262adbc76f2c8a66e7419d5", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-21.05-small", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-22.05", + "repo": "nixpkgs", + "type": "github" } }, - "nixpkgs_78": { + "nixpkgs_64": { "locked": { - "lastModified": 1653581809, - "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", - "owner": "NixOS", + "lastModified": 1658311025, + "narHash": "sha256-GqagY5YmaZB3YaO41kKcQhe5RcpS83wnsW8iCu5Znqo=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "rev": "cd8d1784506a7c7eb0796772b73437e0b82fad57", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_79": { + "nixpkgs_65": { "locked": { - "lastModified": 1654807842, - "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "lastModified": 1642451377, + "narHash": "sha256-hvAuYDUN8XIrcQKE6wDw4LjTCcwrTp2B1i1i/5vfDMQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "rev": "e5b47c5c21336e3fdd887d24c7e34363fa09c6d7", "type": "github" }, "original": { @@ -11919,29 +7881,29 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_66": { "locked": { - "lastModified": 1638452135, - "narHash": "sha256-5Il6hgrTgcWIsB7zug0yDFccYXx7pJCw8cwJdXMuLfM=", + "lastModified": 1653920503, + "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "43cdc5b364511eabdcad9fde639777ffd9e5bab1", + "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-22.05", "repo": "nixpkgs", - "rev": "43cdc5b364511eabdcad9fde639777ffd9e5bab1", "type": "github" } }, - "nixpkgs_80": { + "nixpkgs_67": { "locked": { - "lastModified": 1665087388, - "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", + "lastModified": 1650469885, + "narHash": "sha256-BuILRZ6pzMnGey8/irbjGq1oo3vIvZa1pitSdZCmIXA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", + "rev": "df78cc4e2a46fca75d14508a5d2ed3494add28ff", "type": "github" }, "original": { @@ -11951,7 +7913,7 @@ "type": "github" } }, - "nixpkgs_81": { + "nixpkgs_68": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -11966,122 +7928,104 @@ "type": "indirect" } }, - "nixpkgs_9": { + "nixpkgs_69": { "locked": { - "lastModified": 1602702596, - "narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=", + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad0d20345219790533ebe06571f82ed6b034db31", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-20.09-small", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-22.05-small", + "repo": "nixpkgs", + "type": "github" } }, - "node-process": { - "flake": false, + "nixpkgs_7": { "locked": { - "lastModified": 1648681325, - "narHash": "sha256-6oWDYmMb+V4x0jCoYDzKfBJMpr7Mx5zA3WMpNHspuSw=", - "owner": "input-output-hk", - "repo": "cardano-node", - "rev": "78675fbf8986c87c0d2356b727a0ec2060f1adba", + "lastModified": 1674407282, + "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cardano-node", + "owner": "nixos", + "ref": "nixos-22.11", + "repo": "nixpkgs", "type": "github" } }, - "node-process_2": { - "flake": false, + "nixpkgs_70": { "locked": { - "lastModified": 1654323094, - "narHash": "sha256-zbmpZeBgUUly8QgR2mrVUN0A+0iLczufNvCCRxAo3GY=", - "owner": "input-output-hk", - "repo": "cardano-node", - "rev": "ec20745f17cb4fa8824fdf341d1412c774bc94b9", + "lastModified": 1697723726, + "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cardano-node", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", "type": "github" } }, - "node-snapshot": { - "inputs": { - "customConfig": "customConfig_4", - "haskellNix": "haskellNix_4", - "iohkNix": "iohkNix_4", - "membench": "membench", - "nixpkgs": [ - "ctl", - "ogmios", - "cardano-node", - "node-snapshot", - "haskellNix", - "nixpkgs-2105" - ], - "plutus-example": "plutus-example", - "utils": "utils_24" + "nixpkgs_71": { + "locked": { + "lastModified": 1632864508, + "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "type": "github" }, + "original": { + "id": "nixpkgs", + "ref": "nixos-21.05-small", + "type": "indirect" + } + }, + "nixpkgs_8": { "locked": { - "lastModified": 1645120669, - "narHash": "sha256-2MKfGsYS5n69+pfqNHb4IH/E95ok1MD7mhEYfUpRcz4=", - "owner": "input-output-hk", - "repo": "cardano-node", - "rev": "7f00e3ea5a61609e19eeeee4af35241571efdf5c", + "lastModified": 1665087388, + "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cardano-node", - "rev": "7f00e3ea5a61609e19eeeee4af35241571efdf5c", + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", "type": "github" } }, - "node-snapshot_2": { - "inputs": { - "customConfig": "customConfig_8", - "haskellNix": "haskellNix_8", - "iohkNix": "iohkNix_8", - "membench": "membench_3", - "nixpkgs": [ - "ctl", - "ogmios-nixos", - "cardano-node", - "node-snapshot", - "haskellNix", - "nixpkgs-2105" - ], - "plutus-example": "plutus-example_2", - "utils": "utils_29" - }, + "nixpkgs_9": { "locked": { - "lastModified": 1645120669, - "narHash": "sha256-2MKfGsYS5n69+pfqNHb4IH/E95ok1MD7mhEYfUpRcz4=", - "owner": "input-output-hk", - "repo": "cardano-node", - "rev": "7f00e3ea5a61609e19eeeee4af35241571efdf5c", + "lastModified": 1627969475, + "narHash": "sha256-MhVtkVt1MFfaDY3ObJu54NBcsaPk19vOBZ8ouhjO4qs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "bd27e2e8316ac6eab11aa35c586e743286f23ecf", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "cardano-node", - "rev": "7f00e3ea5a61609e19eeeee4af35241571efdf5c", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nomad": { "inputs": { - "nix": "nix_2", - "nixpkgs": "nixpkgs_10", - "utils": "utils_2" + "nix": "nix_3", + "nixpkgs": "nixpkgs_17", + "utils": "utils_4" }, "locked": { "lastModified": 1648128770, @@ -12100,11 +8044,11 @@ }, "nomad-driver-nix": { "inputs": { - "devshell": "devshell", + "devshell": "devshell_2", "inclusive": "inclusive", - "nix": "nix_3", - "nixpkgs": "nixpkgs_12", - "utils": "utils_3" + "nix": "nix_4", + "nixpkgs": "nixpkgs_19", + "utils": "utils_5" }, "locked": { "lastModified": 1648029666, @@ -12122,11 +8066,11 @@ }, "nomad-driver-nix_2": { "inputs": { - "devshell": "devshell_4", + "devshell": "devshell_5", "inclusive": "inclusive_4", - "nix": "nix_5", - "nixpkgs": "nixpkgs_24", - "utils": "utils_8" + "nix": "nix_6", + "nixpkgs": "nixpkgs_31", + "utils": "utils_10" }, "locked": { "lastModified": 1648029666, @@ -12144,11 +8088,11 @@ }, "nomad-driver-nix_3": { "inputs": { - "devshell": "devshell_11", + "devshell": "devshell_12", "inclusive": "inclusive_9", - "nix": "nix_10", - "nixpkgs": "nixpkgs_41", - "utils": "utils_17" + "nix": "nix_11", + "nixpkgs": "nixpkgs_48", + "utils": "utils_19" }, "locked": { "lastModified": 1648029666, @@ -12166,10 +8110,10 @@ }, "nomad-follower": { "inputs": { - "devshell": "devshell_2", + "devshell": "devshell_3", "inclusive": "inclusive_2", - "nixpkgs": "nixpkgs_13", - "utils": "utils_4" + "nixpkgs": "nixpkgs_20", + "utils": "utils_6" }, "locked": { "lastModified": 1649836589, @@ -12187,10 +8131,10 @@ }, "nomad-follower_2": { "inputs": { - "devshell": "devshell_5", + "devshell": "devshell_6", "inclusive": "inclusive_5", - "nixpkgs": "nixpkgs_25", - "utils": "utils_9" + "nixpkgs": "nixpkgs_32", + "utils": "utils_11" }, "locked": { "lastModified": 1658244176, @@ -12208,10 +8152,10 @@ }, "nomad-follower_3": { "inputs": { - "devshell": "devshell_12", + "devshell": "devshell_13", "inclusive": "inclusive_10", - "nixpkgs": "nixpkgs_42", - "utils": "utils_18" + "nixpkgs": "nixpkgs_49", + "utils": "utils_20" }, "locked": { "lastModified": 1649836589, @@ -12229,9 +8173,9 @@ }, "nomad_2": { "inputs": { - "nix": "nix_9", - "nixpkgs": "nixpkgs_39", - "utils": "utils_16" + "nix": "nix_10", + "nixpkgs": "nixpkgs_46", + "utils": "utils_18" }, "locked": { "lastModified": 1648128770, @@ -12248,6 +8192,21 @@ "type": "github" } }, + "nosys": { + "locked": { + "lastModified": 1667881534, + "narHash": "sha256-FhwJ15uPLRsvaxtt/bNuqE/ykMpNAPF0upozFKhTtXM=", + "owner": "divnix", + "repo": "nosys", + "rev": "2d0d5207f6a230e9d0f660903f8db9807b54814f", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "nosys", + "type": "github" + } + }, "ogmios": { "flake": false, "locked": { @@ -12267,236 +8226,64 @@ }, "ogmios-nixos": { "inputs": { - "CHaP": "CHaP_4", - "blank": "blank_6", - "cardano-configurations": "cardano-configurations_3", - "cardano-node": "cardano-node_3", - "flake-compat": "flake-compat_15", - "haskell-nix": "haskell-nix_6", - "iohk-nix": "iohk-nix_4", - "nixpkgs": [ - "ctl", - "ogmios-nixos", - "haskell-nix", - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1668087435, - "narHash": "sha256-pbx/+mP2pu4vQuTV3YtFXrOZOVOBS9JH9eDqgjnHyZ4=", - "owner": "mlabs-haskell", - "repo": "ogmios", - "rev": "3b229c1795efa30243485730b78ea053992fdc7a", - "type": "github" - }, - "original": { - "owner": "mlabs-haskell", - "repo": "ogmios", - "type": "github" - } - }, - "ogmios_2": { - "inputs": { - "CHaP": "CHaP_2", - "blank": "blank_4", + "CHaP": "CHaP_3", + "blank": "blank_5", "cardano-configurations": "cardano-configurations_2", - "cardano-node": "cardano-node_2", - "flake-compat": "flake-compat_11", - "haskell-nix": "haskell-nix_5", - "iohk-nix": "iohk-nix_3", + "cardano-node": [ + "ctl", + "cardano-node" + ], + "flake-compat": "flake-compat_13", + "haskell-nix": [ + "ctl", + "haskell-nix" + ], + "iohk-nix": [ + "ctl", + "iohk-nix" + ], "nixpkgs": [ "ctl", - "ogmios", - "haskell-nix", - "nixpkgs-unstable" + "nixpkgs" + ], + "ogmios-src": [ + "ctl", + "ogmios" ] }, "locked": { - "lastModified": 1670513793, - "narHash": "sha256-A3qj7tUSjya+ZI4lFkdJbOxelQhgQLc9RNPhcNJLIkw=", + "lastModified": 1695289922, + "narHash": "sha256-WeZkYCyvOqnVx9zYgyO2rh0rd3O2DmxH0HZ4OJnf/aw=", "owner": "mlabs-haskell", - "repo": "ogmios", - "rev": "a7687bc03b446bc74564abe1873fbabfa1aac196", + "repo": "ogmios-nixos", + "rev": "78e829e9ebd50c5891024dcd1004c2ac51facd80", "type": "github" }, "original": { "owner": "mlabs-haskell", - "repo": "ogmios", - "rev": "a7687bc03b446bc74564abe1873fbabfa1aac196", - "type": "github" - } - }, - "old-ghc-nix": { - "flake": false, - "locked": { - "lastModified": 1631092763, - "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", - "owner": "angerman", - "repo": "old-ghc-nix", - "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", - "type": "github" - }, - "original": { - "owner": "angerman", - "ref": "master", - "repo": "old-ghc-nix", - "type": "github" - } - }, - "old-ghc-nix_10": { - "flake": false, - "locked": { - "lastModified": 1631092763, - "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", - "owner": "angerman", - "repo": "old-ghc-nix", - "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", - "type": "github" - }, - "original": { - "owner": "angerman", - "ref": "master", - "repo": "old-ghc-nix", - "type": "github" - } - }, - "old-ghc-nix_11": { - "flake": false, - "locked": { - "lastModified": 1631092763, - "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", - "owner": "angerman", - "repo": "old-ghc-nix", - "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", - "type": "github" - }, - "original": { - "owner": "angerman", - "ref": "master", - "repo": "old-ghc-nix", - "type": "github" - } - }, - "old-ghc-nix_12": { - "flake": false, - "locked": { - "lastModified": 1631092763, - "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", - "owner": "angerman", - "repo": "old-ghc-nix", - "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", - "type": "github" - }, - "original": { - "owner": "angerman", - "ref": "master", - "repo": "old-ghc-nix", - "type": "github" - } - }, - "old-ghc-nix_13": { - "flake": false, - "locked": { - "lastModified": 1631092763, - "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", - "owner": "angerman", - "repo": "old-ghc-nix", - "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", - "type": "github" - }, - "original": { - "owner": "angerman", - "ref": "master", - "repo": "old-ghc-nix", - "type": "github" - } - }, - "old-ghc-nix_14": { - "flake": false, - "locked": { - "lastModified": 1631092763, - "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", - "owner": "angerman", - "repo": "old-ghc-nix", - "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", - "type": "github" - }, - "original": { - "owner": "angerman", - "ref": "master", - "repo": "old-ghc-nix", - "type": "github" - } - }, - "old-ghc-nix_15": { - "flake": false, - "locked": { - "lastModified": 1631092763, - "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", - "owner": "angerman", - "repo": "old-ghc-nix", - "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", - "type": "github" - }, - "original": { - "owner": "angerman", - "ref": "master", - "repo": "old-ghc-nix", - "type": "github" - } - }, - "old-ghc-nix_16": { - "flake": false, - "locked": { - "lastModified": 1631092763, - "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", - "owner": "angerman", - "repo": "old-ghc-nix", - "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", - "type": "github" - }, - "original": { - "owner": "angerman", - "ref": "master", - "repo": "old-ghc-nix", - "type": "github" - } - }, - "old-ghc-nix_17": { - "flake": false, - "locked": { - "lastModified": 1631092763, - "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", - "owner": "angerman", - "repo": "old-ghc-nix", - "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", - "type": "github" - }, - "original": { - "owner": "angerman", - "ref": "master", - "repo": "old-ghc-nix", + "repo": "ogmios-nixos", + "rev": "78e829e9ebd50c5891024dcd1004c2ac51facd80", "type": "github" } }, - "old-ghc-nix_2": { + "ogmios_2": { "flake": false, "locked": { - "lastModified": 1631092763, - "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", - "owner": "angerman", - "repo": "old-ghc-nix", - "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", + "lastModified": 1691769233, + "narHash": "sha256-7CLprKq3RwJfvy31LAPux+DYFLjEmbRBFgvtYDpJA8Q=", + "owner": "CardanoSolutions", + "repo": "ogmios", + "rev": "3d3f359b0987c009ef66fb4d4b4bddce92b9aeb3", "type": "github" }, - "original": { - "owner": "angerman", - "ref": "master", - "repo": "old-ghc-nix", + "original": { + "owner": "CardanoSolutions", + "ref": "v6.0.0", + "repo": "ogmios", "type": "github" } }, - "old-ghc-nix_3": { + "old-ghc-nix": { "flake": false, "locked": { "lastModified": 1631092763, @@ -12513,7 +8300,7 @@ "type": "github" } }, - "old-ghc-nix_4": { + "old-ghc-nix_2": { "flake": false, "locked": { "lastModified": 1631092763, @@ -12530,7 +8317,7 @@ "type": "github" } }, - "old-ghc-nix_5": { + "old-ghc-nix_3": { "flake": false, "locked": { "lastModified": 1631092763, @@ -12547,7 +8334,7 @@ "type": "github" } }, - "old-ghc-nix_6": { + "old-ghc-nix_4": { "flake": false, "locked": { "lastModified": 1631092763, @@ -12564,7 +8351,7 @@ "type": "github" } }, - "old-ghc-nix_7": { + "old-ghc-nix_5": { "flake": false, "locked": { "lastModified": 1631092763, @@ -12581,7 +8368,7 @@ "type": "github" } }, - "old-ghc-nix_8": { + "old-ghc-nix_6": { "flake": false, "locked": { "lastModified": 1631092763, @@ -12598,7 +8385,7 @@ "type": "github" } }, - "old-ghc-nix_9": { + "old-ghc-nix_7": { "flake": false, "locked": { "lastModified": 1631092763, @@ -12618,11 +8405,11 @@ "ops-lib": { "flake": false, "locked": { - "lastModified": 1649848729, - "narHash": "sha256-5zN9gpn+DwdB67bcHfDD8zgMnR0EaJd2JVNMyL6J1N0=", + "lastModified": 1675186784, + "narHash": "sha256-HqDtrvk1l7YeREzCSEpUtChtlEgT6Tww9WrJiozjukc=", "owner": "input-output-hk", "repo": "ops-lib", - "rev": "517c747f4d5d56e626f62618803bfccb09f14019", + "rev": "5be29ed53b2a4cbbf4cf326fa2e9c1f2b754d26d", "type": "github" }, "original": { @@ -12663,199 +8450,65 @@ "type": "github" } }, - "ouroboros-network": { - "flake": false, - "locked": { - "lastModified": 1643385024, - "narHash": "sha256-9R4Z1jBsTcEgBHxhzjCJnroEcdfMsTjf8kwg6uPue+Q=", - "owner": "input-output-hk", - "repo": "ouroboros-network", - "rev": "8e97076176d465f5f4f86d5b5596220272630649", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "ouroboros-network", - "type": "github" - } - }, - "ouroboros-network_2": { - "flake": false, - "locked": { - "lastModified": 1643385024, - "narHash": "sha256-9R4Z1jBsTcEgBHxhzjCJnroEcdfMsTjf8kwg6uPue+Q=", - "owner": "input-output-hk", - "repo": "ouroboros-network", - "rev": "8e97076176d465f5f4f86d5b5596220272630649", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "ouroboros-network", - "type": "github" - } - }, - "ouroboros-network_3": { - "flake": false, - "locked": { - "lastModified": 1643385024, - "narHash": "sha256-9R4Z1jBsTcEgBHxhzjCJnroEcdfMsTjf8kwg6uPue+Q=", - "owner": "input-output-hk", - "repo": "ouroboros-network", - "rev": "8e97076176d465f5f4f86d5b5596220272630649", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "ouroboros-network", - "type": "github" - } - }, - "ouroboros-network_4": { + "ops-lib_4": { "flake": false, "locked": { - "lastModified": 1643385024, - "narHash": "sha256-9R4Z1jBsTcEgBHxhzjCJnroEcdfMsTjf8kwg6uPue+Q=", + "lastModified": 1649848729, + "narHash": "sha256-5zN9gpn+DwdB67bcHfDD8zgMnR0EaJd2JVNMyL6J1N0=", "owner": "input-output-hk", - "repo": "ouroboros-network", - "rev": "8e97076176d465f5f4f86d5b5596220272630649", + "repo": "ops-lib", + "rev": "517c747f4d5d56e626f62618803bfccb09f14019", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "ouroboros-network", + "repo": "ops-lib", "type": "github" } }, "plutip": { "inputs": { - "CHaP": "CHaP_5", - "cardano-addresses": "cardano-addresses", - "cardano-node": "cardano-node_4", - "cardano-wallet": "cardano-wallet_2", - "flake-compat": "flake-compat_18", - "haskell-nix": "haskell-nix_7", - "hw-aeson": "hw-aeson", - "iohk-nix": "iohk-nix_5", + "CHaP": "CHaP_4", + "cardano-node": [ + "ctl", + "cardano-node" + ], + "flake-compat": "flake-compat_14", + "hackage-nix": [ + "ctl", + "hackage-nix" + ], + "haskell-nix": [ + "ctl", + "haskell-nix" + ], + "iohk-nix": [ + "ctl", + "iohk-nix" + ], "nixpkgs": [ "ctl", - "plutip", - "haskell-nix", - "nixpkgs-unstable" + "nixpkgs" ] }, "locked": { - "lastModified": 1682621645, - "narHash": "sha256-JXvTEmGzLDPfzLJxw+jvtOTR9fyIWlqm5a7IjRLBtGQ=", + "lastModified": 1695131439, + "narHash": "sha256-7ZhZUDhlFvV2us4G27iAk6lHezKS/4WA07NQn88VtQU=", "owner": "mlabs-haskell", "repo": "plutip", - "rev": "1d35f53c7e4938c6df0fdd3bea6c5e9d5f704158", + "rev": "1bf0b547cd3689c727586abb8385c008fb2a3d1c", "type": "github" }, "original": { "owner": "mlabs-haskell", + "ref": "gergely/version-bump", "repo": "plutip", - "rev": "1d35f53c7e4938c6df0fdd3bea6c5e9d5f704158", - "type": "github" - } - }, - "plutus-apps": { - "flake": false, - "locked": { - "lastModified": 1647347289, - "narHash": "sha256-dxKZ1Zvflyt6igYm39POV6X/0giKbfb4U7D1TvevQls=", - "owner": "input-output-hk", - "repo": "plutus-apps", - "rev": "2a40552f4654d695f21783c86e8ae59243ce9dfa", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "plutus-apps", - "type": "github" - } - }, - "plutus-apps_2": { - "flake": false, - "locked": { - "lastModified": 1654271253, - "narHash": "sha256-GQDPzyVtcbbESmckMvzoTEKa/UWWJH7djh1TWQjzFow=", - "owner": "input-output-hk", - "repo": "plutus-apps", - "rev": "61de89d33340279b8452a0dbb52a87111db87e82", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "plutus-apps", - "type": "github" - } - }, - "plutus-example": { - "inputs": { - "customConfig": "customConfig_6", - "haskellNix": "haskellNix_6", - "iohkNix": "iohkNix_6", - "nixpkgs": [ - "ctl", - "ogmios", - "cardano-node", - "node-snapshot", - "plutus-example", - "haskellNix", - "nixpkgs-2105" - ], - "utils": "utils_23" - }, - "locked": { - "lastModified": 1640022647, - "narHash": "sha256-M+YnF7Zj/7QK2pu0T75xNVaX0eEeijtBH8yz+jEHIMM=", - "owner": "input-output-hk", - "repo": "cardano-node", - "rev": "814df2c146f5d56f8c35a681fe75e85b905aed5d", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "cardano-node", - "rev": "814df2c146f5d56f8c35a681fe75e85b905aed5d", - "type": "github" - } - }, - "plutus-example_2": { - "inputs": { - "customConfig": "customConfig_10", - "haskellNix": "haskellNix_10", - "iohkNix": "iohkNix_10", - "nixpkgs": [ - "ctl", - "ogmios-nixos", - "cardano-node", - "node-snapshot", - "plutus-example", - "haskellNix", - "nixpkgs-2105" - ], - "utils": "utils_28" - }, - "locked": { - "lastModified": 1640022647, - "narHash": "sha256-M+YnF7Zj/7QK2pu0T75xNVaX0eEeijtBH8yz+jEHIMM=", - "owner": "input-output-hk", - "repo": "cardano-node", - "rev": "814df2c146f5d56f8c35a681fe75e85b905aed5d", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "cardano-node", - "rev": "814df2c146f5d56f8c35a681fe75e85b905aed5d", "type": "github" } }, "poetry2nix": { "inputs": { - "flake-utils": "flake-utils_12", + "flake-utils": "flake-utils_17", "nixpkgs": [ "ctl", "db-sync", @@ -12882,8 +8535,8 @@ }, "pre-commit-hooks": { "inputs": { - "flake-utils": "flake-utils_18", - "nixpkgs": "nixpkgs_48" + "flake-utils": "flake-utils_23", + "nixpkgs": "nixpkgs_55" }, "locked": { "lastModified": 1639823344, @@ -12902,8 +8555,8 @@ "ragenix": { "inputs": { "agenix": "agenix_3", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_14", + "flake-utils": "flake-utils_8", + "nixpkgs": "nixpkgs_21", "rust-overlay": "rust-overlay" }, "locked": { @@ -12923,8 +8576,8 @@ "ragenix_2": { "inputs": { "agenix": "agenix_4", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_17", + "flake-utils": "flake-utils_10", + "nixpkgs": "nixpkgs_24", "rust-overlay": "rust-overlay_2" }, "locked": { @@ -12944,8 +8597,8 @@ "ragenix_3": { "inputs": { "agenix": "agenix_5", - "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_26", + "flake-utils": "flake-utils_12", + "nixpkgs": "nixpkgs_33", "rust-overlay": "rust-overlay_3" }, "locked": { @@ -12965,8 +8618,8 @@ "ragenix_4": { "inputs": { "agenix": "agenix_7", - "flake-utils": "flake-utils_14", - "nixpkgs": "nixpkgs_43", + "flake-utils": "flake-utils_19", + "nixpkgs": "nixpkgs_50", "rust-overlay": "rust-overlay_4" }, "locked": { @@ -12986,8 +8639,8 @@ "ragenix_5": { "inputs": { "agenix": "agenix_8", - "flake-utils": "flake-utils_16", - "nixpkgs": "nixpkgs_46", + "flake-utils": "flake-utils_21", + "nixpkgs": "nixpkgs_53", "rust-overlay": "rust-overlay_5" }, "locked": { @@ -13007,7 +8660,7 @@ "root": { "inputs": { "ctl": "ctl", - "flake-compat": "flake-compat_19", + "flake-compat": "flake-compat_15", "nixpkgs": [ "ctl", "nixpkgs" @@ -13289,126 +8942,82 @@ "type": "github" } }, - "stackage": { - "flake": false, - "locked": { - "lastModified": 1646010978, - "narHash": "sha256-NpioQiTXyYm+Gm111kcDEE/ghflmnTNwPhWff54GYA4=", - "owner": "input-output-hk", - "repo": "stackage.nix", - "rev": "9cce3e0d420f6c38cdbbe1c5e5bbc07fd2adfc3a", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "stackage.nix", - "type": "github" - } - }, - "stackage_10": { - "flake": false, - "locked": { - "lastModified": 1639012797, - "narHash": "sha256-hiLyBa5XFBvxD+BcYPKyYd/0dNMccxAuywFNqYtIIvs=", - "owner": "input-output-hk", - "repo": "stackage.nix", - "rev": "9ea6ea359da91c75a71e334b25aa7dc5ddc4b2c6", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "stackage.nix", - "type": "github" - } - }, - "stackage_11": { - "flake": false, - "locked": { - "lastModified": 1669857425, - "narHash": "sha256-pmGWQ8poIUqU0V02Zm8aMPimcW2JHqKCFOnLSYX22Ow=", - "owner": "input-output-hk", - "repo": "stackage.nix", - "rev": "76e7487150da63a6061c63fa83e69da97ec56ede", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "stackage.nix", - "type": "github" - } - }, - "stackage_12": { + "secp256k1": { "flake": false, "locked": { - "lastModified": 1656898145, - "narHash": "sha256-EMgMzdANg6r5gEUkMtv5ujDo2/Kx7JJXoXiDKjDVoLw=", - "owner": "input-output-hk", - "repo": "stackage.nix", - "rev": "835a5f2d2a1acafb77add430fc8c2dd47282ef32", + "lastModified": 1683999695, + "narHash": "sha256-9nJJVENMXjXEJZzw8DHzin1DkFkF8h9m/c6PuM7Uk4s=", + "owner": "bitcoin-core", + "repo": "secp256k1", + "rev": "acf5c55ae6a94e5ca847e07def40427547876101", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "stackage.nix", + "owner": "bitcoin-core", + "ref": "v0.3.2", + "repo": "secp256k1", "type": "github" } }, - "stackage_13": { + "secp256k1_2": { "flake": false, "locked": { - "lastModified": 1643073493, - "narHash": "sha256-5cPd1+i/skvJY9vJO1BhVRPcJObqkxDSywBEppDmb1U=", - "owner": "input-output-hk", - "repo": "stackage.nix", - "rev": "48e1188855ca38f3b7e2a8dba5352767a2f0a8f7", + "lastModified": 1683999695, + "narHash": "sha256-9nJJVENMXjXEJZzw8DHzin1DkFkF8h9m/c6PuM7Uk4s=", + "owner": "bitcoin-core", + "repo": "secp256k1", + "rev": "acf5c55ae6a94e5ca847e07def40427547876101", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "stackage.nix", + "owner": "bitcoin-core", + "ref": "v0.3.2", + "repo": "secp256k1", "type": "github" } }, - "stackage_14": { + "sodium": { "flake": false, "locked": { - "lastModified": 1643073493, - "narHash": "sha256-5cPd1+i/skvJY9vJO1BhVRPcJObqkxDSywBEppDmb1U=", + "lastModified": 1675156279, + "narHash": "sha256-0uRcN5gvMwO7MCXVYnoqG/OmeBFi8qRVnDWJLnBb9+Y=", "owner": "input-output-hk", - "repo": "stackage.nix", - "rev": "48e1188855ca38f3b7e2a8dba5352767a2f0a8f7", + "repo": "libsodium", + "rev": "dbb48cce5429cb6585c9034f002568964f1ce567", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "stackage.nix", + "repo": "libsodium", + "rev": "dbb48cce5429cb6585c9034f002568964f1ce567", "type": "github" } }, - "stackage_15": { + "sodium_2": { "flake": false, "locked": { - "lastModified": 1639012797, - "narHash": "sha256-hiLyBa5XFBvxD+BcYPKyYd/0dNMccxAuywFNqYtIIvs=", + "lastModified": 1675156279, + "narHash": "sha256-0uRcN5gvMwO7MCXVYnoqG/OmeBFi8qRVnDWJLnBb9+Y=", "owner": "input-output-hk", - "repo": "stackage.nix", - "rev": "9ea6ea359da91c75a71e334b25aa7dc5ddc4b2c6", + "repo": "libsodium", + "rev": "dbb48cce5429cb6585c9034f002568964f1ce567", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "stackage.nix", + "repo": "libsodium", + "rev": "dbb48cce5429cb6585c9034f002568964f1ce567", "type": "github" } }, - "stackage_16": { + "stackage": { "flake": false, "locked": { - "lastModified": 1667610757, - "narHash": "sha256-H4dlMk5EW50xOtGo+5Srm3HGQV1+hY9ttgRQ+Sew5uA=", + "lastModified": 1685491814, + "narHash": "sha256-OQX+h5hcDptW6HVrYkBL7dtgqiaiz9zn6iMYv+0CDzc=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "01d8ea53f65b08910003a1990547bab75ed6068a", + "rev": "678b4297ccef8bbcd83294e47e1a9042034bdbd0", "type": "github" }, "original": { @@ -13417,14 +9026,14 @@ "type": "github" } }, - "stackage_17": { + "stackage_2": { "flake": false, "locked": { - "lastModified": 1653355076, - "narHash": "sha256-mQdOgAyFkLUJBPrVDZmZQ2JRtgHKOQkil//SDdcjP1U=", + "lastModified": 1646010978, + "narHash": "sha256-NpioQiTXyYm+Gm111kcDEE/ghflmnTNwPhWff54GYA4=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "71b16ca68d6acd639121db43238896357fe53f54", + "rev": "9cce3e0d420f6c38cdbbe1c5e5bbc07fd2adfc3a", "type": "github" }, "original": { @@ -13433,7 +9042,7 @@ "type": "github" } }, - "stackage_2": { + "stackage_3": { "flake": false, "locked": { "lastModified": 1655255731, @@ -13449,7 +9058,7 @@ "type": "github" } }, - "stackage_3": { + "stackage_4": { "flake": false, "locked": { "lastModified": 1659402917, @@ -13465,7 +9074,7 @@ "type": "github" } }, - "stackage_4": { + "stackage_5": { "flake": false, "locked": { "lastModified": 1650936094, @@ -13481,14 +9090,14 @@ "type": "github" } }, - "stackage_5": { + "stackage_6": { "flake": false, "locked": { - "lastModified": 1653355076, - "narHash": "sha256-mQdOgAyFkLUJBPrVDZmZQ2JRtgHKOQkil//SDdcjP1U=", + "lastModified": 1702426166, + "narHash": "sha256-j7wjtnR3HjT+OOq4GOWQMG+LufhAmz7CNDTJDW7ouXE=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "71b16ca68d6acd639121db43238896357fe53f54", + "rev": "8f4b266959e3087825631fb8c7b2ef2f4c915ed9", "type": "github" }, "original": { @@ -13497,7 +9106,7 @@ "type": "github" } }, - "stackage_6": { + "stackage_7": { "flake": false, "locked": { "lastModified": 1654219171, @@ -13513,70 +9122,46 @@ "type": "github" } }, - "stackage_7": { - "flake": false, - "locked": { - "lastModified": 1665537461, - "narHash": "sha256-60tLFJ0poKp3IIPMvIDx3yzmjwrX7CngypfCQqV+oXE=", - "owner": "input-output-hk", - "repo": "stackage.nix", - "rev": "fbf47f75f32aedcdd97143ec59c578f403fae35f", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "stackage.nix", - "type": "github" - } - }, - "stackage_8": { - "flake": false, - "locked": { - "lastModified": 1643073493, - "narHash": "sha256-5cPd1+i/skvJY9vJO1BhVRPcJObqkxDSywBEppDmb1U=", - "owner": "input-output-hk", - "repo": "stackage.nix", - "rev": "48e1188855ca38f3b7e2a8dba5352767a2f0a8f7", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "stackage.nix", - "type": "github" - } - }, - "stackage_9": { - "flake": false, - "locked": { - "lastModified": 1643073493, - "narHash": "sha256-5cPd1+i/skvJY9vJO1BhVRPcJObqkxDSywBEppDmb1U=", - "owner": "input-output-hk", - "repo": "stackage.nix", - "rev": "48e1188855ca38f3b7e2a8dba5352767a2f0a8f7", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "stackage.nix", - "type": "github" - } - }, "std": { "inputs": { - "devshell": "devshell_6", + "arion": [ + "ctl", + "cardano-node", + "tullia", + "std", + "blank" + ], + "blank": "blank", + "devshell": "devshell", "dmerge": "dmerge", - "flake-utils": "flake-utils_8", - "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor", + "flake-utils": "flake-utils_5", + "incl": "incl", + "makes": [ + "ctl", + "cardano-node", + "tullia", + "std", + "blank" + ], + "microvm": [ + "ctl", + "cardano-node", + "tullia", + "std", + "blank" + ], + "n2c": "n2c", "nixago": "nixago", - "nixpkgs": "nixpkgs_27", - "yants": "yants_2" + "nixpkgs": "nixpkgs_8", + "nosys": "nosys", + "yants": "yants" }, "locked": { - "lastModified": 1661370377, - "narHash": "sha256-LBKuwWajbv8osh5doIh7H8MQJgcdqjCGY0pW5eI/0Zk=", + "lastModified": 1674526466, + "narHash": "sha256-tMTaS0bqLx6VJ+K+ZT6xqsXNpzvSXJTmogkraBGzymg=", "owner": "divnix", "repo": "std", - "rev": "92503146d322c0c1ec3f2567925711b5fb59f7e2", + "rev": "516387e3d8d059b50e742a2ff1909ed3c8f82826", "type": "github" }, "original": { @@ -13587,20 +9172,20 @@ }, "std_2": { "inputs": { - "devshell": "devshell_14", + "devshell": "devshell_7", "dmerge": "dmerge_2", - "flake-utils": "flake-utils_24", - "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor_2", + "flake-utils": "flake-utils_13", + "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor", "nixago": "nixago_2", - "nixpkgs": "nixpkgs_57", - "yants": "yants_4" + "nixpkgs": "nixpkgs_34", + "yants": "yants_3" }, "locked": { - "lastModified": 1661367957, - "narHash": "sha256-5B94aTocy6Y6ZJFmzkGdPmg6L6gjNaMVAKcpsaw44Ns=", + "lastModified": 1661370377, + "narHash": "sha256-LBKuwWajbv8osh5doIh7H8MQJgcdqjCGY0pW5eI/0Zk=", "owner": "divnix", "repo": "std", - "rev": "d39794e19e648b840e5a56aa1f354d43aee9abf7", + "rev": "92503146d322c0c1ec3f2567925711b5fb59f7e2", "type": "github" }, "original": { @@ -13612,15 +9197,19 @@ "std_3": { "inputs": { "devshell": "devshell_15", - "nixpkgs": "nixpkgs_60", + "dmerge": "dmerge_3", + "flake-utils": "flake-utils_29", + "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor_2", + "nixago": "nixago_3", + "nixpkgs": "nixpkgs_64", "yants": "yants_5" }, "locked": { - "lastModified": 1652784712, - "narHash": "sha256-ofwGapSWqzUVgIxwwmjlrOVogfjV4yd6WpY8fNfMc2o=", + "lastModified": 1661367957, + "narHash": "sha256-5B94aTocy6Y6ZJFmzkGdPmg6L6gjNaMVAKcpsaw44Ns=", "owner": "divnix", "repo": "std", - "rev": "3667d2d868352b0bf47c83440da48bee9f2fab47", + "rev": "d39794e19e648b840e5a56aa1f354d43aee9abf7", "type": "github" }, "original": { @@ -13631,80 +9220,16 @@ }, "std_4": { "inputs": { - "blank": "blank_5", "devshell": "devshell_16", - "dmerge": "dmerge_3", - "flake-utils": "flake-utils_36", - "makes": [ - "ctl", - "ogmios", - "haskell-nix", - "tullia", - "std", - "blank" - ], - "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor_3", - "microvm": [ - "ctl", - "ogmios", - "haskell-nix", - "tullia", - "std", - "blank" - ], - "n2c": "n2c_3", - "nixago": "nixago_3", - "nixpkgs": "nixpkgs_72", + "nixpkgs": "nixpkgs_67", "yants": "yants_6" }, "locked": { - "lastModified": 1665513321, - "narHash": "sha256-D6Pacw9yf/HMs84KYuCxHXnNDL7v43gtcka5URagFqE=", - "owner": "divnix", - "repo": "std", - "rev": "94a90eedb9cfc115b12ae8f6622d9904788559e4", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "std", - "type": "github" - } - }, - "std_5": { - "inputs": { - "blank": "blank_7", - "devshell": "devshell_17", - "dmerge": "dmerge_4", - "flake-utils": "flake-utils_44", - "makes": [ - "ctl", - "ogmios-nixos", - "haskell-nix", - "tullia", - "std", - "blank" - ], - "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor_4", - "microvm": [ - "ctl", - "ogmios-nixos", - "haskell-nix", - "tullia", - "std", - "blank" - ], - "n2c": "n2c_4", - "nixago": "nixago_4", - "nixpkgs": "nixpkgs_80", - "yants": "yants_7" - }, - "locked": { - "lastModified": 1665513321, - "narHash": "sha256-D6Pacw9yf/HMs84KYuCxHXnNDL7v43gtcka5URagFqE=", + "lastModified": 1652784712, + "narHash": "sha256-ofwGapSWqzUVgIxwwmjlrOVogfjV4yd6WpY8fNfMc2o=", "owner": "divnix", "repo": "std", - "rev": "94a90eedb9cfc115b12ae8f6622d9904788559e4", + "rev": "3667d2d868352b0bf47c83440da48bee9f2fab47", "type": "github" }, "original": { @@ -13895,8 +9420,8 @@ }, "tailwind-haskell": { "inputs": { - "flake-utils": "flake-utils_19", - "nixpkgs": "nixpkgs_51" + "flake-utils": "flake-utils_24", + "nixpkgs": "nixpkgs_58" }, "locked": { "lastModified": 1654211622, @@ -13917,7 +9442,7 @@ "inputs": { "bats-assert": "bats-assert", "bats-support": "bats-support", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_9", "nixpkgs": [ "ctl", "db-sync", @@ -13992,7 +9517,7 @@ "inputs": { "bats-assert": "bats-assert_2", "bats-support": "bats-support_2", - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_14", "nixpkgs": [ "ctl", "db-sync", @@ -14020,215 +9545,79 @@ "inputs": { "bats-assert": "bats-assert_3", "bats-support": "bats-support_3", - "flake-utils": "flake-utils_15", + "flake-utils": "flake-utils_20", "nixpkgs": [ "ctl", "db-sync", "cardano-world", - "capsules", - "bitte", - "blank" - ], - "terranix-examples": "terranix-examples_3" - }, - "locked": { - "lastModified": 1637158331, - "narHash": "sha256-x5LEKtSkVq+D3BXHDBOb2wdCLxAhVmXIWONRi9lxDPg=", - "owner": "terranix", - "repo": "terranix", - "rev": "34198bb154af86d2a559446f10d7339e53126abe", - "type": "github" - }, - "original": { - "owner": "terranix", - "repo": "terranix", - "type": "github" - } - }, - "tullia": { - "inputs": { - "nix2container": "nix2container", - "nixpkgs": "nixpkgs_59", - "std": "std_3" - }, - "locked": { - "lastModified": 1657811465, - "narHash": "sha256-KHNWwKuUIG08CUg/ol81zf26RRlnsQsyqMr63vXcCes=", - "owner": "input-output-hk", - "repo": "tullia", - "rev": "f025fcf3676d1d1281de184e89c5f7c8e7f74ebe", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "tullia", - "type": "github" - } - }, - "tullia_2": { - "inputs": { - "nix-nomad": "nix-nomad", - "nix2container": "nix2container_2", - "nixpkgs": [ - "ctl", - "ogmios", - "haskell-nix", - "nixpkgs" - ], - "std": "std_4" - }, - "locked": { - "lastModified": 1668711738, - "narHash": "sha256-CBjky16o9pqsGE1bWu6nRlRajgSXMEk+yaFQLibqXcE=", - "owner": "input-output-hk", - "repo": "tullia", - "rev": "ead1f515c251f0e060060ef0e2356a51d3dfe4b0", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "tullia", - "type": "github" - } - }, - "tullia_3": { - "inputs": { - "nix-nomad": "nix-nomad_2", - "nix2container": "nix2container_3", - "nixpkgs": [ - "ctl", - "ogmios-nixos", - "haskell-nix", - "nixpkgs" - ], - "std": "std_5" - }, - "locked": { - "lastModified": 1666200256, - "narHash": "sha256-cJPS8zBu30SMhxMe7I8DWutwqMuhPsEez87y9gxMKc4=", - "owner": "input-output-hk", - "repo": "tullia", - "rev": "575362c2244498e8d2c97f72861510fa72e75d44", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "tullia", - "type": "github" - } - }, - "utils": { - "locked": { - "lastModified": 1637014545, - "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_10": { - "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_11": { - "locked": { - "lastModified": 1633020561, - "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", - "owner": "kreisys", - "repo": "flake-utils", - "rev": "2923532a276a5595ee64376ec1b3db6ed8503c52", - "type": "github" - }, - "original": { - "owner": "kreisys", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_12": { - "locked": { - "lastModified": 1633020561, - "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", - "owner": "kreisys", - "repo": "flake-utils", - "rev": "2923532a276a5595ee64376ec1b3db6ed8503c52", - "type": "github" - }, - "original": { - "owner": "kreisys", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_13": { + "capsules", + "bitte", + "blank" + ], + "terranix-examples": "terranix-examples_3" + }, "locked": { - "lastModified": 1633020561, - "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", - "owner": "kreisys", - "repo": "flake-utils", - "rev": "2923532a276a5595ee64376ec1b3db6ed8503c52", + "lastModified": 1637158331, + "narHash": "sha256-x5LEKtSkVq+D3BXHDBOb2wdCLxAhVmXIWONRi9lxDPg=", + "owner": "terranix", + "repo": "terranix", + "rev": "34198bb154af86d2a559446f10d7339e53126abe", "type": "github" }, "original": { - "owner": "kreisys", - "repo": "flake-utils", + "owner": "terranix", + "repo": "terranix", "type": "github" } }, - "utils_14": { + "tullia": { + "inputs": { + "nix-nomad": "nix-nomad", + "nix2container": "nix2container_2", + "nixpkgs": "nixpkgs_7", + "std": "std" + }, "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "lastModified": 1675695930, + "narHash": "sha256-B7rEZ/DBUMlK1AcJ9ajnAPPxqXY6zW2SBX+51bZV0Ac=", + "owner": "input-output-hk", + "repo": "tullia", + "rev": "621365f2c725608f381b3ad5b57afef389fd4c31", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "input-output-hk", + "repo": "tullia", "type": "github" } }, - "utils_15": { + "tullia_2": { + "inputs": { + "nix2container": "nix2container_3", + "nixpkgs": "nixpkgs_66", + "std": "std_4" + }, "locked": { - "lastModified": 1637014545, - "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", + "lastModified": 1657811465, + "narHash": "sha256-KHNWwKuUIG08CUg/ol81zf26RRlnsQsyqMr63vXcCes=", + "owner": "input-output-hk", + "repo": "tullia", + "rev": "f025fcf3676d1d1281de184e89c5f7c8e7f74ebe", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "input-output-hk", + "repo": "tullia", "type": "github" } }, - "utils_16": { + "utils": { "locked": { - "lastModified": 1601282935, - "narHash": "sha256-WQAFV6sGGQxrRs3a+/Yj9xUYvhTpukQJIcMbIi7LCJ4=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "588973065fce51f4763287f0fda87a174d78bf48", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -14237,7 +9626,7 @@ "type": "github" } }, - "utils_17": { + "utils_10": { "locked": { "lastModified": 1633020561, "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", @@ -14252,7 +9641,7 @@ "type": "github" } }, - "utils_18": { + "utils_11": { "locked": { "lastModified": 1633020561, "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", @@ -14267,7 +9656,7 @@ "type": "github" } }, - "utils_19": { + "utils_12": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -14282,22 +9671,22 @@ "type": "github" } }, - "utils_2": { + "utils_13": { "locked": { - "lastModified": 1601282935, - "narHash": "sha256-WQAFV6sGGQxrRs3a+/Yj9xUYvhTpukQJIcMbIi7LCJ4=", - "owner": "numtide", + "lastModified": 1633020561, + "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", + "owner": "kreisys", "repo": "flake-utils", - "rev": "588973065fce51f4763287f0fda87a174d78bf48", + "rev": "2923532a276a5595ee64376ec1b3db6ed8503c52", "type": "github" }, "original": { - "owner": "numtide", + "owner": "kreisys", "repo": "flake-utils", "type": "github" } }, - "utils_20": { + "utils_14": { "locked": { "lastModified": 1633020561, "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", @@ -14312,28 +9701,28 @@ "type": "github" } }, - "utils_21": { + "utils_15": { "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", + "lastModified": 1633020561, + "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", + "owner": "kreisys", "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "rev": "2923532a276a5595ee64376ec1b3db6ed8503c52", "type": "github" }, "original": { - "owner": "numtide", + "owner": "kreisys", "repo": "flake-utils", "type": "github" } }, - "utils_22": { + "utils_16": { "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { @@ -14342,13 +9731,13 @@ "type": "github" } }, - "utils_23": { + "utils_17": { "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "lastModified": 1637014545, + "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", "owner": "numtide", "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", "type": "github" }, "original": { @@ -14357,13 +9746,13 @@ "type": "github" } }, - "utils_24": { + "utils_18": { "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "lastModified": 1601282935, + "narHash": "sha256-WQAFV6sGGQxrRs3a+/Yj9xUYvhTpukQJIcMbIi7LCJ4=", "owner": "numtide", "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "rev": "588973065fce51f4763287f0fda87a174d78bf48", "type": "github" }, "original": { @@ -14372,28 +9761,28 @@ "type": "github" } }, - "utils_25": { + "utils_19": { "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", - "owner": "numtide", + "lastModified": 1633020561, + "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", + "owner": "kreisys", "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "rev": "2923532a276a5595ee64376ec1b3db6ed8503c52", "type": "github" }, "original": { - "owner": "numtide", + "owner": "kreisys", "repo": "flake-utils", "type": "github" } }, - "utils_26": { + "utils_2": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -14402,22 +9791,22 @@ "type": "github" } }, - "utils_27": { + "utils_20": { "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", - "owner": "numtide", + "lastModified": 1633020561, + "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", + "owner": "kreisys", "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "rev": "2923532a276a5595ee64376ec1b3db6ed8503c52", "type": "github" }, "original": { - "owner": "numtide", + "owner": "kreisys", "repo": "flake-utils", "type": "github" } }, - "utils_28": { + "utils_21": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -14432,22 +9821,7 @@ "type": "github" } }, - "utils_29": { - "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_3": { + "utils_22": { "locked": { "lastModified": 1633020561, "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", @@ -14462,13 +9836,13 @@ "type": "github" } }, - "utils_30": { + "utils_23": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { @@ -14477,13 +9851,13 @@ "type": "github" } }, - "utils_31": { + "utils_3": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1637014545, + "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", "type": "github" }, "original": { @@ -14494,30 +9868,30 @@ }, "utils_4": { "locked": { - "lastModified": 1633020561, - "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", - "owner": "kreisys", + "lastModified": 1601282935, + "narHash": "sha256-WQAFV6sGGQxrRs3a+/Yj9xUYvhTpukQJIcMbIi7LCJ4=", + "owner": "numtide", "repo": "flake-utils", - "rev": "2923532a276a5595ee64376ec1b3db6ed8503c52", + "rev": "588973065fce51f4763287f0fda87a174d78bf48", "type": "github" }, "original": { - "owner": "kreisys", + "owner": "numtide", "repo": "flake-utils", "type": "github" } }, "utils_5": { "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", + "lastModified": 1633020561, + "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", + "owner": "kreisys", "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "rev": "2923532a276a5595ee64376ec1b3db6ed8503c52", "type": "github" }, "original": { - "owner": "numtide", + "owner": "kreisys", "repo": "flake-utils", "type": "github" } @@ -14539,11 +9913,11 @@ }, "utils_7": { "locked": { - "lastModified": 1637014545, - "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "owner": "numtide", "repo": "flake-utils", - "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { @@ -14569,15 +9943,15 @@ }, "utils_9": { "locked": { - "lastModified": 1633020561, - "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", - "owner": "kreisys", + "lastModified": 1637014545, + "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", + "owner": "numtide", "repo": "flake-utils", - "rev": "2923532a276a5595ee64376ec1b3db6ed8503c52", + "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", "type": "github" }, "original": { - "owner": "kreisys", + "owner": "numtide", "repo": "flake-utils", "type": "github" } @@ -14617,40 +9991,21 @@ } }, "yants": { - "inputs": { - "nixpkgs": "nixpkgs_18" - }, - "locked": { - "lastModified": 1645126146, - "narHash": "sha256-XQ1eg4gzXoc7Tl8iXak1uCt3KnsTyxqPtLE+vOoDnrQ=", - "owner": "divnix", - "repo": "yants", - "rev": "77df2be1b3cce9f571c6cf451f786b266a6869cc", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "yants", - "type": "github" - } - }, - "yants_2": { "inputs": { "nixpkgs": [ "ctl", - "db-sync", - "cardano-world", - "bitte", + "cardano-node", + "tullia", "std", "nixpkgs" ] }, "locked": { - "lastModified": 1645126146, - "narHash": "sha256-XQ1eg4gzXoc7Tl8iXak1uCt3KnsTyxqPtLE+vOoDnrQ=", + "lastModified": 1667096281, + "narHash": "sha256-wRRec6ze0gJHmGn6m57/zhz/Kdvp9HS4Nl5fkQ+uIuA=", "owner": "divnix", "repo": "yants", - "rev": "77df2be1b3cce9f571c6cf451f786b266a6869cc", + "rev": "d18f356ec25cb94dc9c275870c3a7927a10f8c3c", "type": "github" }, "original": { @@ -14659,9 +10014,9 @@ "type": "github" } }, - "yants_3": { + "yants_2": { "inputs": { - "nixpkgs": "nixpkgs_53" + "nixpkgs": "nixpkgs_25" }, "locked": { "lastModified": 1645126146, @@ -14677,12 +10032,13 @@ "type": "github" } }, - "yants_4": { + "yants_3": { "inputs": { "nixpkgs": [ "ctl", "db-sync", "cardano-world", + "bitte", "std", "nixpkgs" ] @@ -14701,16 +10057,9 @@ "type": "github" } }, - "yants_5": { + "yants_4": { "inputs": { - "nixpkgs": [ - "ctl", - "db-sync", - "cardano-world", - "tullia", - "std", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_60" }, "locked": { "lastModified": 1645126146, @@ -14726,23 +10075,22 @@ "type": "github" } }, - "yants_6": { + "yants_5": { "inputs": { "nixpkgs": [ "ctl", - "ogmios", - "haskell-nix", - "tullia", + "db-sync", + "cardano-world", "std", "nixpkgs" ] }, "locked": { - "lastModified": 1660507851, - "narHash": "sha256-BKjq7JnVuUR/xDtcv6Vm9GYGKAblisXrAgybor9hT/s=", + "lastModified": 1645126146, + "narHash": "sha256-XQ1eg4gzXoc7Tl8iXak1uCt3KnsTyxqPtLE+vOoDnrQ=", "owner": "divnix", "repo": "yants", - "rev": "0b895ca02a8fa72bad50b454cb3e7d8a66407c96", + "rev": "77df2be1b3cce9f571c6cf451f786b266a6869cc", "type": "github" }, "original": { @@ -14751,23 +10099,23 @@ "type": "github" } }, - "yants_7": { + "yants_6": { "inputs": { "nixpkgs": [ "ctl", - "ogmios-nixos", - "haskell-nix", + "db-sync", + "cardano-world", "tullia", "std", "nixpkgs" ] }, "locked": { - "lastModified": 1660507851, - "narHash": "sha256-BKjq7JnVuUR/xDtcv6Vm9GYGKAblisXrAgybor9hT/s=", + "lastModified": 1645126146, + "narHash": "sha256-XQ1eg4gzXoc7Tl8iXak1uCt3KnsTyxqPtLE+vOoDnrQ=", "owner": "divnix", "repo": "yants", - "rev": "0b895ca02a8fa72bad50b454cb3e7d8a66407c96", + "rev": "77df2be1b3cce9f571c6cf451f786b266a6869cc", "type": "github" }, "original": { diff --git a/templates/ctl-scaffold/flake.nix b/templates/ctl-scaffold/flake.nix index 1128065826..abd88cd41a 100644 --- a/templates/ctl-scaffold/flake.nix +++ b/templates/ctl-scaffold/flake.nix @@ -10,7 +10,7 @@ type = "github"; owner = "Plutonomicon"; repo = "cardano-transaction-lib"; - rev = "6e4debe87ddbafaa3c77033888f9c998e28cd7ca"; + rev = "774c005ae9ebd228e9b6c31a636b3470d11064dd"; }; # To use the same version of `nixpkgs` as we do nixpkgs.follows = "ctl/nixpkgs"; diff --git a/templates/ctl-scaffold/packages.dhall b/templates/ctl-scaffold/packages.dhall index 0b13ca4a2c..deb9f2e1cc 100644 --- a/templates/ctl-scaffold/packages.dhall +++ b/templates/ctl-scaffold/packages.dhall @@ -296,7 +296,7 @@ let additions = , "web-storage" ] , repo = "https://github.com/Plutonomicon/cardano-transaction-lib.git" - , version = "6e4debe87ddbafaa3c77033888f9c998e28cd7ca" + , version = "774c005ae9ebd228e9b6c31a636b3470d11064dd" } , js-bigints = { dependencies = [ "integers", "maybe", "prelude" ] diff --git a/templates/ctl-scaffold/spago-packages.nix b/templates/ctl-scaffold/spago-packages.nix index f176dc0c5a..1c9dc40565 100644 --- a/templates/ctl-scaffold/spago-packages.nix +++ b/templates/ctl-scaffold/spago-packages.nix @@ -199,11 +199,11 @@ let "cardano-transaction-lib" = pkgs.stdenv.mkDerivation { name = "cardano-transaction-lib"; - version = "6e4debe87ddbafaa3c77033888f9c998e28cd7ca"; + version = "774c005ae9ebd228e9b6c31a636b3470d11064dd"; src = pkgs.fetchgit { url = "https://github.com/Plutonomicon/cardano-transaction-lib.git"; - rev = "6e4debe87ddbafaa3c77033888f9c998e28cd7ca"; - sha256 = "13cb7kadd1fgglzz69v0hmqr4x8zn1nrskxmjkmmss9g1izbi0ly"; + rev = "774c005ae9ebd228e9b6c31a636b3470d11064dd"; + sha256 = "043ymj0p9lw6agd3wzbvslpd6k77fs43h02l4ci4ba6nin7p45sf"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; From 1f2e3a484b06432d9e274fc840eba621eadb1c7e Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Fri, 15 Dec 2023 14:48:54 +0400 Subject: [PATCH 80/85] Remove searchable docs from nix machinery for now --- doc/ctl-as-dependency.md | 2 +- flake.nix | 10 ++-- nix/default.nix | 126 +++------------------------------------ 3 files changed, 16 insertions(+), 122 deletions(-) diff --git a/doc/ctl-as-dependency.md b/doc/ctl-as-dependency.md index 551e7a1210..0be2285aec 100644 --- a/doc/ctl-as-dependency.md +++ b/doc/ctl-as-dependency.md @@ -24,7 +24,7 @@ The following caveats alway applies when using CTL from your project: CTL exposes two `overlay`s from its flake. You can use these in the Nix setup of your own project to use the same setup as we do, e.g. the same packages and PS builders: -- `overlays.purescript` contains Purescript builders to compile Purescript sources, build bundles with Webpack (`bundlePursProject`), run unit tests using NodeJS (`runPursTest`), run CTL contracts on a private testnet using Plutip (`runPlutipTest`), or build Pursuit documentation (`buildSearchablePursDocs` and `launchSearchablePursDocs`) +- `overlays.purescript` contains Purescript builders to compile Purescript sources, build bundles with Webpack (`bundlePursProject`), run unit tests using NodeJS (`runPursTest`), and run CTL contracts on a private testnet using Plutip (`runPlutipTest`). - `overlays.runtime` contains various packages and other tools used in CTL's runtime, including `ogmios`, `kupo`, and `plutip-server`. It also defines `buildCtlRuntime` and `launchCtlRuntime` to help you quickly launch all runtime services (see the [runtime docs](./runtime.md)) We've split the overlays into two components to allow users to more easily choose which parts of CTL's Nix infrastructure they would like to directly consume. For example, some users do not require a pre-packaged runtime and would prefer to build it themselves with more control over its components (e.g. by directly using `ogmios` from their own `inputs`). Such users might still like to use our `purescript` overlay -- splitting the `overlays` allows us to support this. `overlays.runtime` also contains several haskell.nix packages which may cause issues with `hackage.nix` versions in your own project. diff --git a/flake.nix b/flake.nix index 50328367e2..a38d4555d1 100644 --- a/flake.nix +++ b/flake.nix @@ -215,7 +215,7 @@ modules = [ (buildCtlRuntime pkgs { }) ]; }; - docs = project.buildSearchablePursDocs { + docs = project.buildPursDocs { packageName = projectName; }; }; @@ -245,9 +245,11 @@ devShell = project.devShell; apps = { - docs = project.launchSearchablePursDocs { - builtDocs = packages.docs; - }; + # TODO: restore this + # https://github.com/Plutonomicon/cardano-transaction-lib/issues/1578 + # docs = project.launchSearchablePursDocs { + # builtDocs = packages.docs; + # }; }; }; diff --git a/nix/default.nix b/nix/default.nix index 8eaf5fddba..9821b1e6b9 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -255,6 +255,9 @@ let mkdir -p output .spago cp -rp ${pursDependencies}/.spago/* .spago cp -rp ${pursDependencies}/output/* output + # note that we copy the entire source directory, not just $src/src, + # because we need sources in ./examples and ./test + cp -rp $src ./src # add write permissions for the PS compiler to use # `output/cache-db.json` @@ -264,7 +267,7 @@ let psa ${pkgs.lib.optionalString strictComp "--strict" } \ --censor-lib \ --is-lib=.spago ".spago/*/*/src/**/*.purs" ${pkgs.lib.optionalString hasExtraSources ''--is-lib=./${extraSourcesDir} "${extraSourcesDir}/*/**/*.purs"''} \ - --censor-codes=${builtins.concatStringsSep "," censorCodes} "$src/**/*.purs" \ + --censor-codes=${builtins.concatStringsSep "," censorCodes} "./src/**/*.purs" \ -gsourcemaps,js ''; # We also need to copy all of `src` here, since compiled modules in `output` @@ -588,143 +591,32 @@ let --entry ./entrypoint.js ''; - pursDocsSearchNpm = - let - fakePackage = builtins.toJSON { - name = "pursDocsSearch"; - version = "0.0.0"; - dependencies = { "purescript-docs-search" = "0.0.12"; }; - }; - fakePackageLock = builtins.toJSON { - requires = true; - lockfileVersion = 1; - dependencies = { - punycode = { - version = "2.1.1"; - resolved = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; - integrity = "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; - }; - purescript-docs-search = { - version = "0.0.12"; - resolved = "https://registry.npmjs.org/purescript-docs-search/-/purescript-docs-search-0.0.12.tgz"; - integrity = "sha512-NdhQ3AxbKR2wO+WT2fGa8Rw26JydL6Bgnf73WOazmlfHt4uszblYqiWfaZygyUMOQFnXtpqz5TQj6DW6nk4nEg=="; - }; - }; - }; - in - import - (pkgs.runCommand "purescript-docs-search-npm" - { - buildInputs = [ pkgs.nodePackages.node2nix ]; - } - '' - mkdir $out - cd $out - cat > package.json < package-lock.json < Date: Fri, 15 Dec 2023 14:56:55 +0400 Subject: [PATCH 81/85] Update template's .gitignore --- templates/ctl-scaffold/.gitignore | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/templates/ctl-scaffold/.gitignore b/templates/ctl-scaffold/.gitignore index 8732a23c87..628f00fcd2 100644 --- a/templates/ctl-scaffold/.gitignore +++ b/templates/ctl-scaffold/.gitignore @@ -20,9 +20,5 @@ test-data/preprod test-data/mainnet test-data/keys .projectile -/dist/* -!/dist/esbuild/ -/dist/esbuild/* -!/dist/esbuild/index.html -!/dist/esbuild/wrapper.js +/dist/ output.js From 9f05925e35bef54806b7177ad6aaa606d6576fe0 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Fri, 15 Dec 2023 17:01:04 +0400 Subject: [PATCH 82/85] Fix jssha import --- src/Internal/Hashing.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Internal/Hashing.js b/src/Internal/Hashing.js index db5d6174dc..0b647d6da4 100644 --- a/src/Internal/Hashing.js +++ b/src/Internal/Hashing.js @@ -2,8 +2,8 @@ import Blake2 from "blakejs"; -import SHA256 from "jssha/dist/sha256"; -import SHA3 from "jssha/dist/sha3"; +import SHA256 from "jssha/sha256"; +import SHA3 from "jssha/sha3"; let lib; if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) { From a742692d605aabd75043aee9eef0ecdfec63eacc Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Fri, 15 Dec 2023 17:07:16 +0400 Subject: [PATCH 83/85] Update CHANGELOG, docs and README --- CHANGELOG.md | 107 ++++++++++++++++++++++++++----- README.md | 2 +- doc/development.md | 12 ++-- templates/ctl-scaffold/flake.nix | 8 ++- 4 files changed, 103 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bab1b1f77d..acad5c51ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,47 +12,52 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - [Changed](#changed) - [Fixed](#fixed) - [Removed](#removed) -- [[v6.0.0]](#v600) +- [[v7.0.0]](#v700) - [Added](#added-1) - [Changed](#changed-1) - [Fixed](#fixed-1) - [Removed](#removed-1) -- [[v5.0.0]](#v500) +- [[v6.0.0]](#v600) - [Added](#added-2) - [Changed](#changed-2) - - [Removed](#removed-2) - [Fixed](#fixed-2) - - [Runtime Dependencies](#runtime-dependencies) -- [[v4.0.2] - 2023-01-17](#v402---2023-01-17) - - [Fixed](#fixed-3) -- [[v4.0.1] - 2022-12-20](#v401---2022-12-20) + - [Removed](#removed-2) +- [[v5.0.0]](#v500) - [Added](#added-3) -- [[v4.0.0] - 2022-12-15](#v400---2022-12-15) - - [Added](#added-4) - [Changed](#changed-3) - [Removed](#removed-3) + - [Fixed](#fixed-3) + - [Runtime Dependencies](#runtime-dependencies) +- [[v4.0.2] - 2023-01-17](#v402---2023-01-17) - [Fixed](#fixed-4) - - [Runtime Dependencies](#runtime-dependencies-1) -- [[3.0.0] - 2022-11-21](#300---2022-11-21) +- [[v4.0.1] - 2022-12-20](#v401---2022-12-20) + - [Added](#added-4) +- [[v4.0.0] - 2022-12-15](#v400---2022-12-15) - [Added](#added-5) - [Changed](#changed-4) - [Removed](#removed-4) - [Fixed](#fixed-5) - - [Runtime Dependencies](#runtime-dependencies-2) -- [[2.0.0] - 2022-09-12](#200---2022-09-12) + - [Runtime Dependencies](#runtime-dependencies-1) +- [[3.0.0] - 2022-11-21](#300---2022-11-21) - [Added](#added-6) - [Changed](#changed-5) - [Removed](#removed-5) - [Fixed](#fixed-6) -- [[2.0.0-alpha] - 2022-07-05](#200-alpha---2022-07-05) + - [Runtime Dependencies](#runtime-dependencies-2) +- [[2.0.0] - 2022-09-12](#200---2022-09-12) - [Added](#added-7) - - [Removed](#removed-6) - [Changed](#changed-6) + - [Removed](#removed-6) - [Fixed](#fixed-7) -- [[1.1.0] - 2022-06-30](#110---2022-06-30) +- [[2.0.0-alpha] - 2022-07-05](#200-alpha---2022-07-05) + - [Added](#added-8) + - [Removed](#removed-7) + - [Changed](#changed-7) - [Fixed](#fixed-8) -- [[1.0.1] - 2022-06-17](#101---2022-06-17) +- [[1.1.0] - 2022-06-30](#110---2022-06-30) - [Fixed](#fixed-9) +- [[1.0.1] - 2022-06-17](#101---2022-06-17) + - [Fixed](#fixed-10) - [[1.0.0] - 2022-06-10](#100---2022-06-10) @@ -67,6 +72,74 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Removed +## [v7.0.0] + +### Added + +- [esbuild](esbuild.github.io/) bundler support. + - To update your package to use esbuild, add new `devDependencies` to your `package.json`: + +```diff ++ "esbuild": "0.18.11", ++ "esbuild-plugin-polyfill-node": "^0.3.0", ++ "esbuild-plugin-wasm": "^1.1.0", +``` + + Then consult with [the template's build scripts](./templates/ctl-scaffold/esbuild/) - also see the new [Makefile](./templates/ctl-scaffold/Makefile) setup and [NPM scripts](./templates/ctl-scaffold/package.json). + +### Changed + +- PureScript compiler version has been updated to v0.15.8. ([#1521](https://github.com/Plutonomicon/cardano-transaction-lib/pull/1521)) + - PureScript v0.15.x outputs and expects ES modules (instead of CommonJS), which means that FFI code in dependent projects should be updated to use [ES module-style imports and exports](https://nodejs.org/api/esm.html), and consumers of CTL-based bundles should expect ES modules as well. + - Due to limitations of ES modules (inability to patch at runtime), CTL now uses vendored versions of CSL for node and the browser: + +```diff +- "@emurgo/cardano-serialization-lib-browser": "11.2.1", +- "@emurgo/cardano-serialization-lib-nodejs": "11.2.1", ++ "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.6", ++ "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.6", +``` + + - Our vendored version of `json-bigint` should be updated: + +```diff +- "@mlabs-haskell/json-bigint": "1.0.0", ++ "@mlabs-haskell/json-bigint": "2.0.0", +``` + + - `utf-8-validate` NPM package has been added (used during bundling): + +```diff ++ "utf-8-validate": "^5.0.10", +``` + +- WebPack bundling machinery updates: + +```diff +- "webpack": "5.67.0", +- "webpack-cli": "4.10", +- "webpack-dev-server": "4.7.4" ++ "webpack": "5.88.1", ++ "webpack-cli": "5.1.4", ++ "webpack-dev-server": "4.15.1" +``` + +- Nix machinery refactorings ([#1521](https://github.com/Plutonomicon/cardano-transaction-lib/pull/1521)): + - `buildPursDependencies` is a new function that allows to build everything except the source files of a project itself. It allows to skip rebuilding all the dependencies when using Nix every time. `buildPursProject` calls `buildPursDependencies` automatically. + - `censorCodes` and `strictComp` arguments have been removed from `purescriptProject` and added to `buildPursDependencies` and `buildPursProject` for more granular control. + - `runPursTest`: new `psEntryPoint` argument, for PureScript-level entry point function ("main" by default). + - `runE2ETest`: new `runnerMain` and `runnerPsEntryPoint` arguments to control which module should be the runner. + - `runE2ETest`: new arguments for configuring the E2E test suite: `envFile`, `emptySettingsFile` and `testTimeout`. + - `bundlePursProjectEsbuild` is a bundling function that uses newly introduced `esbuild`. + - `bundlePursProject` is renamed to `bundlePursProjectWebpack` +- `Data.BigInt` (`purescript-bigints`) dependency was replaced with `JS.BigInt` (`purescript-js-bigints`), that uses native JavaScript BigInt instead of `BigInteger.js` library. You can remove `big-integer` NPM dependency from your project, if you don't use it elsewhere. ([#1551](https://github.com/Plutonomicon/cardano-transaction-lib/pull/1551)) + +### Fixed + +### Removed + +- Temporarily removed `buildSearchablePursDocs` and `launchSearchablePursDocs` from nix machinery - see [#1578](https://github.com/Plutonomicon/cardano-transaction-lib/issues/1578) for context. Use `buildPursDocs` for now. ([#1521](https://github.com/Plutonomicon/cardano-transaction-lib/pull/1521)) + ## [v6.0.0] ### Added diff --git a/README.md b/README.md index e96a722bec..c2d164a066 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ You can find help, more information and ongoing discusion about the project here ## Funding acknowledgements -CTL is being developed by MLabs. The following companies/funds have contributed significan resources to development: +CTL is being developed by MLabs. The following companies/funds have contributed significant resources to development: - [IOHK](https://iohk.io/en/about/) - [Catalyst Fund8](https://cardano.ideascale.com/c/idea/396607) diff --git a/doc/development.md b/doc/development.md index 6dc4164429..8928d5c6ab 100644 --- a/doc/development.md +++ b/doc/development.md @@ -77,7 +77,7 @@ To **build** the project **without bundling and for a NodeJS environment**: - `npm run staking-test` to run [Plutip](./plutip-testing.md)-powered tests for ADA staking functionality - [entry point](../test/Plutip/Staking.purs) - `npm run blockfrost-test` for [Blockfrost-powered tests](./blockfrost.md) (does not require a runtime, but needs [some setup](./blockfrost.md#setting-up-a-blockfrost-powered-test-suite)) - [entry point](../test/Blockfrost/Contract.purs) - `npm run blockfrost-local-test` for self-hosted [Blockfrost-powered tests](./blockfrost.md) (requires a [local Blockfrost runtime](./blockfrost.md#running-blockfrost-locally)) - [entry point](../test/Blockfrost/Contract.purs) -- `npm run e2e-test` for [tests with a headless browser](./e2e-testing.md) (requires a runtime and the tests served via HTTP) +- `npm run e2e-test` for [tests with a headless browser](./e2e-testing.md) (requires a runtime and the tests served via HTTP: `npm run start-runtime` and `npm run webpack-serve` or `esbuild-serve`) #### With Nix @@ -100,16 +100,16 @@ Here and below, `` should be replaced with [one of the supported systems To run or build/bundle the project for the browser: -- `npm run e2e-serve` will start a Webpack development server at `localhost:4008`, which is required for [E2E tests](./e2e-testing.md) -- `npm run build` will output a Webpack-bundled example module to `dist` (or `nix build -L .#ctl-example-bundle-web` to build an example module using Nix into `./result/`) +- `npm run webpack-serve` will start a Webpack development server at `localhost:4008`, which is required for [E2E tests](./e2e-testing.md) +- `npm run {webpack|esbuild}-bundle` will output a bundled example module to `dist` (or `nix build -L .#ctl-example-bundle-web-{webpack|esbuild}` to build an example module using Nix into `./result/`) By default, Webpack will build a [Purescript module](../examples/ByUrl.purs) that serves multiple example `Contract`s depending on URL (see [here](./e2e-testing.md#serving-the-contract-to-be-tested)). You can point Webpack to another Purescript entrypoint by changing the `ps-bundle` variable in the Makefile or in the `main` argument in the flake's `packages.ctl-examples-bundle-web`. -You will also need a light wallet extension pre-configured. +You will also need a light wallet extension pre-configured to run a `Contract`. -**Note**: The `BROWSER_RUNTIME` environment variable must be set to `1` in order to build/bundle the project properly for the browser (e.g. `BROWSER_RUNTIME=1 webpack ...`). For Node environments, leave this variable unset or set it to `0`. +**Note**: The `BROWSER_RUNTIME` environment variable must be set to `1` in order to build/bundle the project properly for the browser (e.g. `BROWSER_RUNTIME=1 webpack ...`). For Node environments, leave this variable unset. -**Note**: The `KUPO_HOST` environment variable must be set the base URL of the Kupo service in order to successfully run the project for the browser (e.g. `KUPO_HOST=http://localhost:1442`), otherwise all requests to Kupo will fail. +**Note**: The `KUPO_HOST` environment variable must be set to the base URL of the Kupo service in order to successfully serve the project for the browser (by default, `KUPO_HOST=http://localhost:1442`). ## Generating PS documentation diff --git a/templates/ctl-scaffold/flake.nix b/templates/ctl-scaffold/flake.nix index abd88cd41a..77deb50da5 100644 --- a/templates/ctl-scaffold/flake.nix +++ b/templates/ctl-scaffold/flake.nix @@ -1,6 +1,12 @@ { description = "ctl-scaffold"; + nixConfig = { + extra-substituters = [ "https://plutonomicon.cachix.org" ]; + extra-trusted-public-keys = [ "plutonomicon.cachix.org-1:evUxtNULjCjOipxwAnYhNFeF/lyYU1FeNGaVAnm+QQw=" ]; + bash-prompt = "[\\[\\e[0;1m\\]\\[\\033[33m\\]$(git rev-parse --abbrev-ref HEAD) \\[\\e[0;32m\\]\\w\\[\\e[0m\\]]\\[\\e[0m\\]$ \\[\\e[0m\\]"; + }; + inputs = { flake-compat = { url = "github:edolstra/flake-compat"; @@ -192,6 +198,4 @@ default = (psProjectFor pkgs).devShell; }); }; - - nixConfig.bash-prompt = "[\\[\\e[0;1m\\]\\[\\033[33m\\]$(git rev-parse --abbrev-ref HEAD) \\[\\e[0;32m\\]\\w\\[\\e[0m\\]]\\[\\e[0m\\]$ \\[\\e[0m\\]"; } From d78a8080b10cd3605448a80cea22077c3b5a7222 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Fri, 15 Dec 2023 17:10:24 +0400 Subject: [PATCH 84/85] Update the template --- templates/ctl-scaffold/flake.lock | 8 ++++---- templates/ctl-scaffold/flake.nix | 2 +- templates/ctl-scaffold/packages.dhall | 2 +- templates/ctl-scaffold/spago-packages.nix | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/templates/ctl-scaffold/flake.lock b/templates/ctl-scaffold/flake.lock index e4fbc9170b..1c4daa222b 100644 --- a/templates/ctl-scaffold/flake.lock +++ b/templates/ctl-scaffold/flake.lock @@ -1686,17 +1686,17 @@ "plutip": "plutip" }, "locked": { - "lastModified": 1702493588, - "narHash": "sha256-Thdyj43WqEUiI1QAOIh250zTLtV7fT7aU4bTdIGsfhA=", + "lastModified": 1702645636, + "narHash": "sha256-GiSImwp0QoKheOhX7aftGpYayPdRdu3W1TcXY1GMUuk=", "owner": "Plutonomicon", "repo": "cardano-transaction-lib", - "rev": "774c005ae9ebd228e9b6c31a636b3470d11064dd", + "rev": "a742692d605aabd75043aee9eef0ecdfec63eacc", "type": "github" }, "original": { "owner": "Plutonomicon", "repo": "cardano-transaction-lib", - "rev": "774c005ae9ebd228e9b6c31a636b3470d11064dd", + "rev": "a742692d605aabd75043aee9eef0ecdfec63eacc", "type": "github" } }, diff --git a/templates/ctl-scaffold/flake.nix b/templates/ctl-scaffold/flake.nix index 77deb50da5..ebfe7a1d9e 100644 --- a/templates/ctl-scaffold/flake.nix +++ b/templates/ctl-scaffold/flake.nix @@ -16,7 +16,7 @@ type = "github"; owner = "Plutonomicon"; repo = "cardano-transaction-lib"; - rev = "774c005ae9ebd228e9b6c31a636b3470d11064dd"; + rev = "a742692d605aabd75043aee9eef0ecdfec63eacc"; }; # To use the same version of `nixpkgs` as we do nixpkgs.follows = "ctl/nixpkgs"; diff --git a/templates/ctl-scaffold/packages.dhall b/templates/ctl-scaffold/packages.dhall index deb9f2e1cc..ca6a76cca7 100644 --- a/templates/ctl-scaffold/packages.dhall +++ b/templates/ctl-scaffold/packages.dhall @@ -296,7 +296,7 @@ let additions = , "web-storage" ] , repo = "https://github.com/Plutonomicon/cardano-transaction-lib.git" - , version = "774c005ae9ebd228e9b6c31a636b3470d11064dd" + , version = "a742692d605aabd75043aee9eef0ecdfec63eacc" } , js-bigints = { dependencies = [ "integers", "maybe", "prelude" ] diff --git a/templates/ctl-scaffold/spago-packages.nix b/templates/ctl-scaffold/spago-packages.nix index 1c9dc40565..d792bddff4 100644 --- a/templates/ctl-scaffold/spago-packages.nix +++ b/templates/ctl-scaffold/spago-packages.nix @@ -199,11 +199,11 @@ let "cardano-transaction-lib" = pkgs.stdenv.mkDerivation { name = "cardano-transaction-lib"; - version = "774c005ae9ebd228e9b6c31a636b3470d11064dd"; + version = "a742692d605aabd75043aee9eef0ecdfec63eacc"; src = pkgs.fetchgit { url = "https://github.com/Plutonomicon/cardano-transaction-lib.git"; - rev = "774c005ae9ebd228e9b6c31a636b3470d11064dd"; - sha256 = "043ymj0p9lw6agd3wzbvslpd6k77fs43h02l4ci4ba6nin7p45sf"; + rev = "a742692d605aabd75043aee9eef0ecdfec63eacc"; + sha256 = "1sajii8n65rpspbfsxjiyz41m5hsxnkysmz8g2hq4hkl1adqh90s"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; From 485cf796790817935e59c8fd387aeb647b978bd9 Mon Sep 17 00:00:00 2001 From: Vladimir Kalnitsky Date: Fri, 15 Dec 2023 17:14:47 +0400 Subject: [PATCH 85/85] Fix markdown link --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index acad5c51ac..b495a7fc19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -76,7 +76,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Added -- [esbuild](esbuild.github.io/) bundler support. +- [esbuild](https://esbuild.github.io/) bundler support. - To update your package to use esbuild, add new `devDependencies` to your `package.json`: ```diff